You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2019/04/15 12:48:34 UTC

svn commit: r1857574 [2/2] - in /uima/uv3/ruta-v3/trunk/ruta-core: ./ src/main/jflex/org/apache/uima/ruta/seed/ src/test/java/org/apache/uima/ruta/ src/test/java/org/apache/uima/ruta/action/ src/test/java/org/apache/uima/ruta/block/ src/test/java/org/a...

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java Mon Apr 15 12:48:34 2019
@@ -22,14 +22,11 @@ package org.apache.uima.ruta.engine;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 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.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Type;
@@ -37,11 +34,8 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.fit.factory.JCasFactory;
 import org.apache.uima.jcas.JCas;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.FileUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -63,7 +57,7 @@ public class HtmlConverterTest {
   private String outputViewName = "raw_testing";
 
   @BeforeClass
-  public static void setUpClass() throws IOException, URISyntaxException {
+  public static void setUpClass() throws Exception {
     // get resource
     String namespace = HtmlConverterTest.class.getPackage().getName().replaceAll("\\.", "/");
     String testFilename = namespace + "/" + "testWin.html";
@@ -98,14 +92,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentHtmlDecodingExplicitPolicyTest()
-          throws AnalysisEngineProcessException, ResourceConfigurationException,
-          ResourceInitializationException, InvalidXMLException, IOException {
+  public void htmlBodyContentHtmlDecodingExplicitPolicyTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -138,14 +130,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentHtmlDecodingHeuristicPolicyTest()
-          throws AnalysisEngineProcessException, ResourceConfigurationException,
-          ResourceInitializationException, InvalidXMLException, IOException {
+  public void htmlBodyContentHtmlDecodingHeuristicPolicyTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -175,14 +165,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentUnixTest() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void htmlBodyContentUnixTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -212,14 +200,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentWinTest() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void htmlBodyContentWinTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -249,14 +235,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentWithCommentsTest() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void htmlBodyContentWithCommentsTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -286,14 +270,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentNLTagsTest() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void htmlBodyContentNLTagsTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -324,14 +306,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void htmlBodyContentWithCommentsAndScriptTest() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void htmlBodyContentWithCommentsAndScriptTest() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -367,12 +347,12 @@ public class HtmlConverterTest {
       // configure annotator and create AE:
       URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
       if (url == null) {
-        url = HtmlConverter.class.getClassLoader().getResource(
-                "org/apache/uima/ruta/engine/HtmlConverter.xml");
+        url = HtmlConverter.class.getClassLoader()
+                .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
       }
       XMLInputSource in = new XMLInputSource(url);
-      AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework
-              .getXMLParser().parseResourceSpecifier(in);
+      AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework.getXMLParser()
+              .parseResourceSpecifier(in);
 
       AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
       ae.setConfigParameterValue("outputView", outputViewName);
@@ -414,13 +394,13 @@ public class HtmlConverterTest {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
-    AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework
-            .getXMLParser().parseResourceSpecifier(in);
-    
+    AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework.getXMLParser()
+            .parseResourceSpecifier(in);
+
     AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
     ae.setConfigParameterValue("outputView", outputViewName);
     ae.reconfigure();
@@ -476,14 +456,12 @@ public class HtmlConverterTest {
   }
 
   @Test
-  public void parameterTestInputView() throws AnalysisEngineProcessException,
-          ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
-          IOException {
+  public void parameterTestInputView() throws Exception {
     // configure annotator and create AE:
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -515,15 +493,16 @@ public class HtmlConverterTest {
     // fini
     cas.release();
   }
-  
+
   @Test
   public void testStyle() throws Exception {
-    String html = "<html><head>\n" + "<style>\n" + "/*  */\n" + ".test {\n" + "   text-align: left;\n" + "}\n"
-            + "</style>\n" + "</head><body>Hello world</body></html>";
+    String html = "<html><head>\n" + "<style>\n" + "/*  */\n" + ".test {\n"
+            + "   text-align: left;\n" + "}\n" + "</style>\n"
+            + "</head><body>Hello world</body></html>";
     URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
     if (url == null) {
-      url = HtmlConverter.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/HtmlConverter.xml");
+      url = HtmlConverter.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/HtmlConverter.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java Mon Apr 15 12:48:34 2019
@@ -19,33 +19,30 @@
 package org.apache.uima.ruta.engine;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.fit.factory.AnalysisEngineFactory;
 import org.apache.uima.fit.internal.ResourceManagerFactory;
 import org.apache.uima.fit.internal.ResourceManagerFactory.ResourceManagerCreator;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceManager;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class ResourcesFromDataPathTest {
 
   @Test
-  public void test() throws IOException, ResourceInitializationException, InvalidXMLException,
-          AnalysisEngineProcessException {
+  public void test() throws Exception {
 
     final String datapath = "target/datapath/";
     new File(datapath).mkdirs();
     FileUtils.copyFile(new File("src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta"),
             new File(datapath + "MarkFastTest.ruta"));
-    FileUtils.copyFile(new File("src/test/resources/org/apache/uima/ruta/action/MarkFastTestList.txt"),
+    FileUtils.copyFile(
+            new File("src/test/resources/org/apache/uima/ruta/action/MarkFastTestList.txt"),
             new File(datapath + "MarkFastTestList.txt"));
     ResourceManagerFactory.setResourceManagerCreator(new ResourceManagerCreator() {
 
@@ -61,12 +58,13 @@ public class ResourcesFromDataPathTest {
         return resourceManager;
       }
     });
-    
-    
-    AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class, RutaEngine.PARAM_MAIN_SCRIPT, "MarkFastTest");
-    CAS cas = RutaTestUtils.getCAS(FileUtils.readFileToString(new File("src/test/resources/org/apache/uima/ruta/action/MarkFastTest.txt")));
+
+    AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
+            RutaEngine.PARAM_MAIN_SCRIPT, "MarkFastTest");
+    CAS cas = RutaTestUtils.getCAS(FileUtils.readFileToString(
+            new File("src/test/resources/org/apache/uima/ruta/action/MarkFastTest.txt")));
     ae.process(cas);
-    
+
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "1 0 0", "100", "2 0 0");
     RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
     RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "100");

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java Mon Apr 15 12:48:34 2019
@@ -19,7 +19,6 @@
 
 package org.apache.uima.ruta.engine;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,25 +26,23 @@ import java.util.Map;
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
 import org.junit.Test;
 
 public class RulesParamTest {
   @Test
-  public void test() throws IOException, InvalidXMLException, ResourceInitializationException, ResourceConfigurationException {
+  public void test() throws Exception {
     String document = "Some text.";
     String script = "CW SW{-> T1};\n";
 
     Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put(RutaEngine.PARAM_RULES, script);
-    
+
     URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
     if (url == null) {
-      url = RutaTestUtils.class.getClassLoader().getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
+      url = RutaTestUtils.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -55,7 +52,7 @@ public class RulesParamTest {
     CAS cas = null;
     try {
       cas = RutaTestUtils.getCAS(document);
-    ae.process(cas);
+      ae.process(cas);
     } catch (Exception e) {
       e.printStackTrace();
     }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java Mon Apr 15 12:48:34 2019
@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java Mon Apr 15 12:48:34 2019
@@ -21,16 +21,13 @@ package org.apache.uima.ruta.engine;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
 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.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.impl.AnnotationImpl;
@@ -38,7 +35,6 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.FsIndexDescription;
 import org.apache.uima.resource.metadata.TypeDescription;
 import org.apache.uima.resource.metadata.TypePriorities;
@@ -46,153 +42,148 @@ import org.apache.uima.resource.metadata
 import org.apache.uima.resource.metadata.impl.TypeDescription_impl;
 import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
 import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class RutaTest {
 
-   @Test
-   public void testApply() throws Exception {
-   URL typePrioritiesUrl = RutaTestUtils.class.getResource("TypePriorities.xml");
-   URL tsUrl = RutaTestUtils.class.getResource("BasicTypeSystem.xml");
-   Object descriptor = UIMAFramework.getXMLParser().parse(new XMLInputSource(tsUrl));
-   TypeSystemDescription tsDesc = (TypeSystemDescription) descriptor;
-   tsDesc.addType("uima.ruta.T1", "", "uima.tcas.Annotation");
-   tsDesc.addType("uima.ruta.T2", "", "uima.tcas.Annotation");
-   tsDesc.addType("uima.ruta.T3", "", "uima.tcas.Annotation");
-   tsDesc.resolveImports();
-   TypePriorities typePriorities = UIMAFramework.getXMLParser().parseTypePriorities(
-   new XMLInputSource(typePrioritiesUrl));
-   CAS cas = CasCreationUtils.createCas(tsDesc, typePriorities, new FsIndexDescription[0]);
-  
-   cas.setDocumentText("Some document.");
-  
-   Ruta.apply(cas, "CW{-> MARK(T1)} SW;");
-   AnnotationIndex<AnnotationFS> ai = null;
-   FSIterator<AnnotationFS> iterator = null;
-   ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T1"));
-   iterator = ai.iterator();
-   assertEquals(1, ai.size());
-   assertEquals("Some", iterator.next().getCoveredText());
-  
-   Ruta.apply(cas, "T1 SW{-> MARK(T2)};");
-   ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T2"));
-   iterator = ai.iterator();
-   assertEquals(1, ai.size());
-   assertEquals("document", iterator.next().getCoveredText());
-  
-   Ruta.apply(cas, "T1{-> MARK(T3,1,2,3)} T2 PERIOD;");
-   ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T3"));
-   iterator = ai.iterator();
-   assertEquals(1, ai.size());
-   assertEquals("Some document.", iterator.next().getCoveredText());
-  
-   cas.release();
-   }
-  
-   @Test
-   public void testCreateAnalysisEngineDescription() throws Exception {
-   TypeSystemDescription_impl tsdi = new TypeSystemDescription_impl();
-   String t1 = "some.type.Test1";
-   String t2 = "some.type.Test2";
-   TypeDescription_impl ti1 = new TypeDescription_impl(t1, "", "uima.tcas.Annotation");
-   TypeDescription_impl ti2 = new TypeDescription_impl(t2, "", "uima.tcas.Annotation");
-   tsdi.setTypes(new TypeDescription[] { ti1, ti2 });
-  
-   String script = "CW SW{-> MARK(Test1)};\n Test1 SW{-> MARK(Test2)};";
-   @SuppressWarnings("deprecation")
-   AnalysisEngineDescription aed = Ruta.createAnalysisEngineDescription(script, tsdi);
-   AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed);
-   CAS cas = ae.newCAS();
-   cas.setDocumentText("Only some text.");
-   ae.process(cas);
-  
-   Type type1 = cas.getTypeSystem().getType(t1);
-   AnnotationIndex<AnnotationFS> ai1 = cas.getAnnotationIndex(type1);
-   assertEquals(1, ai1.size());
-   assertEquals("some", ai1.iterator().get().getCoveredText());
-  
-   Type type2 = cas.getTypeSystem().getType(t2);
-   AnnotationIndex<AnnotationFS> ai2 = cas.getAnnotationIndex(type2);
-   assertEquals(1, ai2.size());
-   assertEquals("text", ai2.iterator().get().getCoveredText());
-   }
-  
-   @Test
-   public void testApplyRule() throws ResourceInitializationException, InvalidXMLException,
-   IOException, CASException, AnalysisEngineProcessException {
-   CAS cas = RutaTestUtils.getCAS("Some document.");
-   JCas jcas = cas.getJCas();
-  
-   Ruta.applyRule(jcas, "CW{-> MARK(T1)} SW;");
-   RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some");
-  
-   Ruta.applyRule(jcas, "T1 SW{-> MARK(T2)};");
-   RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "document");
-  
-   Ruta.applyRule(jcas, "T1{-> MARK(T3,1,2,3)} T2 PERIOD;");
-   RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Some document.");
-   }
-  
-   @Test
-   public void testSelect() throws ResourceInitializationException, InvalidXMLException,
-   IOException, CASException, AnalysisEngineProcessException {
-   String document = "Some text.";
-   CAS cas = RutaTestUtils.getCAS(document);
-   JCas jcas = cas.getJCas();
-   List<Annotation> select1 = Ruta.select(jcas, "W{REGEXP(\"t.*\")};");
-   Assert.assertEquals(1, select1.size());
-   Assert.assertEquals("text", select1.get(0).getCoveredText());
-  
-   List<Annotation> select2 = Ruta.select(jcas, "Document<-{ANY @PERIOD;};");
-   Assert.assertEquals(1, select2.size());
-   Assert.assertEquals("Some text.", select2.get(0).getCoveredText());
-  
-   List<Annotation> select3 = Ruta.select(jcas, "ANY @ANY;");
-   Assert.assertEquals(2, select3.size());
-   Assert.assertEquals("Some text", select3.get(0).getCoveredText());
-   Assert.assertEquals("text.", select3.get(1).getCoveredText());
-   }
+  @Test
+  public void testApply() throws Exception {
+    URL typePrioritiesUrl = RutaTestUtils.class.getResource("TypePriorities.xml");
+    URL tsUrl = RutaTestUtils.class.getResource("BasicTypeSystem.xml");
+    Object descriptor = UIMAFramework.getXMLParser().parse(new XMLInputSource(tsUrl));
+    TypeSystemDescription tsDesc = (TypeSystemDescription) descriptor;
+    tsDesc.addType("uima.ruta.T1", "", "uima.tcas.Annotation");
+    tsDesc.addType("uima.ruta.T2", "", "uima.tcas.Annotation");
+    tsDesc.addType("uima.ruta.T3", "", "uima.tcas.Annotation");
+    tsDesc.resolveImports();
+    TypePriorities typePriorities = UIMAFramework.getXMLParser()
+            .parseTypePriorities(new XMLInputSource(typePrioritiesUrl));
+    CAS cas = CasCreationUtils.createCas(tsDesc, typePriorities, new FsIndexDescription[0]);
+
+    cas.setDocumentText("Some document.");
+
+    Ruta.apply(cas, "CW{-> MARK(T1)} SW;");
+    AnnotationIndex<AnnotationFS> ai = null;
+    FSIterator<AnnotationFS> iterator = null;
+    ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T1"));
+    iterator = ai.iterator();
+    assertEquals(1, ai.size());
+    assertEquals("Some", iterator.next().getCoveredText());
+
+    Ruta.apply(cas, "T1 SW{-> MARK(T2)};");
+    ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T2"));
+    iterator = ai.iterator();
+    assertEquals(1, ai.size());
+    assertEquals("document", iterator.next().getCoveredText());
+
+    Ruta.apply(cas, "T1{-> MARK(T3,1,2,3)} T2 PERIOD;");
+    ai = cas.getAnnotationIndex(cas.getTypeSystem().getType("uima.ruta.T3"));
+    iterator = ai.iterator();
+    assertEquals(1, ai.size());
+    assertEquals("Some document.", iterator.next().getCoveredText());
+
+    cas.release();
+  }
+
+  @Test
+  public void testCreateAnalysisEngineDescription() throws Exception {
+    TypeSystemDescription_impl tsdi = new TypeSystemDescription_impl();
+    String t1 = "some.type.Test1";
+    String t2 = "some.type.Test2";
+    TypeDescription_impl ti1 = new TypeDescription_impl(t1, "", "uima.tcas.Annotation");
+    TypeDescription_impl ti2 = new TypeDescription_impl(t2, "", "uima.tcas.Annotation");
+    tsdi.setTypes(new TypeDescription[] { ti1, ti2 });
+
+    String script = "CW SW{-> MARK(Test1)};\n Test1 SW{-> MARK(Test2)};";
+    @SuppressWarnings("deprecation")
+    AnalysisEngineDescription aed = Ruta.createAnalysisEngineDescription(script, tsdi);
+    AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed);
+    CAS cas = ae.newCAS();
+    cas.setDocumentText("Only some text.");
+    ae.process(cas);
+
+    Type type1 = cas.getTypeSystem().getType(t1);
+    AnnotationIndex<AnnotationFS> ai1 = cas.getAnnotationIndex(type1);
+    assertEquals(1, ai1.size());
+    assertEquals("some", ai1.iterator().get().getCoveredText());
+
+    Type type2 = cas.getTypeSystem().getType(t2);
+    AnnotationIndex<AnnotationFS> ai2 = cas.getAnnotationIndex(type2);
+    assertEquals(1, ai2.size());
+    assertEquals("text", ai2.iterator().get().getCoveredText());
+  }
 
   @Test
-  public void testSelectWithInjection() throws ResourceInitializationException,
-          InvalidXMLException, IOException, CASException, AnalysisEngineProcessException {
+  public void testApplyRule() throws Exception {
+    CAS cas = RutaTestUtils.getCAS("Some document.");
+    JCas jcas = cas.getJCas();
+
+    Ruta.applyRule(jcas, "CW{-> MARK(T1)} SW;");
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some");
+
+    Ruta.applyRule(jcas, "T1 SW{-> MARK(T2)};");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "document");
+
+    Ruta.applyRule(jcas, "T1{-> MARK(T3,1,2,3)} T2 PERIOD;");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Some document.");
+  }
+
+  @Test
+  public void testSelect() throws Exception {
+    String document = "Some text.";
+    CAS cas = RutaTestUtils.getCAS(document);
+    JCas jcas = cas.getJCas();
+    List<Annotation> select1 = Ruta.select(jcas, "W{REGEXP(\"t.*\")};");
+    Assert.assertEquals(1, select1.size());
+    Assert.assertEquals("text", select1.get(0).getCoveredText());
+
+    List<Annotation> select2 = Ruta.select(jcas, "Document<-{ANY @PERIOD;};");
+    Assert.assertEquals(1, select2.size());
+    Assert.assertEquals("Some text.", select2.get(0).getCoveredText());
+
+    List<Annotation> select3 = Ruta.select(jcas, "ANY @ANY;");
+    Assert.assertEquals(2, select3.size());
+    Assert.assertEquals("Some text", select3.get(0).getCoveredText());
+    Assert.assertEquals("text.", select3.get(1).getCoveredText());
+  }
+
+  @Test
+  public void testSelectWithInjection() throws Exception {
     String document = "Some text.";
     CAS cas = RutaTestUtils.getCAS(document);
     AnnotationImpl t1 = (AnnotationImpl) cas.createAnnotation(RutaTestUtils.getTestType(cas, 1), 5,
             9);
     cas.addFsToIndexes(t1);
     JCas jcas = cas.getJCas();
-     List<Annotation> select1 = Ruta.select(jcas, Ruta.inject("W $;", t1));
-     Assert.assertEquals(1, select1.size());
-     Assert.assertEquals("Some text", select1.get(0).getCoveredText());
+    List<Annotation> select1 = Ruta.select(jcas, Ruta.inject("W $;", t1));
+    Assert.assertEquals(1, select1.size());
+    Assert.assertEquals("Some text", select1.get(0).getCoveredText());
 
 //    List<Annotation> select2 = Ruta.select(jcas, Ruta.inject("W{W.begin == $.begin};", t1));
 //    Assert.assertEquals(1, select2.size());
 //    Assert.assertEquals("text", select2.get(0).getCoveredText());
   }
-  
+
   @Test
-  public void testMatches() throws ResourceInitializationException,
-          InvalidXMLException, IOException, CASException, AnalysisEngineProcessException {
+  public void testMatches() throws Exception {
     JCas jcas = RutaTestUtils.getCAS("Some text.").getJCas();
     Assert.assertTrue(Ruta.matches(jcas, "CW # @PERIOD;"));
     Assert.assertTrue(Ruta.matches(jcas, "W{IS(CW)} \"text\";"));
   }
-  
+
   @Test
-  public void testMatchesWithInjection() throws ResourceInitializationException,
-          InvalidXMLException, IOException, CASException, AnalysisEngineProcessException {
+  public void testMatchesWithInjection() throws Exception {
     String document = "Some text.";
     CAS cas = RutaTestUtils.getCAS(document);
     AnnotationImpl t1 = (AnnotationImpl) cas.createAnnotation(RutaTestUtils.getTestType(cas, 1), 5,
             9);
     cas.addFsToIndexes(t1);
     JCas jcas = cas.getJCas();
-     Assert.assertTrue(Ruta.matches(jcas, Ruta.inject("W $;", t1)));
-     Assert.assertTrue(Ruta.matches(jcas, Ruta.inject("${REGEXP(\"te.*\"), PARTOF(SW)} PERIOD;", t1)));
+    Assert.assertTrue(Ruta.matches(jcas, Ruta.inject("W $;", t1)));
+    Assert.assertTrue(
+            Ruta.matches(jcas, Ruta.inject("${REGEXP(\"te.*\"), PARTOF(SW)} PERIOD;", t1)));
   }
 
 }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java Mon Apr 15 12:48:34 2019
@@ -21,7 +21,6 @@ package org.apache.uima.ruta.engine;
 import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
 import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,14 +28,10 @@ import java.util.Collection;
 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.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
 import org.junit.Test;
 
@@ -55,9 +50,7 @@ public class StackedScriptsTest {
   String rules3 = "W{PARTOF({T1,T2,T3})->T4};";
 
   @Test
-  public void testWithUimaFitAggregated() throws ResourceInitializationException,
-          InvalidXMLException, IOException, AnalysisEngineProcessException,
-          ResourceConfigurationException {
+  public void testWithUimaFitAggregated() throws Exception {
 
     AnalysisEngine aae = createEngine(createEngineDescription(
             createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules1),
@@ -74,8 +67,7 @@ public class StackedScriptsTest {
   }
 
   @Test
-  public void testWithoutUimaFit() throws ResourceInitializationException, InvalidXMLException,
-          IOException, AnalysisEngineProcessException, ResourceConfigurationException {
+  public void testWithoutUimaFit() throws Exception {
 
     AnalysisEngine rutaAE1 = createAnalysisEngine(rules1, null);
     AnalysisEngine rutaAE2 = createAnalysisEngine(rules2, null);
@@ -85,9 +77,8 @@ public class StackedScriptsTest {
 
   }
 
-  private void processAndTest(AnalysisEngine rutaAE1, AnalysisEngine rutaAE2, AnalysisEngine rutaAE3)
-          throws ResourceInitializationException, IOException, InvalidXMLException,
-          AnalysisEngineProcessException {
+  private void processAndTest(AnalysisEngine rutaAE1, AnalysisEngine rutaAE2,
+          AnalysisEngine rutaAE3) throws Exception {
     CAS cas = getCAS(LINES);
 
     rutaAE1.process(cas);
@@ -128,8 +119,7 @@ public class StackedScriptsTest {
     RutaTestUtils.assertAnnotationsEquals(cas, 4, 3 * lines, t4);
   }
 
-  private CAS getCAS(int lines) throws ResourceInitializationException, IOException,
-          InvalidXMLException {
+  private CAS getCAS(int lines) throws Exception {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < lines; i++) {
       sb.append(DOC_TEXT);
@@ -139,12 +129,11 @@ public class StackedScriptsTest {
     return cas;
   }
 
-  private AnalysisEngine createAnalysisEngine(String rules, String[] reindexOnly)
-          throws IOException, InvalidXMLException, ResourceInitializationException,
-          ResourceConfigurationException {
+  private AnalysisEngine createAnalysisEngine(String rules, String[] reindexOnly) throws Exception {
     URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
     if (url == null) {
-      url = RutaTestUtils.class.getClassLoader().getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
+      url = RutaTestUtils.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -170,8 +159,7 @@ public class StackedScriptsTest {
   }
 
   @Test
-  public void testPerformanceOfReindexOnly() throws ResourceInitializationException,
-          InvalidXMLException, IOException, AnalysisEngineProcessException {
+  public void testPerformanceOfReindexOnly() throws Exception {
     AnalysisEngine aaeNoReindex = createEngine(createEngineDescription(
             createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules1),
             createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules2),
@@ -182,8 +170,8 @@ public class StackedScriptsTest {
             createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules2,
                     RutaEngine.PARAM_REINDEX_ONLY, new String[] { RutaTestUtils.TYPE + "1" }),
             createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules3,
-                    RutaEngine.PARAM_REINDEX_ONLY, new String[] { RutaTestUtils.TYPE + "2",
-                        RutaTestUtils.TYPE + "3" })));
+                    RutaEngine.PARAM_REINDEX_ONLY,
+                    new String[] { RutaTestUtils.TYPE + "2", RutaTestUtils.TYPE + "3" })));
 
     long start = 0;
     long end = 0;

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java Mon Apr 15 12:48:34 2019
@@ -20,7 +20,7 @@ package org.apache.uima.ruta.engine;
 
 import java.util.List;
 
-import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.ruta.RutaElement;
 import org.apache.uima.ruta.RutaStream;
@@ -33,23 +33,23 @@ public class TestRutaInferenceVisitor im
 
   @Override
   public void beginVisit(RutaElement element, ScriptApply result) {
-    throw new NotImplementedException("Not supported.");
+    throw new NotImplementedException();
   }
 
   @Override
   public void endVisit(RutaElement element, ScriptApply result) {
-    throw new NotImplementedException("Not supported.");
+    throw new NotImplementedException();
   }
 
   @Override
   public void finished(RutaStream stream, List<RutaInferenceVisitor> visitors) {
-    throw new NotImplementedException("Not supported.");
+    throw new NotImplementedException();
   }
 
   @Override
   public void annotationAdded(AnnotationFS annotation,
           AbstractRuleMatch<? extends AbstractRule> creator) {
-    throw new NotImplementedException("Not supported.");
+    throw new NotImplementedException();
   }
 
 }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java Mon Apr 15 12:48:34 2019
@@ -22,14 +22,10 @@ import static org.apache.uima.fit.factor
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.antlr.runtime.RecognitionException;
 import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Type;
@@ -41,8 +37,6 @@ import org.apache.uima.fit.factory.TypeP
 import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.FsIndexCollection;
 import org.apache.uima.resource.metadata.TypePriorities;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
@@ -52,7 +46,6 @@ import org.apache.uima.ruta.descriptor.R
 import org.apache.uima.ruta.type.FalsePositive;
 import org.apache.uima.ruta.type.TruePositive;
 import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class UimafitTest {
@@ -60,8 +53,8 @@ public class UimafitTest {
   @Test
   public void test() throws Exception {
     AnalysisEngine ae = createEngine(RutaEngine.class,
-    // Load script in "Java" notation, with "." as package separator and no extension.
-    // File needs to be located in the path specified below with ending ".ruta".
+            // Load script in "Java" notation, with "." as package separator and no extension.
+            // File needs to be located in the path specified below with ending ".ruta".
             RutaEngine.PARAM_MAIN_SCRIPT, "org.apache.uima.ruta.engine.UimafitTest",
             // Path(s) where the scripts are located
             RutaEngine.PARAM_SCRIPT_PATHS, new String[] { "src/test/resources" });
@@ -93,9 +86,7 @@ public class UimafitTest {
   }
 
   @Test
-  public void testUimafitWithoutXmlTypeSystem() throws ResourceInitializationException,
-          AnalysisEngineProcessException, InvalidXMLException, ResourceConfigurationException,
-          IOException, URISyntaxException, RecognitionException {
+  public void testUimafitWithoutXmlTypeSystem() throws Exception {
     String script = "DECLARE MyType;\n W{-> MyType};";
 
     RutaDescriptorFactory factory = new RutaDescriptorFactory();

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java Mon Apr 15 12:48:34 2019
@@ -23,28 +23,21 @@ import static org.junit.Assert.assertEqu
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 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.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.impl.XmiCasDeserializer;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 import org.apache.uima.util.FileUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
 public class ViewWriterTest {
 
@@ -53,13 +46,11 @@ public class ViewWriterTest {
   private static final String NEW_VIEW = "newView";
 
   @Test
-  public void test() throws IOException, URISyntaxException, InvalidXMLException,
-          ResourceInitializationException, ResourceConfigurationException,
-          AnalysisEngineProcessException, SAXException {
+  public void test() throws Exception {
     URL url = RutaEngine.class.getClassLoader().getResource("ViewWriter.xml");
     if (url == null) {
-      url = RutaTestUtils.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/ViewWriter.xml");
+      url = RutaTestUtils.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/ViewWriter.xml");
     }
     File tempFile = File.createTempFile("ViewWriterTest", ".xmi");
     XMLInputSource in = new XMLInputSource(url);
@@ -104,9 +95,7 @@ public class ViewWriterTest {
   }
 
   @Test
-  public void testInRuta() throws IOException, URISyntaxException, InvalidXMLException,
-          ResourceInitializationException, ResourceConfigurationException,
-          AnalysisEngineProcessException, SAXException {
+  public void testInRuta() throws Exception {
     File xmiOutputFile = File.createTempFile("ViewWriterTest", ".xmi");
     File scriptFile = File.createTempFile("ViewWriterTest", ".ruta");
     StringBuilder scriptSB = new StringBuilder();
@@ -119,12 +108,13 @@ public class ViewWriterTest {
     FileUtils.saveString2File(scriptSB.toString(), scriptFile, "UTF-8");
     URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
     if (url == null) {
-      url = RutaTestUtils.class.getClassLoader().getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
+      url = RutaTestUtils.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
     }
     URL urlDesc = RutaEngine.class.getClassLoader().getResource("ViewWriter.xml");
     if (urlDesc == null) {
-      urlDesc = RutaTestUtils.class.getClassLoader().getResource(
-              "org/apache/uima/ruta/engine/ViewWriter.xml");
+      urlDesc = RutaTestUtils.class.getClassLoader()
+              .getResource("org/apache/uima/ruta/engine/ViewWriter.xml");
     }
     File descFile = new File(urlDesc.toURI());
 
@@ -137,12 +127,12 @@ public class ViewWriterTest {
     AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
     String module = scriptFile.getName().substring(0, scriptFile.getName().length() - 5);
     ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, module);
-    ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
-            .getAbsolutePath() });
+    ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS,
+            new String[] { scriptFile.getParentFile().getAbsolutePath() });
     String aeName = descFile.getName().substring(0, descFile.getName().length() - 4);
     ae.setConfigParameterValue(RutaEngine.PARAM_ADDITIONAL_ENGINES, new String[] { aeName });
-    ae.setConfigParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS, new String[] { descFile.getParentFile()
-            .getAbsolutePath() });
+    ae.setConfigParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS,
+            new String[] { descFile.getParentFile().getAbsolutePath() });
     ae.reconfigure();
 
     CAS cas = ae.newCAS();

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java Mon Apr 15 12:48:34 2019
@@ -19,6 +19,8 @@
 
 package org.apache.uima.ruta.expression.annotation;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -27,13 +29,16 @@ import java.util.TreeMap;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.SerialFormat;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
 import org.apache.uima.fit.util.FSCollectionFactory;
 import org.apache.uima.jcas.cas.FSArray;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.apache.uima.util.CasIOUtils;
 import org.junit.Test;
 
 public class AnnotationFeatureExpressionTest {
@@ -236,10 +241,41 @@ public class AnnotationFeatureExpression
     CAS cas = RutaTestUtils.getCAS(document, complexTypes, features);
     Ruta.apply(cas, script);
 
-    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "a");
+    RutaTestUtils.assertAnnotationsEquals(cas, 1,1, "a");
   }
 
   @Test
+  public void testFeatureAssignmentByFeatureMatch() throws Exception {
+    String document = "This is a Test.";
+    String script = "";
+    script += "SW{-> Word, Word.small = true};\n";
+    script += "CW{-> Word, Word.small = false};\n";
+    script += "Document{-> CREATE(Struct1, \"smallW\" = Word.small == true, \"capitalW\" = Word.small == false)};\n";
+    script += "Struct1.smallW{-> T1};\n";
+    script += "Struct1.capitalW{-> T2};\n";
+
+    Map<String, String> complexTypes = new TreeMap<String, String>();
+    complexTypes.put("Struct1", "uima.tcas.Annotation");
+    complexTypes.put("Word", "uima.tcas.Annotation");
+    Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
+    List<TestFeature> struct1Features = new ArrayList<RutaTestUtils.TestFeature>();
+    features.put("Struct1", struct1Features);
+    struct1Features.add(new TestFeature("smallW", "", "uima.cas.FSArray"));
+    struct1Features.add(new TestFeature("capitalW", "", "uima.cas.FSArray"));
+    
+    List<TestFeature> wordFeatures = new ArrayList<RutaTestUtils.TestFeature>();
+    features.put("Word", wordFeatures);
+    wordFeatures.add(new TestFeature("small", "", "uima.cas.Boolean"));
+    
+    CAS cas = RutaTestUtils.getCAS(document, complexTypes, features);
+    Ruta.apply(cas, script);
+    
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "is", "a");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "This", "Test");
+  }
+  
+  
+  @Test
   public void testPartofOnNullMatch() throws Exception {
     String document = "Some text.";
     String script = "";

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java Mon Apr 15 12:48:34 2019
@@ -19,7 +19,6 @@
 
 package org.apache.uima.ruta.expression.annotation;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,7 +29,6 @@ import java.util.TreeMap;
 
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.FeatureStructure;
@@ -40,11 +38,9 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.fit.util.CasUtil;
 import org.apache.uima.jcas.cas.FSArray;
 import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -314,16 +310,14 @@ public class AnnotationLabelExpressionTe
   }
 
   @Test(expected = AnalysisEngineProcessException.class)
-  public void testWrongFeature() throws ResourceInitializationException, InvalidXMLException,
-          IOException, AnalysisEngineProcessException, CASException {
+  public void testWrongFeature() throws Exception {
 
     CAS cas = RutaTestUtils.getCAS("Some text.");
     Ruta.matches(cas.getJCas(), "a:W b:W{a.x == (b.y-1)-> T1};");
   }
 
   @Test
-  public void testSequentialLabelSelfMatch() throws ResourceInitializationException,
-          InvalidXMLException, IOException, AnalysisEngineProcessException, CASException {
+  public void testSequentialLabelSelfMatch() throws Exception {
 
     CAS cas = RutaTestUtils.getCAS("Some text.");
     Assert.assertFalse(Ruta.matches(cas.getJCas(), "e:CW e;"));
@@ -655,8 +649,6 @@ public class AnnotationLabelExpressionTe
     CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
     Ruta.apply(cas, script);
 
-    RutaTestUtils.storeCas(cas, "testStackedReinitLazyFeature");
-
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some");
     RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Some");
     RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Some");

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java Mon Apr 15 12:48:34 2019
@@ -22,8 +22,6 @@ package org.apache.uima.ruta.expression.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +29,6 @@ import java.util.TreeMap;
 
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Feature;
@@ -40,20 +37,16 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.fit.factory.AnalysisEngineFactory;
 import org.apache.uima.jcas.cas.FSArray;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaEngine;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class AnnotationVariableExpressionTest {
 
   @Test
-  public void test() throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void test() throws Exception {
     String document = "Some text.";
     String script = "ANNOTATION a;";
     script += "CW{-> ASSIGN(a, CW)};";
@@ -94,9 +87,7 @@ public class AnnotationVariableExpressio
   }
 
   @Test
-  public void testImplicitAssignment()
-          throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void testImplicitAssignment() throws Exception {
     String document = "Some text.";
     String script = "ANNOTATION a;";
     script += "CW{-> a = CW};";
@@ -137,9 +128,7 @@ public class AnnotationVariableExpressio
   }
 
   @Test
-  public void testListImplicitAssignment()
-          throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void testListImplicitAssignment() throws Exception {
     String document = "Some text.";
     String script = "ANNOTATIONLIST as;";
     script += "Document{-> as = W};";
@@ -180,8 +169,7 @@ public class AnnotationVariableExpressio
   }
 
   @Test
-  public void testList() throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void testList() throws Exception {
     String document = "Some text.";
     String script = "ANNOTATIONLIST as;";
     script += "Document{-> ASSIGN(as, W)};";
@@ -222,9 +210,7 @@ public class AnnotationVariableExpressio
   }
 
   @Test
-  public void testResetVariableBetweenCases()
-          throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void testResetVariableBetweenCases() throws Exception {
 
     String document = "Some text.";
     String script = "ANNOTATIONLIST as;\n";
@@ -263,9 +249,7 @@ public class AnnotationVariableExpressio
   }
 
   @Test
-  public void testNullValueWithFeatureMatch()
-          throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void testNullValueWithFeatureMatch() throws Exception {
 
     String document = "Some text.";
     String script = "";

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java Mon Apr 15 12:48:34 2019
@@ -19,10 +19,21 @@
 
 package org.apache.uima.ruta.expression.resource;
 
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
+import org.apache.uima.resource.ResourceConfigurationException;
+import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
+import org.apache.uima.ruta.engine.RutaEngine;
 import org.apache.uima.ruta.engine.RutaTestUtils;
+import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class WordListStringExpressionTest {
 
@@ -34,9 +45,8 @@ public class WordListStringExpressionTes
     String script="STRING s = \"org/apache/uima/ruta/action/\";\n";
     script +="WORDLIST wl = s + \"MarkFastTestList.txt\";\n";
     script +="MARKFAST(T1,wl);\n";
-    
-    CAS cas = RutaTestUtils.getCAS(document);
-    Ruta.apply(cas, script);
+
+    CAS cas = executeAnalysis(document, script);
     
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "1 0 0", "2 0 0");
 
@@ -51,12 +61,23 @@ public class WordListStringExpressionTes
     script +="WORDLIST wl = s + \"MarkFastTestList.txt\";\n";
     script +="MARKFAST(T1,wl);\n";
     script +="}\n";
-    
-    CAS cas = RutaTestUtils.getCAS(document);
-    Ruta.apply(cas, script);
+
+    CAS cas = executeAnalysis(document, script);
     
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "1 0 0", "2 0 0");
 
   }
-  
+
+  private CAS executeAnalysis(String document, String script)
+          throws ResourceInitializationException, IOException, InvalidXMLException, ResourceConfigurationException, AnalysisEngineProcessException, URISyntaxException, SAXException {
+
+    Map<String, Object> paramMap = new HashMap<>();
+    paramMap.put(RutaEngine.PARAM_DICT_REMOVE_WS, true);
+
+    CAS cas = RutaTestUtils.getCAS(document);
+    Ruta.apply(cas, script, paramMap);
+
+    return cas;
+  }
+
 }

Added: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java?rev=1857574&view=auto
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java (added)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java Mon Apr 15 12:48:34 2019
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.ruta.expression.string;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.uima.cas.CAS;
+import org.apache.uima.ruta.engine.Ruta;
+import org.apache.uima.ruta.engine.RutaTestUtils;
+import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.junit.Test;
+
+public class StringFeatureTest {
+
+  @Test
+  public void testValidValue() throws Exception {
+
+    String document = "Any - 0 test.";
+
+    String script = "DOUBLE d = 5; BOOLEAN b = true; TYPE t = org.apache.uima.ruta.type.TruePositive;INT i = 4;\n";
+    script += "CW{-> CREATE(Struct, \"s\" = d)};";
+    script += "SPECIAL{-> CREATE(Struct, \"s\" = b)};";
+    script += "NUM{-> CREATE(Struct, \"s\" = t)};";
+    script += "SW{-> Struct};";
+    script += "s:Struct{PARTOF(SW)-> s.s = i};";
+
+    script += "Struct.s==\"5.0\"{-> T1};";
+    script += "Struct.s==\"true\"{-> T2};";
+    script += "Struct.s==\"org.apache.uima.ruta.type.TruePositive\"{-> T3};";
+    script += "Struct.s==\"4\"{-> T4};";
+
+    Map<String, String> typeMap = new TreeMap<String, String>();
+    String typeName = "Struct";
+    typeMap.put(typeName, "uima.tcas.Annotation");
+
+    Map<String, List<TestFeature>> featureMap = new TreeMap<String, List<TestFeature>>();
+    List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
+    featureMap.put(typeName, list);
+    String fn = "s";
+    list.add(new TestFeature(fn, "", "uima.cas.String"));
+
+    CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+    Ruta.apply(cas, script);
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Any");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "-");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "0");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "test");
+
+  }
+
+}

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java Mon Apr 15 12:48:34 2019
@@ -18,18 +18,14 @@
  */
 package org.apache.uima.ruta.expression.string;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
 import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
 import org.apache.uima.fit.util.JCasUtil;
 import org.apache.uima.jcas.JCas;
-import org.apache.uima.resource.ResourceConfigurationException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.AllowedValue;
 import org.apache.uima.resource.metadata.FsIndexDescription;
@@ -42,16 +38,13 @@ import org.apache.uima.ruta.type.FalseNe
 import org.apache.uima.ruta.type.FalsePositive;
 import org.apache.uima.ruta.type.TruePositive;
 import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class StringSubtypeAllowedValuesTest {
 
   @Test
-  public void testValidValue() throws ResourceInitializationException,
-          AnalysisEngineProcessException, InvalidXMLException, ResourceConfigurationException,
-          IOException, URISyntaxException, CASException {
+  public void testValidValue() throws Exception {
     CAS cas = createCAS();
 
     String script = "Document{-> CREATE(Test, \"allowed\" = \"A\")};";
@@ -74,9 +67,7 @@ public class StringSubtypeAllowedValuesT
   }
 
   @Test(expected = AnalysisEngineProcessException.class)
-  public void testInvalidValue() throws ResourceInitializationException,
-          AnalysisEngineProcessException, InvalidXMLException, ResourceConfigurationException,
-          IOException, URISyntaxException, CASException {
+  public void testInvalidValue() throws Exception {
 
     CAS cas = createCAS();
 

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java Mon Apr 15 12:48:34 2019
@@ -19,13 +19,9 @@
 
 package org.apache.uima.ruta.rule;
 
-import java.io.IOException;
-
 import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class InlinedRulesTest {

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java Mon Apr 15 12:48:34 2019
@@ -18,21 +18,15 @@
  */
 package org.apache.uima.ruta.rule;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class RutaAnnotationTypeMatcherTest {
@@ -77,10 +71,9 @@ public class RutaAnnotationTypeMatcherTe
     script += "c:CW{->T26}<-{c.begin==0;};\n";
     script += "s:Struct1->{s.as{-> T27};};\n";
     script += "s:Struct1->{s.as.begin==5{-> T28};};\n";
-    
-    
+
     CAS cas = apply(document, script);
-    
+
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This");
     RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
     RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "This");
@@ -109,12 +102,10 @@ public class RutaAnnotationTypeMatcherTe
     RutaTestUtils.assertAnnotationsEquals(cas, 26, 1, "This");
     RutaTestUtils.assertAnnotationsEquals(cas, 27, 3, "is", "a", "test");
     RutaTestUtils.assertAnnotationsEquals(cas, 28, 1, "is");
-    
+
   }
 
-  private CAS apply(String document, String script)
-          throws ResourceInitializationException, IOException, InvalidXMLException,
-          ResourceConfigurationException, AnalysisEngineProcessException, URISyntaxException {
+  private CAS apply(String document, String script) throws Exception {
     Map<String, String> complexTypes = new TreeMap<String, String>();
     complexTypes.put("Struct1", "uima.tcas.Annotation");
     complexTypes.put("Struct2", "uima.tcas.Annotation");
@@ -129,10 +120,10 @@ public class RutaAnnotationTypeMatcherTe
     features.put("Struct4", list);
     list.add(new TestFeature("a", "", "uima.tcas.Annotation"));
     list.add(new TestFeature("as", "", "uima.cas.FSArray"));
-    
+
     CAS cas = RutaTestUtils.getCAS(document, complexTypes, features);
     Ruta.apply(cas, script);
     return cas;
   }
-  
+
 }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java Mon Apr 15 12:48:34 2019
@@ -19,23 +19,15 @@
 
 package org.apache.uima.ruta.rule;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Test;
 
 public class SidestepInComposedTest {
 
   @Test
-  public void test() throws ResourceInitializationException, InvalidXMLException, IOException,
-          AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+  public void test() throws Exception {
     String document = "15. Mai 2005";
     String script = "\"Mai\" -> T1;";
     script += "NUM{->T2} PERIOD @T1 NUM;\n";

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java Mon Apr 15 12:48:34 2019
@@ -216,11 +216,9 @@ public class WildCard2Test {
     script += "INT t;\n";
     script += "(T1 # NUM{PARSE(a), a<100} ANY{REGEXP(\"[/]\")} NUM{PARSE(t),t<200}){ -> T2};\n";
 
-    CAS cas = RutaTestUtils.getCAS(document, null, null, true);
+    CAS cas = RutaTestUtils.getCAS(document, null, null, false);
     Ruta.apply(cas, script);
 
-    RutaTestUtils.storeCas(cas, "testFailingConditionWithFailingNextRuleElement");
-
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "a");
     RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
   }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java Mon Apr 15 12:48:34 2019
@@ -19,57 +19,55 @@
 
 package org.apache.uima.ruta.rule.quantifier;
 
-import java.io.IOException;
 import java.util.List;
 
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.cas.CASException;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 public class QuantifierTest {
-  
+
   @Test
-  public void testRightToLeftMinMaxReluctantToLiteral() throws CASException, ResourceInitializationException, InvalidXMLException,
-          IOException, AnalysisEngineProcessException {
-    
+  public void testRightToLeftMinMaxReluctantToLiteral() throws Exception {
+
     JCas jcas = RutaTestUtils.getCAS("a b c d e.").getJCas();
-    Assert.assertEquals("a b c d e.", Ruta.select(jcas, "\"a\" W[0,5]? @PERIOD;").get(0).getCoveredText());
-    Assert.assertEquals("b c d e.", Ruta.select(jcas, "\"b\" W[0,5]? @PERIOD;").get(0).getCoveredText());
-    Assert.assertEquals("c d e.", Ruta.select(jcas, "\"c\" W[0,5]? @PERIOD;").get(0).getCoveredText());
-    Assert.assertEquals("d e.", Ruta.select(jcas, "\"d\" W[0,5]? @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("a b c d e.",
+            Ruta.select(jcas, "\"a\" W[0,5]? @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("b c d e.",
+            Ruta.select(jcas, "\"b\" W[0,5]? @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("c d e.",
+            Ruta.select(jcas, "\"c\" W[0,5]? @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("d e.",
+            Ruta.select(jcas, "\"d\" W[0,5]? @PERIOD;").get(0).getCoveredText());
     Assert.assertEquals("e.", Ruta.select(jcas, "\"e\" W[0,5]? @PERIOD;").get(0).getCoveredText());
-    
+
     jcas.release();
   }
-  
+
   @Test
-  public void testRightToLeftMinMaxGreedyToLiteral() throws CASException, ResourceInitializationException, InvalidXMLException,
-          IOException, AnalysisEngineProcessException {
-    
+  public void testRightToLeftMinMaxGreedyToLiteral() throws Exception {
+
     JCas jcas = RutaTestUtils.getCAS("a b c d e.").getJCas();
-    Assert.assertEquals("a b c d e.", Ruta.select(jcas, "\"a\" W[0,4] @PERIOD;").get(0).getCoveredText());
-    Assert.assertEquals("b c d e.", Ruta.select(jcas, "\"b\" W[0,3] @PERIOD;").get(0).getCoveredText());
-    Assert.assertEquals("c d e.", Ruta.select(jcas, "\"c\" W[0,2] @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("a b c d e.",
+            Ruta.select(jcas, "\"a\" W[0,4] @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("b c d e.",
+            Ruta.select(jcas, "\"b\" W[0,3] @PERIOD;").get(0).getCoveredText());
+    Assert.assertEquals("c d e.",
+            Ruta.select(jcas, "\"c\" W[0,2] @PERIOD;").get(0).getCoveredText());
     Assert.assertEquals("d e.", Ruta.select(jcas, "\"d\" W[0,1] @PERIOD;").get(0).getCoveredText());
     Assert.assertEquals("e.", Ruta.select(jcas, "\"e\" W[0,0] @PERIOD;").get(0).getCoveredText());
-    
+
     jcas.release();
   }
-  
+
   @Test
   public void testReluctantGreedyInComposed() throws Exception {
     JCas jcas = RutaTestUtils.getCAS("a B B . a B . a .").getJCas();
     List<Annotation> select = Ruta.select(jcas, "SW (CW+?) PERIOD;");
     Assert.assertEquals(2, select.size());
   }
-  
-  
+
 }

Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java Mon Apr 15 12:48:34 2019
@@ -162,4 +162,15 @@ public class DefaultSeederTest {
     RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "\u000b");
   }
 
+  @Test
+  public void testSpecialChars() throws Exception {
+
+    String document = "Some text 
Dr.";
+    String script = "RETAINTYPE(WS);\nBREAK{-> T1};";
+    CAS cas = RutaTestUtils.getCAS(document);
+    Ruta.apply(cas, script);
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "
");
+  }
+
 }