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 2015/11/30 05:28:01 UTC
svn commit: r1717159 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima:
analysis_engine/impl/AnalysisEngine_implTest.java
cas/impl/CasTypeSystemMapperTst.java cas/impl/FeaturePathTest.java
cas/impl/Id2FSTest.java
Author: schor
Date: Mon Nov 30 04:28:01 2015
New Revision: 1717159
URL: http://svn.apache.org/viewvc?rev=1717159&view=rev
Log:
no Jira - remove debug statememt
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1717159&r1=1717158&r2=1717159&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Mon Nov 30 04:28:01 2015
@@ -748,7 +748,6 @@ public class AnalysisEngine_implTest ext
fs3.setStringValue(f2, "One");
FeatureStructure fs4 = cas.createFS(t2);
fs4.setStringValue(f2, "Two");
- System.out.println("debug" + fs3.toString());
assertTrue(ind2.compare(fs3, fs4) > 0);
FSIndex ind3 = irep.getIndex("Index3");
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java?rev=1717159&r1=1717158&r2=1717159&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java Mon Nov 30 04:28:01 2015
@@ -92,8 +92,8 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(3, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(1, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 37);
- assertEquals(0, m.mapTypeCodeSrc2Tgt(38));
+ chkbase(m, 39);
+ assertEquals(0, m.mapTypeCodeSrc2Tgt(40));
assertFalse(m.isEqual());
}
@@ -101,11 +101,11 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(3, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(2, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 36);
- assertEquals( 0, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(37, m.mapTypeCodeSrc2Tgt(38));
- assertEquals(38, m.mapTypeCodeTgt2Src(37));
- chkfeats(m, 38);
+ chkbase(m, 38);
+ assertEquals( 0, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(39, m.mapTypeCodeSrc2Tgt(40));
+ assertEquals(40, m.mapTypeCodeTgt2Src(39));
+ chkfeats(m, 40);
assertFalse(m.isEqual());
}
@@ -113,8 +113,8 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(1, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(3, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 37);
- assertEquals(0, m.mapTypeCodeTgt2Src(38));
+ chkbase(m, 39);
+ assertEquals(0, m.mapTypeCodeTgt2Src(40));
assertFalse(m.isEqual());
}
@@ -122,11 +122,11 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(2, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(3, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 36);
- assertEquals(38, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(37, m.mapTypeCodeTgt2Src(38));
- assertEquals(0, m.mapTypeCodeTgt2Src(37));
- chkfeats(m, 37);
+ chkbase(m, 38);
+ assertEquals(40, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(39, m.mapTypeCodeTgt2Src(40));
+ assertEquals(0, m.mapTypeCodeTgt2Src(39));
+ chkfeats(m, 39);
assertFalse(m.isEqual());
}
@@ -134,9 +134,9 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(3, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(0, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 36);
- assertEquals( 0, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(0, m.mapTypeCodeSrc2Tgt(38));
+ chkbase(m, 38);
+ assertEquals( 0, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(0, m.mapTypeCodeSrc2Tgt(40));
assertFalse(m.isEqual());
}
@@ -144,9 +144,9 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(0, 0x1ffff, 0x1ffff);
TypeSystemImpl ts2 = createTs(3, 0x1ffff, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
- chkbase(m, 36);
- assertEquals( 0, m.mapTypeCodeTgt2Src(37));
- assertEquals(0, m.mapTypeCodeTgt2Src(38));
+ chkbase(m, 38);
+ assertEquals( 0, m.mapTypeCodeTgt2Src(39));
+ assertEquals(0, m.mapTypeCodeTgt2Src(40));
assertFalse(m.isEqual());
}
@@ -157,12 +157,12 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts2 = createTs(3, 0x1ffff - mf, 0x1ffff);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
chkbase(m);
- assertEquals(37, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(38, m.mapTypeCodeSrc2Tgt(38));
- assertEquals(37, m.mapTypeCodeTgt2Src(37));
- assertEquals(38, m.mapTypeCodeTgt2Src(38));
- chkfeats(m, 38);
- chkMissingFeats1(m, 37, mf);
+ assertEquals(39, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(40, m.mapTypeCodeSrc2Tgt(40));
+ assertEquals(39, m.mapTypeCodeTgt2Src(39));
+ assertEquals(40, m.mapTypeCodeTgt2Src(40));
+ chkfeats(m, 40);
+ chkMissingFeats1(m, 39, mf);
assertFalse(m.isEqual());
}
}
@@ -173,12 +173,12 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts2 = createTs(3, 0x1ffff, 0x1ffff - mf);
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
chkbase(m);
- assertEquals(37, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(38, m.mapTypeCodeSrc2Tgt(38));
- assertEquals(37, m.mapTypeCodeTgt2Src(37));
- assertEquals(38, m.mapTypeCodeTgt2Src(38));
- chkfeats(m, 37);
- chkMissingFeats1(m, 38, mf);
+ assertEquals(39, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(40, m.mapTypeCodeSrc2Tgt(40));
+ assertEquals(39, m.mapTypeCodeTgt2Src(39));
+ assertEquals(40, m.mapTypeCodeTgt2Src(40));
+ chkfeats(m, 39);
+ chkMissingFeats1(m, 40, mf);
assertFalse(m.isEqual());
}
}
@@ -189,12 +189,12 @@ public class CasTypeSystemMapperTst exte
TypeSystemImpl ts1 = createTs(3, 0x1ffff - mf, 0x1ffff); // feat 8
CasTypeSystemMapper m = new CasTypeSystemMapper(ts1, ts2);
chkbase(m);
- assertEquals(37, m.mapTypeCodeSrc2Tgt(37));
- assertEquals(38, m.mapTypeCodeSrc2Tgt(38));
- assertEquals(37, m.mapTypeCodeTgt2Src(37));
- assertEquals(38, m.mapTypeCodeTgt2Src(38));
- chkfeats(m, 38);
- chkMissingFeats2(m, 37, mf);
+ assertEquals(39, m.mapTypeCodeSrc2Tgt(39));
+ assertEquals(40, m.mapTypeCodeSrc2Tgt(40));
+ assertEquals(39, m.mapTypeCodeTgt2Src(39));
+ assertEquals(40, m.mapTypeCodeTgt2Src(40));
+ chkfeats(m, 40);
+ chkMissingFeats2(m, 39, mf);
assertFalse(m.isEqual());
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java?rev=1717159&r1=1717158&r2=1717159&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java Mon Nov 30 04:28:01 2015
@@ -71,7 +71,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("TestString", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -91,7 +91,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_SHORT, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_SHORT, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(shortFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -111,7 +111,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("1.12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FLOAT, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FLOAT, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(floatFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -131,7 +131,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("100.5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_DOUBLE, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_DOUBLE, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(doubleFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -151,7 +151,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("2000", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_LONG, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_LONG, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(longFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -171,7 +171,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_INT, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_INT, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(intFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -191,7 +191,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("true", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BOOLEAN, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BOOLEAN, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(boolFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -211,7 +211,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("127", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BYTE, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BYTE, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(byteFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -238,7 +238,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath
.getType(cas.getDocumentAnnotation()));
@@ -254,7 +254,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(null, featurePath.getTypClass(cas.getDocumentAnnotation()));
+ assertEquals(null, featurePath.getTypeClass(cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getType(cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -273,7 +273,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -288,7 +288,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_STRING, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(stringFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -299,7 +299,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath
.getType(cas.getDocumentAnnotation()));
@@ -427,7 +427,7 @@ public class FeaturePathTest extends Tes
assertEquals(cas.getDocumentText(), featurePath.ll_getValueAsString(cas.getLowLevelCAS().ll_getFSRef(
cas.getDocumentAnnotation()), cas.getLowLevelCAS()));
assertEquals(cas.getDocumentAnnotation().getType(), featurePath.getType(cas.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypClass(cas.getDocumentAnnotation()));
+ assertEquals(TypeClass.TYPE_CLASS_FS, featurePath.getTypeClass(cas.getDocumentAnnotation()));
// test fsId() on root
path = "/:fsId()";
@@ -586,7 +586,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize("/refFeature:coveredText()");
featurePath.typeInit(cas.getDocumentAnnotation().getType());
assertEquals(null, featurePath.getValueAsString(null));
- assertEquals(null, featurePath.getTypClass(null));
+ assertEquals(null, featurePath.getTypeClass(null));
assertEquals(null, featurePath.getType(null));
}
@@ -713,7 +713,7 @@ public class FeaturePathTest extends Tes
assertEquals("Test0,Test1,Test2,null", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_STRINGARRAY, featurePath
- .getTypClass(cas.getDocumentAnnotation()));
+ .getTypeClass(cas.getDocumentAnnotation()));
assertEquals(stringArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -733,7 +733,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("0,2,54", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_SHORTARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_SHORTARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(shortArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -754,7 +754,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("1.4,0.0,3434.34", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_FLOATARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FLOATARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(floatArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -777,7 +777,7 @@ public class FeaturePathTest extends Tes
assertEquals("1.4,0.0,3434.34", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_DOUBLEARRAY, featurePath
- .getTypClass(cas.getDocumentAnnotation()));
+ .getTypeClass(cas.getDocumentAnnotation()));
assertEquals(doubleArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -797,7 +797,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("14,0,343434", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_LONGARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_LONGARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(longArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -818,7 +818,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("14,0,343", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_INTARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_INTARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(intArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -841,7 +841,7 @@ public class FeaturePathTest extends Tes
assertEquals("true,false,true", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
assertEquals(TypeClass.TYPE_CLASS_BOOLEANARRAY, featurePath
- .getTypClass(cas.getDocumentAnnotation()));
+ .getTypeClass(cas.getDocumentAnnotation()));
assertEquals(booleanArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -861,7 +861,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("23,47,11", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
- assertEquals(TypeClass.TYPE_CLASS_BYTEARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_BYTEARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(byteArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
@@ -882,7 +882,7 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertTrue(featurePath.getValueAsString(cas.getDocumentAnnotation())
.indexOf("11") > 0);
- assertEquals(TypeClass.TYPE_CLASS_FSARRAY, featurePath.getTypClass(cas
+ assertEquals(TypeClass.TYPE_CLASS_FSARRAY, featurePath.getTypeClass(cas
.getDocumentAnnotation()));
assertEquals(fsArrayFeat.getRange(), featurePath.getType(cas
.getDocumentAnnotation()));
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java?rev=1717159&r1=1717158&r2=1717159&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java Mon Nov 30 04:28:01 2015
@@ -70,22 +70,11 @@ public class Id2FSTest extends TestCase
Thread.sleep(10); // in case gc needs time to finish
assertTrue(fsh == cas.getFsFromId(2));
- for (int i = 1; i < 20; i++) {
+ for (int i = 3; i < 21; i++) { //TOP:21 is held onto by the cas svd cache; might change if we don't cache non corruptable FSs
TOP fs = null; // for debugging
boolean caught = false;
try {
- fs = cas.getFsFromId_checked(i + 2);
- } catch (LowLevelException e) {
- caught = true;
- }
- if (!caught) {
- System.out.println("debug " + fs);
- }
- assertTrue(caught);
-
- caught = false;
- try {
- fs = cas.getFsFromId_checked(i + 2);
+ fs = cas.getFsFromId_checked(i);
} catch (LowLevelException e) {
caught = true;
}
@@ -112,7 +101,7 @@ public class Id2FSTest extends TestCase
// remove 20 of them
System.gc();
Thread.sleep(10); // in case gc needs time to finish
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < 19; i++) { // last TOP is held by cas.svd.cache_not_in_index
TOP fs = id2fs.get(i + 2);
assertNull(fs);
}