You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/11/08 16:36:45 UTC

svn commit: r1768726 - in /uima/uimafit/trunk/uimafit-core: pom.xml src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java

Author: schor
Date: Tue Nov  8 16:36:45 2016
New Revision: 1768726

URL: http://svn.apache.org/viewvc?rev=1768726&view=rev
Log:
[UIMA-5173] compare xml results using XMLunit compare to avoid failing due to xml encoding differences such as how empty elements are encoded.  XMLunit added to POM as a "Test" dependency, should not be included in any distribution.

Modified:
    uima/uimafit/trunk/uimafit-core/pom.xml
    uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java

Modified: uima/uimafit/trunk/uimafit-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/pom.xml?rev=1768726&r1=1768725&r2=1768726&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-core/pom.xml Tue Nov  8 16:36:45 2016
@@ -64,6 +64,12 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency> <!-- https://issues.apache.org/jira/browse/UIMA-5173  -->
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.5</version>
+      <scope>test</scope>
+    </dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java?rev=1768726&r1=1768725&r2=1768726&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java Tue Nov  8 16:36:45 2016
@@ -75,6 +75,8 @@ import org.apache.uima.resource.metadata
 import org.apache.uima.resource.metadata.TypePriorities;
 import org.apache.uima.resource.metadata.TypePriorityList;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Test;
 
 /**
@@ -557,6 +559,7 @@ public class AnalysisEngineFactoryTest e
     
     String actual = FileUtils.readFileToString(target, "UTF-8");
     String expected = FileUtils.readFileToString(reference, "UTF-8");
-    assertEquals(expected, actual);
+    XMLAssert.assertXMLEqual(expected, actual);
+//    assertEquals(expected, actual);
   }
 }



Re: svn commit: r1768726 - in /uima/uimafit/trunk/uimafit-core: pom.xml src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java

Posted by Richard Eckart de Castilho <re...@apache.org>.
Thanks!

-- Richard

> On 08.11.2016, at 17:36, schor@apache.org wrote:
> 
> Author: schor
> Date: Tue Nov  8 16:36:45 2016
> New Revision: 1768726
> 
> URL: http://svn.apache.org/viewvc?rev=1768726&view=rev
> Log:
> [UIMA-5173] compare xml results using XMLunit compare to avoid failing due to xml encoding differences such as how empty elements are encoded.  XMLunit added to POM as a "Test" dependency, should not be included in any distribution.