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 2006/12/19 18:32:10 UTC

svn commit: r488731 [1/2] - in /incubator/uima/uimaj/trunk/uimaj-core/src/test: java/org/apache/uima/analysis_engine/impl/ java/org/apache/uima/analysis_engine/impl/sequencer/ java/org/apache/uima/cas/impl/ java/org/apache/uima/cas/test/ java/org/apach...

Author: mbaessler
Date: Tue Dec 19 09:32:07 2006
New Revision: 488731

URL: http://svn.apache.org/viewvc?view=rev&rev=488731
Log:
JIRA ticket UIMA-45 (https://issues.apache.org/jira/browse/UIMA-45)

rewrite JUnitExtension.getFile() method to load files using the classloader.

When changing this method I also deleted the TestPropertyReader class which is now never used.

With these two changes above, there where lots of tests that must also be changed and adapted
to the new methods.

Added:
    incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ClassLoaderTest/
    incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/ClassLoaderTest/classLoadingTest.jar   (with props)
Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java?view=diff&rev=488731&r1=488730&r2=488731
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java Tue Dec 19 09:32:07 2006
@@ -33,7 +33,7 @@
 import org.apache.uima.resource.ResourceConfigurationException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceProcessException;
-import org.apache.uima.test.junit_extension.TestPropertyReader;
+import org.apache.uima.test.junit_extension.JUnitExtension;
 import org.apache.uima.util.ProcessTrace;
 
 /*
@@ -55,9 +55,6 @@
 
   public static boolean typeSystemInitCalled = false;
 
-  public AnnotationWriter() {
-  }
-
   /**
    * Initializes this CAS Consumer with the parameters specified in the descriptor.
    * 
@@ -66,13 +63,11 @@
    */
   public void initialize() throws ResourceInitializationException {
 
-    // get test base path setting
-    String junitTestBasePath = TestPropertyReader.getJUnitTestBasePath();
-    // extract configuration parameter settings
-    outFile = new File(junitTestBasePath, "CpmOutput.txt");
+    File testBaseDir = JUnitExtension.getFile("TextAnalysisEngineImplTest").getParentFile();
+    this.outFile = new File(testBaseDir, "CpmOutput.txt");
 
     try {
-      fileWriter = new OutputStreamWriter(new FileOutputStream(outFile, false), "UTF-8");
+      this.fileWriter = new OutputStreamWriter(new FileOutputStream(this.outFile, false), "UTF-8");
     } catch (Exception e) {
       throw new ResourceInitializationException(e);
     }
@@ -107,11 +102,11 @@
       for (typeIterator.moveToFirst(); typeIterator.isValid(); typeIterator.moveToNext()) {
         AnnotationFS annot = (AnnotationFS) typeIterator.get();
 
-        fileWriter.write(annot.getCoveredText());
-        fileWriter.write(System.getProperty("line.separator"));
-        fileWriter.write(annot.toString());
+        this.fileWriter.write(annot.getCoveredText());
+        this.fileWriter.write(System.getProperty("line.separator"));
+        this.fileWriter.write(annot.toString());
       }
-      fileWriter.flush();
+      this.fileWriter.flush();
     } catch (Exception ex) {
       ex.printStackTrace();
     }
@@ -148,8 +143,8 @@
    */
   public void collectionProcessComplete(ProcessTrace aTrace) throws ResourceProcessException,
           IOException {
-    if (fileWriter != null) {
-      fileWriter.close();
+    if (this.fileWriter != null) {
+      this.fileWriter.close();
     }
   }
 
@@ -164,7 +159,7 @@
    * @see org.apache.uima.resource.ConfigurableResource#reconfigure()
    */
   public void reconfigure() throws ResourceConfigurationException {
-
+    //do nothing
   }
 
   /**
@@ -173,9 +168,9 @@
    * @see org.apache.uima.resource.Resource#destroy()
    */
   public void destroy() {
-    if (fileWriter != null) {
+    if (this.fileWriter != null) {
       try {
-        fileWriter.close();
+        this.fileWriter.close();
       } catch (IOException e) {
         // ignore IOException on destroy
       }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java?view=diff&rev=488731&r1=488730&r2=488731
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java Tue Dec 19 09:32:07 2006
@@ -25,13 +25,12 @@
 import junit.framework.TestCase;
 
 import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.ResultSpecification;
-import org.apache.uima.analysis_engine.TextAnalysisEngine;
 import org.apache.uima.cas.text.TCAS;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.test.junit_extension.FileCompare;
 import org.apache.uima.test.junit_extension.JUnitExtension;
-import org.apache.uima.test.junit_extension.TestPropertyReader;
 import org.apache.uima.util.XMLInputSource;
 
 /**
@@ -40,7 +39,8 @@
  * @author Michael Baessler
  */
 public class SequencerCapabilityLanguageTest extends TestCase {
-  private String junitTestBasePath;
+
+  private File testBaseDir = null;
 
   /**
    * Constructor for SequencerTest
@@ -55,28 +55,28 @@
    * @see junit.framework.TestCase#setUp()
    */
   protected void setUp() throws Exception {
-    // get test base path setting
-    junitTestBasePath = TestPropertyReader.getJUnitTestBasePath();
+    this.testBaseDir = JUnitExtension.getFile("SequencerTest");
   }
 
   public void testSequencerCapabilityLanguageEsEn() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -84,39 +84,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("en");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsEnResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -126,41 +126,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsEnResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsEnUS() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -168,39 +167,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("en-US");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsEnUSResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -210,40 +209,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsEn.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsAr() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -251,39 +250,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("ar");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsArResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -293,40 +292,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsAr.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsUnkown() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -334,41 +333,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("unknown");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsUnkownResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -378,42 +375,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsZhCN() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -421,39 +416,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("zh-CN");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsZhCNResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -463,41 +458,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsXunSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -505,41 +499,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("x-unspecified");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsXunSpecResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -549,42 +541,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEn() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -592,39 +582,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("en");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEn.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEn.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEnResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -634,41 +624,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEnResultSpecCapital() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -678,41 +667,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEnResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageJa() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -720,39 +708,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("ja");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedJa.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedJa.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageJaResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -762,41 +750,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedJaResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageXunSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -804,39 +791,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("x-unspecified");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageXunSpecResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -846,40 +833,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedXunSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsFooBar() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -887,41 +874,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("foo-BAR");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsFooBarResultSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -931,42 +916,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert
-              .assertTrue(FileCompare.compare(
-                      junitTestBasePath + "SequencerTest/SequencerTest.txt", junitTestBasePath
-                              + "SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsUnknown.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsZhCNSmall() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -974,39 +957,39 @@
       cas.setDocumentText(text);
       cas.setDocumentLanguage("zh-cn");
       // Process the sample document.
-      tae.process(cas);
+      ae.process(cas);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsZhCN.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerCapabilityLanguageEsZhCNResultSpecSmall() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerCapabilityLanguageAggregateES.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageAggregateES.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -1016,19 +999,18 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath
-                      + "SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerCapabilityLanguageExpectedEsZhCNResultSpec.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java?view=diff&rev=488731&r1=488730&r2=488731
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java Tue Dec 19 09:32:07 2006
@@ -25,13 +25,12 @@
 import junit.framework.TestCase;
 
 import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.ResultSpecification;
-import org.apache.uima.analysis_engine.TextAnalysisEngine;
 import org.apache.uima.cas.text.TCAS;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.test.junit_extension.FileCompare;
 import org.apache.uima.test.junit_extension.JUnitExtension;
-import org.apache.uima.test.junit_extension.TestPropertyReader;
 import org.apache.uima.util.XMLInputSource;
 
 /*
@@ -42,7 +41,7 @@
  * TestCase for the Sequencer with a fixedFlow
  */
 public class SequencerFixedTest extends TestCase {
-  private String junitTestBasePath;
+  private File testBaseDir;
 
   /**
    * Constructor for SequencerTest
@@ -57,28 +56,28 @@
    * @see junit.framework.TestCase#setUp()
    */
   protected void setUp() throws Exception {
-    // get test base path setting
-    junitTestBasePath = TestPropertyReader.getJUnitTestBasePath();
+    // get test base path
+    this.testBaseDir = JUnitExtension.getFile("SequencerTest");
   }
 
   public void testSequencerFixedEn() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -88,41 +87,41 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
 
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedEN() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -132,41 +131,41 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
 
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedEnUS() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -176,40 +175,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedEnus() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -219,40 +218,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedUnkown() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -262,40 +261,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedFooBar() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -305,40 +304,40 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }
 
   public void testSequencerFixedXunSpec() throws Exception {
-    TextAnalysisEngine tae = null;
+    AnalysisEngine ae = null;
     try {
       // create TempFile for test
-      File outputReferenceFile = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
       outputReferenceFile.delete(); // delete file if exist
       outputReferenceFile.createNewFile(); // create new file
       outputReferenceFile.deleteOnExit(); // delete file after closing VM
 
       // Create an XML input source from the specifier file.
-      XMLInputSource in = new XMLInputSource(junitTestBasePath
-              + "SequencerTest/SequencerFixedAggregate.xml");
+      XMLInputSource in = new XMLInputSource(JUnitExtension
+              .getFile("SequencerTest/SequencerFixedAggregate.xml"));
       // Parse the specifier.
       ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
       // Create the Text Analysis Engine.
-      tae = UIMAFramework.produceTAE(specifier, null, null);
+      ae = UIMAFramework.produceAnalysisEngine(specifier, null, null);
       // Create a new TCAS.
-      TCAS cas = tae.newTCAS();
+      TCAS cas = ae.newTCAS();
       // Our sample text.
       String text = "Hello world!";
       // System.out.println("Processing text: \"" + text + "\"");
@@ -348,18 +347,18 @@
       // Process the sample document.
       ResultSpecification resultSpec = UIMAFramework.getResourceSpecifierFactory()
               .createResultSpecification();
-      resultSpec.addCapabilities(tae.getAnalysisEngineMetaData().getCapabilities());
-      tae.process(cas, resultSpec);
+      resultSpec.addCapabilities(ae.getAnalysisEngineMetaData().getCapabilities());
+      ae.process(cas, resultSpec);
       // check fileoutput
-      Assert.assertTrue(FileCompare.compare(junitTestBasePath + "SequencerTest/SequencerTest.txt",
-              junitTestBasePath + "SequencerTest/SequencerFixedExpected.txt"));
+      Assert.assertTrue(FileCompare.compare(outputReferenceFile, JUnitExtension
+              .getFile("SequencerTest/SequencerFixedExpected.txt")));
       outputReferenceFile.delete();
     } catch (Exception ex) {
       JUnitExtension.handleException(ex);
     } finally {
       // Destroy the CAS, releasing resources.
-      if (tae != null) {
-        tae.destroy();
+      if (ae != null) {
+        ae.destroy();
       }
     }
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java?view=diff&rev=488731&r1=488730&r2=488731
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java Tue Dec 19 09:32:07 2006
@@ -36,7 +36,7 @@
 import org.apache.uima.analysis_engine.annotator.Annotator_ImplBase;
 import org.apache.uima.analysis_engine.annotator.TextAnnotator;
 import org.apache.uima.cas.text.TCAS;
-import org.apache.uima.test.junit_extension.TestPropertyReader;
+import org.apache.uima.test.junit_extension.JUnitExtension;
 
 /**
  * Dummy annotator which does not processing. Annotator only writes his name and his result
@@ -48,11 +48,11 @@
   // annotator name
   private String name;
 
-  private String junitTestBasePath;
+  private File testBaseDir;
 
   public SequencerTestAnnotator() {
     super();
-    junitTestBasePath = TestPropertyReader.getJUnitTestBasePath();
+    this.testBaseDir = JUnitExtension.getFile("SequencerTest");
   }
 
   /**
@@ -88,16 +88,13 @@
    */
   public void process(TCAS tcas, ResultSpecification resultSpec) throws AnnotatorProcessException {
 
-    // get document language
-    final String documentLanguage = tcas.getDocumentLanguage();
-
     try {
       // use standard output file
-      File fp = new File(junitTestBasePath + "SequencerTest/SequencerTest.txt");
+      File fp = new File(this.testBaseDir, "SequencerTest.txt");
       if (fp.canWrite()) {
         // write result specification to the output file
         OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(fp, true), "UTF-8");
-        writer.write("\nResultSpec for annotator " + name + ":\n");
+        writer.write("\nResultSpec for annotator " + this.name + ":\n");
         TypeOrFeature[] tofs = resultSpec.getResultTypesAndFeatures();
         // sort by name to ensure consistent output for testing purposes
         Arrays.sort(tofs, new Comparator() {
@@ -111,8 +108,7 @@
         writer.flush();
         writer.close();
       } else {
-        throw new IOException("Cannot write to " + junitTestBasePath
-                + "SequencerTest/SequencerTest.txt");
+        throw new IOException("Cannot write to " + fp.getAbsolutePath());
       }
     } catch (IOException e) {
       // If an error occours, throw new annotator exception

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java?view=diff&rev=488731&r1=488730&r2=488731
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/UnambiguousIteratorTest.java Tue Dec 19 09:32:07 2006
@@ -32,7 +32,6 @@
 import org.apache.uima.resource.metadata.FsIndexDescription;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 import org.apache.uima.test.junit_extension.JUnitExtension;
-import org.apache.uima.test.junit_extension.TestPropertyReader;
 import org.apache.uima.util.CasCreationUtils;
 import org.apache.uima.util.XMLInputSource;
 
@@ -44,7 +43,6 @@
  * Testclass for the JTok annotator.
  */
 public class UnambiguousIteratorTest extends TestCase {
-  private String junitTestBasePath;
 
   private static final String casDataDirName = "CASTests";
 
@@ -56,22 +54,13 @@
 
   private static final String sampleTsFileName = "sample.ts";
 
-  /**
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception {
-    // get test base path setting
-    this.junitTestBasePath = TestPropertyReader.getJUnitTestBasePath();
-  }
-
   public void testUnambiguous() throws Exception {
 
     // The two XCASes used in this test contain the same data, but the
     // second one contains all annotations twice. So in that case, every
     // other annotation is filtered by the unambiguous iterator.
 
-    File baseDir = new File(this.junitTestBasePath);
-    File dataDir = new File(baseDir, casDataDirName);
+    File dataDir = JUnitExtension.getFile(casDataDirName);
     File xcasDir = new File(dataDir, xcasSampleDirName);
 
     try {