[jboss-svn-commits] JBL Code SVN: r30189 - in labs/jbossrules/trunk/drools-verifier: src/main/java/org/drools/verifier/components and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 17 05:22:58 EST 2009
Author: Rikkola
Date: 2009-11-17 05:22:57 -0500 (Tue, 17 Nov 2009)
New Revision: 30189
Added:
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/PlainTextReportWriter.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/XMLReportWriter.java
Removed:
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java
Modified:
labs/jbossrules/trunk/drools-verifier/.classpath
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/VerifierReportWriterFactory.java
labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java
labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/report/VerifierReportBuilderTest.java
Log:
JBRULES-2305 : Update the verifier to act more like the drools-api - Few missing features
Modified: labs/jbossrules/trunk/drools-verifier/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-verifier/.classpath 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/.classpath 2009-11-17 10:22:57 UTC (rev 30189)
@@ -21,5 +21,5 @@
<classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -11,6 +11,14 @@
private String parentGuid;
private int orderNumber;
+ /**
+ *
+ * @return Rule package name + rule name.
+ */
+ public String getFullRulePath() {
+ return getPackageName() + "." + getRuleName();
+ }
+
public String getRuleName() {
return ruleName;
}
Added: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/PlainTextReportWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/PlainTextReportWriter.java (rev 0)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/PlainTextReportWriter.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -0,0 +1,45 @@
+package org.drools.verifier.report;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Collection;
+
+import org.drools.verifier.data.VerifierReport;
+import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessageBase;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public class PlainTextReportWriter
+ implements
+ VerifierReportWriter {
+
+ @Override
+ public void writeReport(OutputStream out,
+ VerifierReport result) throws IOException {
+
+ StringBuffer str = new StringBuffer();
+
+ for ( Severity severity : Severity.values() ) {
+ Collection<VerifierMessageBase> messages = result.getBySeverity( severity );
+
+ str.append( "************* " );
+ str.append( severity.getTuple() );
+ str.append( " " );
+
+ str.append( messages.size() );
+ str.append( " ******************\n" );
+ for ( VerifierMessageBase message : messages ) {
+ str.append( message );
+ str.append( "\n" );
+ }
+ str.append( "\n" );
+ }
+
+ out.write( str.toString().getBytes() );
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -1,61 +0,0 @@
-package org.drools.verifier.report;
-
-import java.util.Collection;
-
-import org.drools.verifier.components.LiteralRestriction;
-import org.drools.verifier.data.VerifierReport;
-import org.drools.verifier.report.components.Gap;
-import org.drools.verifier.report.components.MissingNumberPattern;
-import org.drools.verifier.report.components.Severity;
-import org.drools.verifier.report.components.VerifierMessage;
-import org.drools.verifier.report.components.VerifierMessageBase;
-
-import com.thoughtworks.xstream.XStream;
-
-/**
- *
- * @author Toni Rikkola
- */
-public class ReportModeller {
-
- public static String writeXML(VerifierReport result) {
- XStream xstream = new XStream();
-
- xstream.alias("result", VerifierReport.class);
- xstream.alias("message", VerifierMessage.class);
-
- xstream.alias("Gap", Gap.class);
- xstream.alias("MissingNumber", MissingNumberPattern.class);
-
- xstream.alias("Field", org.drools.verifier.components.Field.class);
-
- xstream.alias("LiteralRestriction", LiteralRestriction.class);
-
- return "<?xml version=\"1.0\"?>\n" + xstream.toXML(result);
- }
-
- public static String writePlainText(VerifierReport result) {
-
- StringBuffer str = new StringBuffer();
-
- for (Severity severity : Severity
- .values()) {
- Collection<VerifierMessageBase> messages = result
- .getBySeverity(severity);
-
- str.append("************* ");
- str.append(severity.getTuple());
- str.append(" ");
-
- str.append(messages.size());
- str.append(" ******************\n");
- for (VerifierMessageBase message : messages) {
- str.append(message);
- str.append("\n");
- }
- str.append("\n");
- }
-
- return str.toString();
- }
-}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/VerifierReportWriterFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/VerifierReportWriterFactory.java 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/VerifierReportWriterFactory.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -19,8 +19,7 @@
* @return Analysis results as plain text.
*/
public static VerifierReportWriter newPlainTextReportWriter() {
- return null;
- // return ReportModeller.writePlainText( result );
+ return new PlainTextReportWriter();
}
/**
@@ -29,7 +28,6 @@
* @return Analysis results as XML
*/
public static VerifierReportWriter newXMLReportWriter() {
- return null;
- // return ReportModeller.writeXML( result );
+ return new XMLReportWriter();
}
}
Added: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/XMLReportWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/XMLReportWriter.java (rev 0)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/XMLReportWriter.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -0,0 +1,47 @@
+package org.drools.verifier.report;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.drools.verifier.components.LiteralRestriction;
+import org.drools.verifier.data.VerifierReport;
+import org.drools.verifier.report.components.Gap;
+import org.drools.verifier.report.components.MissingNumberPattern;
+import org.drools.verifier.report.components.VerifierMessage;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public class XMLReportWriter
+ implements
+ VerifierReportWriter {
+
+ @Override
+ public void writeReport(OutputStream out,
+ VerifierReport result) throws IOException {
+ XStream xstream = new XStream();
+
+ xstream.alias( "result",
+ VerifierReport.class );
+ xstream.alias( "message",
+ VerifierMessage.class );
+
+ xstream.alias( "Gap",
+ Gap.class );
+ xstream.alias( "MissingNumber",
+ MissingNumberPattern.class );
+
+ xstream.alias( "Field",
+ org.drools.verifier.components.Field.class );
+
+ xstream.alias( "LiteralRestriction",
+ LiteralRestriction.class );
+
+ out.write( ("<?xml version=\"1.0\"?>\n" + xstream.toXML( result )).getBytes() );
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -88,4 +88,5 @@
m.getMessage() );
}
}
+
}
Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/report/VerifierReportBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/report/VerifierReportBuilderTest.java 2009-11-17 08:21:08 UTC (rev 30188)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/report/VerifierReportBuilderTest.java 2009-11-17 10:22:57 UTC (rev 30189)
@@ -1,88 +1,62 @@
package org.drools.verifier.report;
-import java.util.Collection;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
-import org.drools.verifier.data.VerifierData;
-import org.drools.verifier.data.VerifierReport;
-import org.drools.verifier.report.components.Gap;
-import org.drools.verifier.report.components.MissingNumberPattern;
-import org.drools.verifier.report.components.RangeCheckCause;
-import org.drools.verifier.report.components.Severity;
-import org.drools.verifier.report.components.VerifierMessageBase;
-
import junit.framework.TestCase;
+import org.drools.builder.ResourceType;
+import org.drools.io.impl.ClassPathResource;
+import org.drools.verifier.Verifier;
+import org.drools.verifier.builder.VerifierBuilder;
+import org.drools.verifier.builder.VerifierBuilderFactory;
+
public class VerifierReportBuilderTest extends TestCase {
- public void testHtmlReportTest() {
+ public void testHtmlReportTest() throws IOException {
// Create report
- VerifierReport vReport = new VerifierReportMock();
+ VerifierBuilder vBuilder = VerifierBuilderFactory.newVerifierBuilder();
+ Verifier verifier = vBuilder.newVerifier();
+ verifier.addResourcesToVerify( new ClassPathResource( "Misc3.drl",
+ Verifier.class ),
+ ResourceType.DRL );
+ VerifierReportWriter writer = VerifierReportWriterFactory.newHTMLReportWriter();
+
// Write to disk
- // Check the files on disk
- // done
- assertTrue(true);
- }
+ FileOutputStream out = new FileOutputStream( "testReport.zip" );
-}
-class VerifierReportMock
- implements
- VerifierReport {
+ writer.writeReport( out,
+ verifier.getResult() );
- public void add(Gap gap) {
- // TODO Auto-generated method stub
+ // Check the files on disk
+ File file = new File( "testReport.zip" );
+ assertNotNull( file );
+ assertTrue( file.exists() );
- }
+ // TODO: Check the file content
+
+ // Remove the test file
+ file.delete();
- public void add(MissingNumberPattern missingNumberPattern) {
- // TODO Auto-generated method stub
+ assertFalse( file.exists() );
}
- public void add(VerifierMessageBase note) {
- // TODO Auto-generated method stub
-
+ public void testPlainTextReportTest() throws IOException {
+ //TODO:
+ assertTrue( true );
}
- public Collection<VerifierMessageBase> getBySeverity(Severity severity) {
- // TODO Auto-generated method stub
- return null;
+ public void testXMLReportTest() throws IOException {
+ //TODO:
+ assertTrue( true );
}
- public Collection<Gap> getGapsByFieldId(int fieldId) {
- // TODO Auto-generated method stub
- return null;
+ public void testPDFReportTest() throws IOException {
+ //TODO:
+ assertTrue( true );
}
-
- public Collection<RangeCheckCause> getRangeCheckCauses() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Collection<RangeCheckCause> getRangeCheckCausesByFieldId(int id) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public VerifierData getVerifierData(VerifierData data) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public VerifierData getVerifierData() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void remove(Gap gap) {
- // TODO Auto-generated method stub
-
- }
-
- public Collection<RangeCheckCause> getRangeCheckCausesByFieldId(String guid) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list