[jboss-svn-commits] JBL Code SVN: r24795 - in labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks: src/test/java/org/drools/runtime/pipeline/impl and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jan 19 13:47:16 EST 2009


Author: mark.proctor at jboss.com
Date: 2009-01-19 13:47:15 -0500 (Mon, 19 Jan 2009)
New Revision: 24795

Modified:
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/pom.xml
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksFactTest.java
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksGlobalTest.java
Log:
JBRULES-1903 Pipeline support
-Started using XMLUnit for xml comparisons

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath	2009-01-19 17:07:47 UTC (rev 24794)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath	2009-01-19 18:47:15 UTC (rev 24795)
@@ -30,6 +30,7 @@
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.2/xmlunit-1.2.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"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/pom.xml	2009-01-19 17:07:47 UTC (rev 24794)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/pom.xml	2009-01-19 18:47:15 UTC (rev 24795)
@@ -30,7 +30,14 @@
           <groupId>org.milyn</groupId>
           <artifactId>milyn-smooks-javabean</artifactId>
           <version>1.1</version>
-        </dependency>         
+        </dependency>    
+        
+        <dependency>
+          <groupId>xmlunit</groupId>
+          <artifactId>xmlunit</artifactId>
+          <version>1.2</version>
+          <scope>test</scope>
+        </dependency>     
       </dependencies>     
 
     <repositories>

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksFactTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksFactTest.java	2009-01-19 17:07:47 UTC (rev 24794)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksFactTest.java	2009-01-19 18:47:15 UTC (rev 24795)
@@ -6,6 +6,7 @@
 
 import javax.xml.transform.stream.StreamSource;
 
+import org.custommonkey.xmlunit.Diff;
 import org.drools.KnowledgeBase;
 import org.drools.KnowledgeBaseFactory;
 import org.drools.builder.KnowledgeBuilder;
@@ -25,11 +26,8 @@
 import junit.framework.TestCase;
 
 public class SmooksFactTest extends TestCase {
-    public void testDummy() {
-        
-    }
-    
-    public void FIXME_testFact() throws Exception {
+   
+    public void testFact() throws Exception {
         String xml = "<org.drools.runtime.pipeline.impl.Root><children><example.OrderItem><price>8.9</price><quantity>2</quantity><productId>111</productId></example.OrderItem><example.OrderItem><price>5.2</price><quantity>7</quantity><productId>222</productId></example.OrderItem></children></org.drools.runtime.pipeline.impl.Root>";
 
         KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
@@ -86,20 +84,9 @@
         resultHandler = new ResultHandlerImpl();
         pipeline.insert( factHandle, resultHandler );
 
-        assertEquals( xml,
-                      resultHandler.getObject() );
+        assertTrue( new Diff( xml, (String) resultHandler.getObject() ).similar() );
     }
 
-    private static void assertEqualsIgnoreWhitespace(final String expected,
-                                                     final String actual) {
-        final String cleanExpected = expected.replaceAll( "\\s+",
-                                                          "" );
-        final String cleanActual = actual.replaceAll( "\\s+",
-                                                      "" );
-        assertEquals( cleanExpected,
-                      cleanActual );
-    }
-
     public static class ResultHandlerImpl
         implements
         ResultHandler {

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksGlobalTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksGlobalTest.java	2009-01-19 17:07:47 UTC (rev 24794)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/src/test/java/org/drools/runtime/pipeline/impl/SmooksGlobalTest.java	2009-01-19 18:47:15 UTC (rev 24795)
@@ -6,6 +6,7 @@
 
 import javax.xml.transform.stream.StreamSource;
 
+import org.custommonkey.xmlunit.Diff;
 import org.drools.KnowledgeBase;
 import org.drools.KnowledgeBaseFactory;
 import org.drools.builder.KnowledgeBuilder;
@@ -27,11 +28,8 @@
 import junit.framework.TestCase;
 
 public class SmooksGlobalTest extends TestCase {
-    public void testDummy() {
-        
-    }
     
-    public void FIXME_testGlobal() throws Exception {
+    public void testGlobal() throws Exception {
         String xml = "<org.drools.runtime.pipeline.impl.Root><children><example.OrderItem><price>8.9</price><quantity>2</quantity><productId>111</productId></example.OrderItem><example.OrderItem><price>5.2</price><quantity>7</quantity><productId>222</productId></example.OrderItem></children></org.drools.runtime.pipeline.impl.Root>";
 
         KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
@@ -80,21 +78,10 @@
         resultHandler = new ResultHandlerImpl();
         pipeline.insert( ksession.getGlobal( "root" ),
                          resultHandler );
-
-        assertEquals( xml,
-                      resultHandler.getObject() );
+        
+        assertTrue( new Diff( xml, (String) resultHandler.getObject() ).similar() );
     }
 
-    private static void assertEqualsIgnoreWhitespace(final String expected,
-                                                     final String actual) {
-        final String cleanExpected = expected.replaceAll( "\\s+",
-                                                          "" );
-        final String cleanActual = actual.replaceAll( "\\s+",
-                                                      "" );
-        assertEquals( cleanExpected,
-                      cleanActual );
-    }
-
     public static class ResultHandlerImpl
         implements
         ResultHandler {




More information about the jboss-svn-commits mailing list