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 2017/01/13 22:50:38 UTC

svn commit: r1778679 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java

Author: schor
Date: Fri Jan 13 22:50:38 2017
New Revision: 1778679

URL: http://svn.apache.org/viewvc?rev=1778679&view=rev
Log:
[UIMA-5225] support disable type system consolidation

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java?rev=1778679&r1=1778678&r2=1778679&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java Fri Jan 13 22:50:38 2017
@@ -35,6 +35,7 @@ import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.cas.impl.CASImpl;
 import org.apache.uima.cas.impl.LowLevelCAS;
 import org.apache.uima.cas.impl.LowLevelIndexRepository;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JFSIndexRepository;
 import org.apache.uima.jcas.cas.BooleanArray;
@@ -467,7 +468,12 @@ public class JCasTest extends TestCase {
 				CAS cas2 = CASInitializer.initCas(new CASTestSetup(), null);
 				TypeSystem ts2 = cas2.getTypeSystem();
 				JCas jcas2 = cas2.getJCas();
-				assertTrue(jcas.getCasType(Annotation.type) == jcas2.getCasType(Annotation.type));
+				if (TypeSystemImpl.IS_DISABLE_TYPESYSTEM_CONSOLIDATION) {
+  				assertTrue(jcas.getCasType(Annotation.type).equals(jcas2.getCasType(Annotation.type)));
+  				assertFalse(jcas.getCasType(Annotation.type) == jcas2.getCasType(Annotation.type));
+				} else {
+          assertTrue(jcas.getCasType(Annotation.type) == jcas2.getCasType(Annotation.type));
+				}
 			} catch (Exception e) {
 				checkOkMissingImport(e);
 			}