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:06:55 UTC
svn commit: r495757 - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/analysis_engine/impl/compatibility/
test/java/org/apache/uima/analysis_engine/impl/
test/resources/TextAnalysisEngineImplTest/
Author: alally
Date: Fri Jan 12 14:06:54 2007
New Revision: 495757
URL: http://svn.apache.org/viewvc?view=rev&rev=495757
Log:
Fixed problems with AnalysisEngine_implTest, and then fixed the
problem that the test exposed (incorrect caching of ResultSpecifications).
UIMA-186: https://issues.apache.org/jira/browse/UIMA-186
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java?view=diff&rev=495757&r1=495756&r2=495757
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java Fri Jan 12 14:06:54 2007
@@ -116,6 +116,7 @@
public void setResultSpecification(ResultSpecification aResultSpec) {
mDefaultResultSpecification = aResultSpec;
+ mLanguageToResultSpecMap = new HashMap();
}
/*
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?view=diff&rev=495757&r1=495756&r2=495757
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Fri Jan 12 14:06:54 2007
@@ -56,6 +56,7 @@
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.impl.URISpecifier_impl;
import org.apache.uima.resource.metadata.AllowedValue;
+import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.FeatureDescription;
import org.apache.uima.resource.metadata.FsIndexDescription;
@@ -66,6 +67,7 @@
import org.apache.uima.resource.metadata.TypePriorityList;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.AllowedValue_impl;
+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.FeatureDescription_impl;
import org.apache.uima.resource.metadata.impl.FsIndexDescription_impl;
@@ -318,6 +320,11 @@
primitiveDesc
.setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
primitiveDesc.getMetaData().setName("Test Primitive TAE");
+ Capability cap = new Capability_impl();
+ cap.addOutputType("NamedEntity", true);
+ cap.addOutputType("DocumentStructure", true);
+ Capability[] caps = new Capability[] {cap};
+ primitiveDesc.getAnalysisEngineMetaData().setCapabilities(caps);
_testProcess(primitiveDesc);
// test simple aggregate TextAnalysisEngine (again using TestAnnotator class)
@@ -328,6 +335,7 @@
FixedFlow_impl flow = new FixedFlow_impl();
flow.setFixedFlow(new String[] { "Test" });
aggDesc.getAnalysisEngineMetaData().setFlowConstraints(flow);
+ aggDesc.getAnalysisEngineMetaData().setCapabilities(caps);
_testProcess(aggDesc);
// test aggregate TAE containing a CAS Consumer
@@ -367,12 +375,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/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml?view=diff&rev=495757&r1=495756&r2=495757
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml Fri Jan 12 14:06:54 2007
@@ -51,7 +51,10 @@
<capabilities>
<capability>
<inputs/>
-<outputs/>
+<outputs>
+ <type allAnnotatorFeatures="true">NamedEntity</type>
+ <type allAnnotatorFeatures="true">DocumentStructure</type>
+</outputs>
<languagesSupported/>
</capability>
</capabilities>
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml?view=diff&rev=495757&r1=495756&r2=495757
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestPrimitiveTae1.xml Fri Jan 12 14:06:54 2007
@@ -116,8 +116,8 @@
<capabilities>
<capability>
<outputs>
-<type>DocumentStructure</type>
-<type>NamedEntity</type>
+<type allAnnotatorFeatures="true">DocumentStructure</type>
+<type allAnnotatorFeatures="true">NamedEntity</type>
</outputs>
<languagesSupported>
<language>en</language>