svn commit: r1820919 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl: XCASDeserializerTest.java XmiCasDeserializerTest.java

[schor]

Author: schor
Date: Thu Jan 11 18:53:59 2018
New Revision: 1820919

URL: http://svn.apache.org/viewvc?rev=1820919&view=rev
Log:
no Jira change to use full cas compare in deserialize tests.  Because this adds 
about 30 seconds to the testing, put under control of static final boolean at 
top of XmiCasDeserializerTest.

Modified:
    
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
    
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1820919&r1=1820918&r2=1820919&view=diff
==============================================================================
--- 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
 Thu Jan 11 18:53:59 2018
@@ -39,6 +39,7 @@ import org.apache.uima.cas.FeatureStruct
 import org.apache.uima.cas.IntArrayFS;
 import org.apache.uima.cas.StringArrayFS;
 import org.apache.uima.cas.Type;
+import org.apache.uima.cas_data.impl.CasComparer;
 import org.apache.uima.internal.util.XMLUtils;
 import org.apache.uima.resource.metadata.FsIndexDescription;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
@@ -52,7 +53,6 @@ import org.apache.uima.util.XMLSerialize
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import junit.framework.TestCase;
 
@@ -232,10 +232,13 @@ public class XCASDeserializerTest extend
 //      System.out.println("debug");
 //    }
     assertEquals(cas.getAnnotationIndex().size(), 
cas2.getAnnotationIndex().size());
-    CasCompare cc = new CasCompare((CASImpl)cas, (CASImpl)cas2);
-    cc.compareIds(((CASImpl)cas).is_ll_enableV2IdRefs());
-    cc.compareCASes();
-    // CasComparer.assertEquals(cas,cas2);
+    if (XmiCasDeserializerTest.IS_CAS_COMPARE) {
+      CasCompare cc = new CasCompare((CASImpl)cas, (CASImpl)cas2);
+      cc.compareIds(((CASImpl)cas).is_ll_enableV2IdRefs());
+      cc.compareCASes();
+    } else {
+      CasComparer.assertEquals(cas,cas2);
+    }
   }
 
   public void testOutOfTypeSystem2() throws Exception {

Modified: 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: 
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?rev=1820919&r1=1820918&r2=1820919&view=diff
==============================================================================
--- 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
 (original)
+++ 
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
 Thu Jan 11 18:53:59 2018
@@ -89,6 +89,11 @@ import junit.framework.TestCase;
 
 
 public class XmiCasDeserializerTest extends TestCase {
+  
+  // normally set to true, set to false for comparative performance measurement
+  //   because this adds ~ 10 seconds or so to the time it takes to run the 
junit tests
+  
+  public static final boolean IS_CAS_COMPARE = true;
 
   private FsIndexDescription[] indexes;
 
@@ -366,10 +371,11 @@ public class XmiCasDeserializerTest exte
     xmlReader.parse(new InputSource(new StringReader(xml)));
     
     // compare
-    
-    CasCompare cc = new CasCompare((CASImpl)cas, (CASImpl)cas2);
-    // ids won't be the same, don't compare these
-    cc.compareCASes();
+    if (IS_CAS_COMPARE) {
+      CasCompare cc = new CasCompare((CASImpl)cas, (CASImpl)cas2);
+      // ids won't be the same, don't compare these
+      cc.compareCASes();
+    }
     
     assertEquals(cas.getAnnotationIndex().size(), 
cas2.getAnnotationIndex().size());
     assertEquals(cas.getDocumentText(), cas2.getDocumentText());