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/05/06 21:43:47 UTC
svn commit: r1742644 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima:
cas/impl/ cas_data/impl/ jcas/test/
Author: schor
Date: Fri May 6 21:43:47 2016
New Revision: 1742644
URL: http://svn.apache.org/viewvc?rev=1742644&view=rev
Log:
[UIMA-4674] Misc class move, remove unused imports, features as arrays
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
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/cas/impl/CasPoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java?rev=1742644&r1=1742643&r2=1742644&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java Fri May 6 21:43:47 2016
@@ -33,12 +33,12 @@ import org.apache.uima.cas.TypeSystem;
import org.apache.uima.impl.ChildUimaContext_impl;
import org.apache.uima.impl.RootUimaContext_impl;
import org.apache.uima.impl.UimaContext_ImplBase;
+import org.apache.uima.internal.util.Misc;
import org.apache.uima.internal.util.MultiThreadUtils;
import org.apache.uima.resource.CasManager;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.InvalidXMLException;
-import org.apache.uima.util.Misc;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLizable;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java?rev=1742644&r1=1742643&r2=1742644&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java Fri May 6 21:43:47 2016
@@ -30,7 +30,6 @@ import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.admin.FSIndexComparator;
-import org.apache.uima.internal.util.IntPointerIterator;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.resource.metadata.FsIndexDescription;
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=1742644&r1=1742643&r2=1742644&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 Fri May 6 21:43:47 2016
@@ -78,7 +78,7 @@ public class Id2FSTest extends TestCase
} catch (LowLevelException e) {
caught = true;
}
- assertTrue(caught);
+ assertTrue( Id2FS.IS_DISABLE_FS_GC || caught);
}
Id2FS id2fs = new Id2FS(200);
@@ -101,10 +101,12 @@ 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 < 19; i++) { // last TOP is held by cas.svd.cache_not_in_index
- TOP fs = id2fs.get(i + 2);
- assertNull(fs);
- }
+ if (!Id2FS.IS_DISABLE_FS_GC) {
+ 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);
+ }
+ }
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1742644&r1=1742643&r2=1742644&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java Fri May 6 21:43:47 2016
@@ -212,6 +212,10 @@ public class XCASDeserializerTest extend
XCASDeserializer deser2 = new XCASDeserializer(cas2.getTypeSystem());
ContentHandler deserHandler2 = deser2.getXCASHandler(cas2);
xmlReader.setContentHandler(deserHandler2);
+// // debug
+// PrintStream ps = new PrintStream(new BufferedOutputStream(new FileOutputStream("debug.log.txt", false)));
+// ps.println(xml);
+// ps.close();
xmlReader.parse(new InputSource(new StringReader(xml)));
// compare
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java?rev=1742644&r1=1742643&r2=1742644&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java Fri May 6 21:43:47 2016
@@ -48,6 +48,7 @@ import org.apache.uima.cas.impl.FeatureI
import org.apache.uima.cas.impl.SlotKinds.SlotKind;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.internal.util.IntVector;
+import org.apache.uima.internal.util.Misc;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
import org.apache.uima.jcas.cas.CommonArray;
@@ -61,7 +62,6 @@ import org.apache.uima.jcas.cas.ShortArr
import org.apache.uima.jcas.cas.Sofa;
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.util.Misc;
import junit.framework.Assert;
@@ -270,13 +270,13 @@ public class CasComparer {
private int compareFeatures(
TOP fs1, TOP fs2,
- List<FeatureImpl> feats1, List<FeatureImpl> feats2,
+ FeatureImpl[] feats1, FeatureImpl[] feats2,
Set<TOP> visited) {
IntVector fsCompares = new IntVector(2);
- for (int i = 0; i < feats1.size(); i++) {
- Feature feat1 = feats1.get(i);
- Feature feat2 = feats2.get(i);
+ for (int i = 0; i < feats1.length; i++) {
+ Feature feat1 = feats1[i];
+ Feature feat2 = feats2[i];
Type rangeType;
String rangeTypeName;
int r;
@@ -321,7 +321,7 @@ public class CasComparer {
int r = 0;
for (int j = 0; j < fsCompares.size(); j++) {
int i = fsCompares.get(j);
- if (0 != ( r = compare1(fs1.getFeatureValue(feats1.get(i)), fs2.getFeatureValue(feats2.get(i)), visited))) return r;
+ if (0 != ( r = compare1(fs1.getFeatureValue(feats1[i]), fs2.getFeatureValue(feats2[i]), visited))) return r;
}
}
return 0;
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=1742644&r1=1742643&r2=1742644&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 May 6 21:43:47 2016
@@ -102,9 +102,9 @@ public class JCasTest extends TestCase {
System.out.print("setup caught CAS Exception with message: ");
String m = e1.getMessage();
System.out.println(m);
- assertEquals(m, "The JCas cannot be initialized. The following errors occurred: "
+ assertEquals("The JCas cannot be initialized. The following errors occurred: "
+ "\nUnable to find required getPlainRef method for JCAS type aa.Root with return type of org.apache.uima.jcas.cas.TOP."
- + "\nUnable to find required setPlainRef method for JCAS type aa.Root with argument type of org.apache.uima.jcas.cas.TOP.\n");
+ + "\nUnable to find required setPlainRef method for JCAS type aa.Root with argument type of org.apache.uima.jcas.cas.TOP.\n", m);
// if (!m
// .equals("Error initializing JCas: Error: can't access feature information from CAS in initializing JCas type: aa.Root, feature: testMissingImport\n")) {
// assertTrue(false);
@@ -295,6 +295,14 @@ public class JCasTest extends TestCase {
}
assertTrue(caught);
+ // float values
+ r1 = new Root(jcas);
+ r1.setPlainFloat(1247.3F);
+ r1.setArrayFloat(new FloatArray(jcas, 3));
+ r1.setArrayFloat(2, 321.4F);
+ assertEquals(1247.3F, r1.getPlainFloat());
+ assertEquals(321.4F, r1.getArrayFloat(2));
+
// null values
r2.setArrayString(0, null);
r2.setArrayRef(0, null);
@@ -351,6 +359,7 @@ public class JCasTest extends TestCase {
// oI.moveToNext();
// assertTrue(oI.isValid());
// assertTrue(r1 == oI.get());
+ ((CASImpl)cas).traceFSflush();
} catch (Exception e) {
JUnitExtension.handleException(e);
}