You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by mb...@apache.org on 2007/04/10 17:48:13 UTC
svn commit: r527163 [2/2] - in
/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima:
analysis_engine/impl/ cas/impl/ cas/test/ cas_data/impl/ impl/
internal/util/ jcas/test/ resource/ resource/impl/ resource/metadata/impl/
resource/serv...
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java Tue Apr 10 08:48:10 2007
@@ -23,9 +23,9 @@
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.analysis_engine.TaeDescription;
-import org.apache.uima.analysis_engine.TextAnalysisEngine;
-import org.apache.uima.analysis_engine.impl.TaeDescription_impl;
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.metadata.ResourceMetaData;
import org.apache.uima.test.junit_extension.JUnitExtension;
@@ -52,12 +52,12 @@
try {
super.setUp();
// create resource specifier and a pool containing 3 instances
- mDesc = new TaeDescription_impl();
+ mDesc = new AnalysisEngineDescription_impl();
mDesc.setPrimitive(true);
mDesc.setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
mDesc.getMetaData().setName("Test TAE");
mDesc.getMetaData().setDescription("This is a test.");
- pool1 = new ResourcePool(3, mDesc, TextAnalysisEngine.class);
+ pool1 = new ResourcePool(3, mDesc, AnalysisEngine.class);
} catch (Exception e) {
JUnitExtension.handleException(e);
}
@@ -205,7 +205,7 @@
}
}
- private TaeDescription mDesc;
+ private AnalysisEngineDescription mDesc;
private ResourcePool pool1;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java Tue Apr 10 08:48:10 2007
@@ -233,5 +233,6 @@
}
public void testNothing() {
+ //do nothing
} // to avoid junit warning about no tests found
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java Tue Apr 10 08:48:10 2007
@@ -25,8 +25,8 @@
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.analysis_engine.TextAnalysisEngine;
import org.apache.uima.resource.impl.ResourceCreationSpecifier_impl;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.ResourceMetaData;
@@ -179,7 +179,7 @@
// (instantiate metadata from XML TAE descriptor because it's convenient)
XMLInputSource in = new XMLInputSource(JUnitExtension
.getFile("ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml"));
- AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseTaeDescription(in);
+ AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in);
ResourceMetaData metadata = desc.getMetaData();
MyTestSpecifier spec = new MyTestSpecifier();
spec.setMetaData(metadata);
@@ -232,7 +232,7 @@
.getFile("ConfigurableResourceImplTest/AnnotatorWithConfigurationGroups.xml"));
AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(
in);
- TextAnalysisEngine test = UIMAFramework.produceTAE(desc);
+ AnalysisEngine test = UIMAFramework.produceAnalysisEngine(desc);
// test default fallback
String str3 = (String) test.getConfigParameterValue("StringParam");
@@ -281,6 +281,7 @@
}
public void destroy() {
+ //do nothing
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/TestResourceInterface_impl.java Tue Apr 10 08:48:10 2007
@@ -65,6 +65,7 @@
* @see org.apache.uima.resource.Resource#destroy()
*/
public void destroy() {
+ //do nothing
}
/**
@@ -87,6 +88,7 @@
*/
public void setConfigurationParameters(NameValuePair[] aSettings)
throws ResourceConfigurationException {
+ //do nothing
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_implTest.java Tue Apr 10 08:48:10 2007
@@ -20,7 +20,6 @@
package org.apache.uima.resource.metadata.impl;
import java.io.File;
-import java.util.ArrayList;
import junit.framework.TestCase;
@@ -30,7 +29,6 @@
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.Import;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java Tue Apr 10 08:48:10 2007
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.analysis_engine.impl.TaeDescription_impl;
+import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.InvalidXMLException;
@@ -156,11 +156,11 @@
.getFile("ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml");
File importedFile = JUnitExtension
.getFile("ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml");
- TaeDescription_impl agg = (TaeDescription_impl) UIMAFramework.getXMLParser()
- .parseTaeDescription(new XMLInputSource(baseDescriptorFile));
+ AnalysisEngineDescription_impl agg = (AnalysisEngineDescription_impl) UIMAFramework.getXMLParser()
+ .parseAnalysisEngineDescription(new XMLInputSource(baseDescriptorFile));
assertEquals(baseDescriptorFile.toURL(), agg.getSourceUrl());
- TaeDescription_impl prim = (TaeDescription_impl) agg.getDelegateAnalysisEngineSpecifiers()
+ AnalysisEngineDescription_impl prim = (AnalysisEngineDescription_impl) agg.getDelegateAnalysisEngineSpecifiers()
.get("Annotator1");
assertEquals(importedFile.toURL(), prim.getSourceUrl());
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java Tue Apr 10 08:48:10 2007
@@ -29,6 +29,7 @@
*/
public class TestFruitBagObject extends MetaDataObject_impl {
public TestFruitBagObject() {
+ //do nothing
}
public TestFruitObject[] getFruits() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java Tue Apr 10 08:48:10 2007
@@ -29,6 +29,7 @@
*/
public class TestFruitObject extends MetaDataObject_impl {
public TestFruitObject() {
+ //do nothing
}
public String getName() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java Tue Apr 10 08:48:10 2007
@@ -21,7 +21,6 @@
import java.io.File;
import java.net.URL;
-import java.util.ArrayList;
import junit.framework.TestCase;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java Tue Apr 10 08:48:10 2007
@@ -22,8 +22,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.uima.analysis_engine.TaeDescription;
-import org.apache.uima.analysis_engine.impl.TaeDescription_impl;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.apache.uima.resource.metadata.ResourceMetaData;
import org.apache.uima.resource.metadata.impl.ConfigurationParameter_impl;
@@ -50,7 +50,7 @@
try {
super.setUp();
// create resource specifier and a pool containing 2 instances
- TaeDescription primitiveDesc = new TaeDescription_impl();
+ AnalysisEngineDescription primitiveDesc = new AnalysisEngineDescription_impl();
primitiveDesc.setPrimitive(true);
primitiveDesc
.setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/TestResourceServiceStub.java Tue Apr 10 08:48:10 2007
@@ -52,7 +52,7 @@
* @see org.apache.uima.resource.service.impl.ResourceServiceStub#destroy()
*/
public void destroy() {
-
+ //do nothing
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java Tue Apr 10 08:48:10 2007
@@ -32,13 +32,6 @@
super(arg0);
}
- /**
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
-
- }
-
public void testLevelOff() throws Exception {
Level level = Level.OFF;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java Tue Apr 10 08:48:10 2007
@@ -33,13 +33,6 @@
super(arg0);
}
- /**
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
-
- }
-
public void testLogWrapperCreation() throws Exception {
org.apache.uima.util.Logger rootLogger = Logger_impl.getInstance();
org.apache.uima.util.Logger rootLogger1 = Logger_impl.getInstance();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java?view=diff&rev=527163&r1=527162&r2=527163
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java Tue Apr 10 08:48:10 2007
@@ -29,7 +29,6 @@
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.analysis_engine.TaeDescription;
import org.apache.uima.flow.FlowControllerDescription;
import org.apache.uima.resource.CustomResourceSpecifier;
import org.apache.uima.resource.Parameter;
@@ -98,12 +97,12 @@
File envVarRefTest = JUnitExtension.getFile("XmlParserTest/EnvVarRefTest.xml");
System.setProperty("uima.test.var1", "foo");
System.setProperty("uima.test.var2", "bar");
- TaeDescription taeDesc = UIMAFramework.getXMLParser().parseTaeDescription(
+ AnalysisEngineDescription taeDesc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(
new XMLInputSource(envVarRefTest), new XMLParser.ParsingOptions(true, true));
Assert.assertEquals("foo-bar", taeDesc.getMetaData().getName());
// parse with env var ref expansion disabled
- taeDesc = UIMAFramework.getXMLParser().parseTaeDescription(new XMLInputSource(envVarRefTest),
+ taeDesc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(new XMLInputSource(envVarRefTest),
new XMLParser.ParsingOptions(false));
Assert.assertEquals(
"<envVarRef>uima.test.var1</envVarRef>-<envVarRef>uima.test.var2</envVarRef>",
@@ -138,6 +137,7 @@
fail();
}
catch (InvalidXMLException e) {
+ //do nothing
}
} catch (Exception e) {
JUnitExtension.handleException(e);