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/12/01 17:35:23 UTC
svn commit: r1717457 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
Author: schor
Date: Tue Dec 1 16:35:23 2015
New Revision: 1717457
URL: http://svn.apache.org/viewvc?rev=1717457&view=rev
Log:
[UIM-4663] fix FeaturePathImpl test case to not depend on hard-coded id's for FSs, and change one test case to correspond to different implementation detail on feature caching. to return type and type class for feature path even if the feature structure at the end of the path is null (the ref to it is null), to match what the test case is looking for.
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
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=1717457&r1=1717456&r2=1717457&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 Tue Dec 1 16:35:23 2015
@@ -254,10 +254,9 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(null, featurePath.getTypeClass(cas.getDocumentAnnotation()));
- assertEquals(null, featurePath.getType(cas.getDocumentAnnotation()));
- assertEquals(null, featurePath.getValueAsString(cas
- .getDocumentAnnotation()));
+ assertEquals(null, featurePath.getTypeClass (cas.getDocumentAnnotation()));
+ assertEquals(null, featurePath.getType (cas.getDocumentAnnotation()));
+ assertEquals(null, featurePath.getValueAsString(cas.getDocumentAnnotation()));
assertEquals(null, featurePath.getFSValue(cas.getDocumentAnnotation()));
// test reference feature path (slow lookup - path not always valid)
@@ -309,8 +308,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize("");
assertEquals("", featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(cas.getDocumentAnnotation().toString(), featurePath
- .getValueAsString(cas.getDocumentAnnotation()));
+ assertEquals(cas.getDocumentAnnotation().toString(), featurePath.getValueAsString(cas.getDocumentAnnotation()));
// test "/" featurePath
featurePath = new FeaturePathImpl();
@@ -354,12 +352,14 @@ public class FeaturePathTest extends Tes
cas.getDocumentAnnotation());
// test fsId()
+ String docAnnotId = Integer.toString(cas.getDocumentAnnotation()._id);
+
String path = "/refFeature:fsId()";
FeaturePath featurePath = new FeaturePathImpl();
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals("8", featurePath.getValueAsString(cas
+ assertEquals(docAnnotId, featurePath.getValueAsString(cas
.getDocumentAnnotation()));
// test fsId()
@@ -368,7 +368,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals("8", featurePath.getValueAsString(cas
+ assertEquals(docAnnotId, featurePath.getValueAsString(cas
.getDocumentAnnotation()));
// test coveredText()
@@ -435,7 +435,7 @@ public class FeaturePathTest extends Tes
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals("8", featurePath.getValueAsString(cas
+ assertEquals(docAnnotId, featurePath.getValueAsString(cas
.getDocumentAnnotation()));
}
@@ -673,7 +673,8 @@ public class FeaturePathTest extends Tes
.getDocumentAnnotation()));
assertEquals("/refFeature2/stringFeature", featurePath.getFeaturePath());
assertTrue(featurePath.size() == 2);
- assertTrue(featurePath.getFeature(1) == null);
+ // test case change: new impl sets features as paths are traversed;
+ assertTrue(featurePath.getFeature(1) == stringFeat);
featurePath.typeInit(cas.getDocumentAnnotation().getType());
assertEquals("MyExample", featurePath.getValueAsString(cas
.getDocumentAnnotation()));