You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/01/12 23:22:48 UTC
svn commit: r495766 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima:
analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
cas/impl/XmiCasDeserializerTest.java
internal/util/TextAnalysisEnginePoolTest.java
Author: alally
Date: Fri Jan 12 14:22:47 2007
New Revision: 495766
URL: http://svn.apache.org/viewvc?view=rev&rev=495766
Log:
Addressed TODOs in uimaj-core test cases
UIMA-45: https://issues.apache.org/jira/browse/UIMA-45
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/TextAnalysisEnginePoolTest.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?view=diff&rev=495766&r1=495765&r2=495766
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Fri Jan 12 14:22:47 2007
@@ -34,9 +34,11 @@
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.impl.FixedFlow_impl;
import org.apache.uima.cas.CAS;
+import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.NameValuePair;
import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.resource.metadata.impl.Capability_impl;
import org.apache.uima.resource.metadata.impl.ConfigurationParameter_impl;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
@@ -72,7 +74,14 @@
mSimpleDesc.getMetaData().setName("Simple Test");
TypeSystemDescription typeSys = new TypeSystemDescription_impl();
typeSys.addType("foo.Bar", "test", "uima.tcas.Annotation");
+ typeSys.addType("NamedEntity", "test", "uima.tcas.Annotation");
+ typeSys.addType("DocumentStructure", "test", "uima.tcas.Annotation");
mSimpleDesc.getAnalysisEngineMetaData().setTypeSystem(typeSys);
+ Capability cap = new Capability_impl();
+ cap.addOutputType("NamedEntity", true);
+ cap.addOutputType("DocumentStructure", true);
+ Capability[] caps = new Capability[] {cap};
+ mSimpleDesc.getAnalysisEngineMetaData().setCapabilities(caps);
mAggDesc = new TaeDescription_impl();
mAggDesc.setPrimitive(false);
@@ -81,6 +90,7 @@
FixedFlow_impl flow = new FixedFlow_impl();
flow.setFixedFlow(new String[] { "Test" });
mAggDesc.getAnalysisEngineMetaData().setFlowConstraints(flow);
+ mAggDesc.getAnalysisEngineMetaData().setCapabilities(caps);
} catch (Exception e) {
JUnitExtension.handleException(e);
}
@@ -291,12 +301,12 @@
// process(CAS,ResultSpecification)
ResultSpecification resultSpec = new ResultSpecification_impl();
- resultSpec.addResultType("FakeType", true);
+ resultSpec.addResultType("NamedEntity", true);
tcas.setDocumentText("testing...");
tae.process(tcas, resultSpec);
assertEquals("testing...", TestAnnotator.lastDocument);
- // TODO: resultSpec not supported assertEquals(resultSpec, TestAnnotator.lastResultSpec);
+ assertEquals(resultSpec, TestAnnotator.lastResultSpec);
tcas.reset();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?view=diff&rev=495766&r1=495765&r2=495766
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java Fri Jan 12 14:22:47 2007
@@ -292,15 +292,25 @@
xmlReader.setContentHandler(deserHandler2);
xmlReader.parse(new InputSource(new StringReader(xml)));
- // serialize the new CAS
+ //test that index is correctly populated
+ Type intArrayType = cas2.getTypeSystem().getType(CAS.TYPE_NAME_INTEGER_ARRAY);
+ Iterator iter = cas2.getIndexRepository().getAllIndexedFS(intArrayType);
+ assertTrue(iter.hasNext());
+ IntArrayFS intArrayFS2 = (IntArrayFS)iter.next();
+ assertFalse(iter.hasNext());
+ assertEquals(5, intArrayFS2.size());
+ assertEquals(1, intArrayFS2.get(0));
+ assertEquals(2, intArrayFS2.get(1));
+ assertEquals(3, intArrayFS2.get(2));
+ assertEquals(4, intArrayFS2.get(3));
+ assertEquals(5, intArrayFS2.get(4));
+
+ // test that serializing the new CAS produces the same XML
sw = new StringWriter();
xmlSer = new XMLSerializer(sw, false);
xmiSer = new XmiCasSerializer(cas2.getTypeSystem());
xmiSer.serialize(cas2, xmlSer.getContentHandler());
- String xml2 = sw.getBuffer().toString();
-
- // simple compare for now
- // TODO when default indexing is available, validate the integer array explicitly
+ String xml2 = sw.getBuffer().toString();
assertTrue(xml2.equals(xml));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/TextAnalysisEnginePoolTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/TextAnalysisEnginePoolTest.java?view=diff&rev=495766&r1=495765&r2=495766
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/TextAnalysisEnginePoolTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/TextAnalysisEnginePoolTest.java Fri Jan 12 14:22:47 2007
@@ -33,8 +33,10 @@
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.impl.FixedFlow_impl;
import org.apache.uima.cas.CAS;
+import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.NameValuePair;
+import org.apache.uima.resource.metadata.impl.Capability_impl;
import org.apache.uima.resource.metadata.impl.ConfigurationParameter_impl;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
@@ -64,6 +66,11 @@
mSimpleDesc
.setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
mSimpleDesc.getMetaData().setName("Simple Test");
+ Capability cap = new Capability_impl();
+ cap.addOutputType("NamedEntity", true);
+ cap.addOutputType("DocumentStructure", true);
+ Capability[] caps = new Capability[] {cap};
+ mSimpleDesc.getAnalysisEngineMetaData().setCapabilities(caps);
} catch (Exception e) {
JUnitExtension.handleException(e);
}
@@ -191,12 +198,12 @@
// process(CAS,ResultSpecification)
ResultSpecification resultSpec = new ResultSpecification_impl();
- resultSpec.addResultType("FakeType", true);
+ resultSpec.addResultType("NamedEntity", true);
tcas.setDocumentText("testing...");
tae.process(tcas, resultSpec);
assertEquals("testing...", TestAnnotator.lastDocument);
- // TODO: resultSpec not supported assertEquals(resultSpec, TestAnnotator.lastResultSpec);
+ assertEquals(resultSpec, TestAnnotator.lastResultSpec);
tcas.reset();
} finally {
aPool.releaseTAE(tae);