Author: pkluegl Date: Wed Feb 13 12:35:18 2019 New Revision: 1853498 URL: http://svn.apache.org/viewvc?rev=1853498&view=rev Log: no jira - throws cleanup
Modified: uima/ruta/trunk/ruta-core/pom.xml uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java Modified: uima/ruta/trunk/ruta-core/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/pom.xml?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/pom.xml (original) +++ uima/ruta/trunk/ruta-core/pom.xml Wed Feb 13 12:35:18 2019 @@ -28,7 +28,6 @@ <description>The core implementation of the UIMA Ruta rule engine.</description> <name>Apache UIMA Ruta: ${project.artifactId}</name> - <dependencies> <dependency> <groupId>org.apache.uima</groupId> Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java Wed Feb 13 12:35:18 2019 @@ -33,7 +33,7 @@ import org.junit.Test; public class AlternativeMatchTest { @Test - public void test() { + public void test() throws Exception { String document = "1 this is a Test."; String script = ""; script += "CW{-> CREATE(T0, \"s\"=\"a\"),CREATE(T0, \"s\"=\"b\")};"; @@ -47,25 +47,19 @@ public class AlternativeMatchTest { script += "NUM W[1,8]? T0.s==\"a\"{-> T8};"; script += "NUM W W W W?? T0.s==\"b\"{-> T9};"; script += "NUM W W W W?? T0.s==\"a\"{-> T10};"; - - + Map<String, String> typeMap = new TreeMap<String, String>(); String typeName1 = "T0"; typeMap.put(typeName1, "uima.tcas.Annotation"); - + Map<String, List<TestFeature>> featureMap = new TreeMap<String, List<TestFeature>>(); List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>(); featureMap.put(typeName1, list); String fn1 = "s"; list.add(new TestFeature(fn1, "", "uima.cas.String")); - - CAS cas = null; - try { - cas = RutaTestUtils.getCAS(document, typeMap, featureMap); - Ruta.apply(cas, script); - } catch (Exception e) { - e.printStackTrace(); - } + + CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap); + Ruta.apply(cas, script); RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Test"); RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Test"); @@ -77,7 +71,7 @@ public class AlternativeMatchTest { RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "Test"); RutaTestUtils.assertAnnotationsEquals(cas, 9, 1, "Test"); RutaTestUtils.assertAnnotationsEquals(cas, 10, 1, "Test"); - + if (cas != null) { cas.release(); } Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java Wed Feb 13 12:35:18 2019 @@ -21,18 +21,14 @@ package org.apache.uima.ruta; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.IOException; - 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.fit.factory.AnalysisEngineFactory; import org.apache.uima.fit.factory.TypeSystemDescriptionFactory; -import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.metadata.TypeSystemDescription; import org.apache.uima.ruta.engine.RutaEngine; -import org.apache.uima.util.InvalidXMLException; import org.junit.Test; /** @@ -42,27 +38,26 @@ public class ConflictingTypeTest { /** * Create an analysis engine for a Ruta script. * - * @param script Script path. + * @param script + * Script path. * @return Analysis engine. */ - private AnalysisEngine createAE(String script) throws ResourceInitializationException, IOException, InvalidXMLException { + private AnalysisEngine createAE(String script) throws Exception { final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription( "org.apache.uima.ruta.engine.BasicTypeSystem", "org.apache.uima.ruta.ConflictingTypeSystem"); final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription( - "org.apache.uima.ruta.engine.BasicEngine", - RutaEngine.PARAM_MAIN_SCRIPT, script); + "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script); ruta.getAnalysisEngineMetaData().setTypeSystem(tsd); - ruta.getAnalysisEngineMetaData() - .getTypeSystem() - .addType("org.apache.uima.T1", "Type for Testing", "uima.tcas.Annotation"); + ruta.getAnalysisEngineMetaData().getTypeSystem().addType("org.apache.uima.T1", + "Type for Testing", "uima.tcas.Annotation"); return AnalysisEngineFactory.createEngine(ruta); } @Test - public void test() throws ResourceInitializationException, IOException, InvalidXMLException, AnalysisEngineProcessException { + public void test() throws Exception { final String name = getClass().getSimpleName(); final String namespace = getClass().getPackage().getName(); final AnalysisEngine ae = createAE(namespace + "." + name); @@ -78,8 +73,8 @@ public class ConflictingTypeTest { // org.apache.uima.ruta.type.conflicting.W are imported into RUTA's namespace as W; assertTrue(e.getCause() instanceof IllegalArgumentException); } finally { - cas.release(); - ae.destroy(); + cas.release(); + ae.destroy(); } } } Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java Wed Feb 13 12:35:18 2019 @@ -21,7 +21,6 @@ package org.apache.uima.ruta; import static org.junit.Assert.assertEquals; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,10 +32,8 @@ import org.apache.uima.fit.factory.Analy import org.apache.uima.fit.util.JCasUtil; 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.RutaEngine; import org.apache.uima.ruta.type.W; -import org.apache.uima.util.InvalidXMLException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -50,17 +47,16 @@ public class CustomViewTest { /** * Create an analysis engine for a Ruta script. * - * @param script Script path. + * @param script + * Script path. * @return Analysis engine. */ - private AnalysisEngine createAE(String script) throws ResourceInitializationException, IOException, InvalidXMLException { + private AnalysisEngine createAE(String script) throws Exception { final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription( - "org.apache.uima.ruta.engine.BasicEngine", - RutaEngine.PARAM_MAIN_SCRIPT, script); + "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script); - ruta.getAnalysisEngineMetaData() - .getTypeSystem() - .addType("org.apache.uima.T1", "Type for Testing", "uima.tcas.Annotation"); + ruta.getAnalysisEngineMetaData().getTypeSystem().addType("org.apache.uima.T1", + "Type for Testing", "uima.tcas.Annotation"); final AggregateBuilder builder = new AggregateBuilder(); builder.add(ruta, "_InitialView", "text"); @@ -93,7 +89,8 @@ public class CustomViewTest { words.add(a.getCoveredText()); } - assertEquals("Checking run " + i, words, Arrays.asList("This", "is", "a", "short", "document")); + assertEquals("Checking run " + i, words, + Arrays.asList("This", "is", "a", "short", "document")); } } } Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java Wed Feb 13 12:35:18 2019 @@ -19,30 +19,22 @@ package org.apache.uima.ruta; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; 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.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 FeatureMatch1Test { @Test - public void test() throws AnalysisEngineProcessException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, URISyntaxException, - IOException { + public void test() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java Wed Feb 13 12:35:18 2019 @@ -22,7 +22,6 @@ package org.apache.uima.ruta; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -37,7 +36,6 @@ import org.apache.uima.fit.factory.Analy import org.apache.uima.fit.factory.TypeSystemDescriptionFactory; import org.apache.uima.fit.util.CasUtil; import org.apache.uima.fit.util.JCasUtil; -import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.metadata.TypeSystemDescription; import org.apache.uima.ruta.descriptor.RutaBuildOptions; import org.apache.uima.ruta.descriptor.RutaDescriptorFactory; @@ -45,7 +43,6 @@ import org.apache.uima.ruta.descriptor.R import org.apache.uima.ruta.engine.RutaEngine; import org.apache.uima.ruta.type.FalsePositive; import org.apache.uima.ruta.type.TruePositive; -import org.apache.uima.util.InvalidXMLException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,8 +64,7 @@ public class ImportStatementsTest { * {@link org.apache.uima.ruta.engine.RutaEngine#PARAM_STRICT_IMPORTS} value. * @return Analysis engine. */ - private AnalysisEngine createAE(String script, boolean strictImport) - throws ResourceInitializationException, IOException, InvalidXMLException { + private AnalysisEngine createAE(String script, boolean strictImport) throws Exception { final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription( "org.apache.uima.ruta.engine.BasicTypeSystem", "org.apache.uima.ruta.ImportStatementsTestTypeSystem", Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java Wed Feb 13 12:35:18 2019 @@ -20,7 +20,6 @@ package org.apache.uima.ruta; import java.io.File; -import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +41,7 @@ import org.junit.Test; public class IncompletePartitioningTest { @Test - public void test() throws Exception, IOException { + public void test() throws Exception { String className = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); @@ -54,7 +53,8 @@ public class IncompletePartitioningTest File textFile = new File(textURL.toURI()); 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); @@ -62,8 +62,7 @@ public class IncompletePartitioningTest TypeSystemDescription basicTypeSystem = aed.getAnalysisEngineMetaData().getTypeSystem(); for (int i = 1; i <= 50; i++) { - basicTypeSystem.addType(RutaTestUtils.TYPE + i, "Type for Testing", - "uima.tcas.Annotation"); + basicTypeSystem.addType(RutaTestUtils.TYPE + i, "Type for Testing", "uima.tcas.Annotation"); } Collection<TypeSystemDescription> tsds = new ArrayList<TypeSystemDescription>(); tsds.add(basicTypeSystem); @@ -71,8 +70,8 @@ public class IncompletePartitioningTest aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems); AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier); - ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { ruleFile - .getParentFile().getPath() }); + ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, + new String[] { ruleFile.getParentFile().getPath() }); String name = ruleFile.getName(); if (name.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) { name = name.substring(0, name.length() - 5); @@ -84,7 +83,7 @@ public class IncompletePartitioningTest ae.reconfigure(); CAS cas = ae.newCAS(); cas.setDocumentText(FileUtils.file2String(textFile, "UTF-8")); - + Type typeCW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.CW"); Type typeSW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.SW"); cas.addFsToIndexes(cas.createAnnotation(typeCW, 0, 5)); @@ -92,7 +91,7 @@ public class IncompletePartitioningTest cas.addFsToIndexes(cas.createAnnotation(typeCW, 15, 18)); cas.addFsToIndexes(cas.createAnnotation(typeSW, 19, 22)); cas.addFsToIndexes(cas.createAnnotation(typeCW, 23, 28)); - + ae.process(cas); RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "Peter, Jochen", "Flo and"); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java Wed Feb 13 12:35:18 2019 @@ -20,28 +20,22 @@ package org.apache.uima.ruta; import static org.junit.Assert.assertEquals; -import java.io.IOException; import java.util.ArrayList; import java.util.List; 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.fit.factory.AnalysisEngineFactory; import org.apache.uima.fit.factory.TypeSystemDescriptionFactory; import org.apache.uima.fit.pipeline.SimplePipeline; -import org.apache.uima.resource.ResourceConfigurationException; -import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.metadata.ResourceMetaData; import org.apache.uima.resource.metadata.TypeSystemDescription; import org.apache.uima.ruta.engine.RutaEngine; import org.apache.uima.util.CasCreationUtils; -import org.apache.uima.util.InvalidXMLException; import org.junit.Test; - /** * Tests if the script is correctly applied in a pipeline if a new CAS is used. * @@ -56,23 +50,21 @@ public class NewCASPipelineTest { * Script path. * @return Analysis engine. */ - private AnalysisEngine createAE(String script) throws ResourceInitializationException, - IOException, InvalidXMLException { + private AnalysisEngine createAE(String script) throws Exception { final TypeSystemDescription tsd = TypeSystemDescriptionFactory .createTypeSystemDescription("org.apache.uima.ruta.engine.BasicTypeSystem"); final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription( "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script); ruta.getAnalysisEngineMetaData().setTypeSystem(tsd); - ruta.getAnalysisEngineMetaData().getTypeSystem() - .addType(TEST_TYPE, "Type for Testing", "uima.tcas.Annotation"); + ruta.getAnalysisEngineMetaData().getTypeSystem().addType(TEST_TYPE, "Type for Testing", + "uima.tcas.Annotation"); return AnalysisEngineFactory.createEngine(ruta); } @Test - public void test() throws ResourceInitializationException, IOException, InvalidXMLException, - AnalysisEngineProcessException, ResourceConfigurationException { + public void test() throws Exception { final String name = getClass().getSimpleName(); final String namespace = getClass().getPackage().getName(); final AnalysisEngine ae = createAE(namespace + "." + name); @@ -80,8 +72,7 @@ public class NewCASPipelineTest { metaData.add(ae.getMetaData()); String input = "This is a test."; Type t1 = null; - - + // create a cas and apply rules final CAS cas = CasCreationUtils.createCas(metaData); cas.setDocumentText(input); @@ -97,18 +88,18 @@ public class NewCASPipelineTest { t1 = cas.getTypeSystem().getType(TEST_TYPE); assertEquals(1, cas.getAnnotationIndex(t1).size()); - + // create a new cas and force the ae to update its types ae.setConfigParameterValue(RutaEngine.PARAM_RELOAD_SCRIPT, true); ae.reconfigure(); - + final CAS cas2 = CasCreationUtils.createCas(metaData); cas2.setDocumentText(input); SimplePipeline.runPipeline(cas2, ae); t1 = cas2.getTypeSystem().getType(TEST_TYPE); assertEquals(1, cas2.getAnnotationIndex(t1).size()); - + // create a new cas and do not force the ae to update its types ae.setConfigParameterValue(RutaEngine.PARAM_RELOAD_SCRIPT, false); ae.reconfigure(); @@ -118,7 +109,7 @@ public class NewCASPipelineTest { t1 = cas3.getTypeSystem().getType(TEST_TYPE); assertEquals(1, cas3.getAnnotationIndex(t1).size()); - + // create a new cas and do not reconfigure the engine final CAS cas4 = CasCreationUtils.createCas(metaData); cas4.setDocumentText(input); @@ -126,7 +117,7 @@ public class NewCASPipelineTest { t1 = cas4.getTypeSystem().getType(TEST_TYPE); assertEquals(1, cas4.getAnnotationIndex(t1).size()); - + if (ae != null) { ae.destroy(); } Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java Wed Feb 13 12:35:18 2019 @@ -22,8 +22,6 @@ package org.apache.uima.ruta; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -34,8 +32,6 @@ import org.apache.uima.analysis_engine.A 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.CASRuntimeException; import org.apache.uima.cas.Type; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.cas.text.AnnotationIndex; @@ -43,17 +39,13 @@ import org.apache.uima.fit.factory.Analy import org.apache.uima.fit.factory.TypeSystemDescriptionFactory; import org.apache.uima.fit.util.CasUtil; 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.TypeSystemDescription; 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.type.TruePositive; -import org.apache.uima.util.InvalidXMLException; import org.junit.Assert; import org.junit.Test; -import org.xml.sax.SAXException; /** * Test the strict import option of {@link org.apache.uima.ruta.engine.RutaEngine}. @@ -72,8 +64,7 @@ public class StrictImportTest { * {@link RutaEngine#PARAM_STRICT_IMPORTS} value. * @return Analysis engine. */ - private AnalysisEngine createAE(String script, boolean strictImport) - throws ResourceInitializationException, IOException, InvalidXMLException { + private AnalysisEngine createAE(String script, boolean strictImport) throws Exception { final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription( "org.apache.uima.ruta.engine.BasicTypeSystem", "org.apache.uima.ruta.StrictImportTestTypeSystem"); @@ -153,8 +144,7 @@ public class StrictImportTest { } @Test - public void testStrictScriptImport() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, SAXException { + public void testStrictScriptImport() throws Exception { Map<String, String> complexTypes = new HashMap<>(); String s1 = "org.apache.uima.ruta.StrictScript2.Type1"; String s2 = "org.apache.uima.ruta.other.Type1"; @@ -179,9 +169,7 @@ public class StrictImportTest { } @Test - public void testDocumentAnnotation() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, CASRuntimeException, CASException, SAXException { + public void testDocumentAnnotation() throws Exception { CAS cas = RutaTestUtils.getCAS("Some text."); Map<String, Object> params = new HashMap<>(); params.put(RutaEngine.PARAM_STRICT_IMPORTS, true); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java Wed Feb 13 12:35:18 2019 @@ -22,14 +22,11 @@ package org.apache.uima.ruta.action; 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; import java.util.TreeMap; -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; @@ -37,21 +34,16 @@ import org.apache.uima.cas.FeatureStruct import org.apache.uima.cas.Type; 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.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 CreateTest { @Test - public void test() throws AnalysisEngineProcessException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, URISyntaxException, - IOException { + public void test() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java Wed Feb 13 12:35:18 2019 @@ -19,33 +19,24 @@ package org.apache.uima.ruta.action; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; 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.FeatureMatch1Test; 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; -import org.xml.sax.SAXException; public class ImplicitActionTest { @Test - public void test() throws AnalysisEngineProcessException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, URISyntaxException, - IOException { + public void test() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); @@ -94,9 +85,7 @@ public class ImplicitActionTest { } @Test - public void testChangeOffsets() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testChangeOffsets() throws Exception { String text = "text 2 3 x 4 1"; String script = ""; script += "NUM{->T1};"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java Wed Feb 13 12:35:18 2019 @@ -18,25 +18,15 @@ */ package org.apache.uima.ruta.action; -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; -import org.xml.sax.SAXException; public class LabelAtActionTest { @Test - public void test() throws ResourceInitializationException, InvalidXMLException, IOException, - AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException, - SAXException { + public void test() throws Exception { String document = "This is a test."; String script = "CW{-> t:T1}->{t{->T2};};"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,10 @@ package org.apache.uima.ruta.action; -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; -import org.xml.sax.SAXException; public class MacroActionTest { @@ -78,9 +70,7 @@ public class MacroActionTest { } @Test - public void testVariable() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testVariable() throws Exception { String document = "Test"; String script = "INT j;\n"; script += "ACTION inc(VAR INT var, INT i) = ASSIGN(var,var+i);\n"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,10 @@ package org.apache.uima.ruta.action; -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; -import org.xml.sax.SAXException; public class Shift1Test { @@ -45,9 +37,7 @@ public class Shift1Test { } @Test - public void testOverlapping() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testOverlapping() throws Exception { String text = "text 2 3 x 4"; String script = ""; script += "NUM+{->T1};"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java Wed Feb 13 12:35:18 2019 @@ -21,33 +21,27 @@ package org.apache.uima.ruta.action; import static org.junit.Assert.assertEquals; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -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; 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.ruta.engine.RutaEngine; import org.apache.uima.ruta.engine.RutaTestUtils; -import org.apache.uima.util.InvalidXMLException; import org.junit.Test; /** * There was a {@link NullPointerException} when calling - * {@link org.apache.uima.ruta.type.RutaBasic#getEndAnchors(org.apache.uima.cas.Type)} - * with a type that is not annotated in the CAS when running on the low memory profile. This - * test ensures this bug does not come back. + * {@link org.apache.uima.ruta.type.RutaBasic#getEndAnchors(org.apache.uima.cas.Type)} with a type + * that is not annotated in the CAS when running on the low memory profile. This test ensures this + * bug does not come back. */ public class ShiftWithLowMemoryProfileTest { @Test - public void testWithLowMemory() throws AnalysisEngineProcessException, InvalidXMLException, ResourceConfigurationException, IOException, URISyntaxException, ResourceInitializationException { + public void testWithLowMemory() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); Map<String, Object> parameters = new HashMap<String, Object>(); @@ -56,7 +50,6 @@ public class ShiftWithLowMemoryProfileTe CAS cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name + ".txt", parameters, 50); - Type t = cas.getTypeSystem().getType("org.apache.uima.ruta.type.W"); AnnotationIndex<AnnotationFS> ai = cas.getAnnotationIndex(t); assertEquals(1, ai.size()); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java Wed Feb 13 12:35:18 2019 @@ -19,23 +19,16 @@ package org.apache.uima.ruta.block; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -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.ruta.seed.TextSeeder; -import org.apache.uima.util.InvalidXMLException; import org.junit.Ignore; import org.junit.Test; -import org.xml.sax.SAXException; public class ForEachBlockTest { @@ -70,9 +63,7 @@ public class ForEachBlockTest { @Test @Ignore - public void testPerformance() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testPerformance() throws Exception { int lines = 10000; StringBuilder sb = new StringBuilder(); @@ -128,9 +119,7 @@ public class ForEachBlockTest { } @Test - public void testRigthToLeft() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testRigthToLeft() throws Exception { String script = "NUM{-> T1};"; script += "FOREACH(t) T1{}{\n"; script += "n:T1 SPECIAL.ct==\"^\" t{-> t.begin = n.begin};\n"; @@ -143,10 +132,7 @@ public class ForEachBlockTest { } @Test - public void testEnforcedLeftToRigthInComposedWithDebbugging() - throws ResourceInitializationException, InvalidXMLException, IOException, - AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException, - SAXException { + public void testEnforcedLeftToRigthInComposedWithDebbugging() throws Exception { String script = "NUM{-> T1};"; script += "FOREACH(t) T1{}{\n"; script += "(n:@T1{->UNMARK(T1)} SPECIAL.ct==\"^\" t){-> t.begin = n.begin};\n"; @@ -162,9 +148,7 @@ public class ForEachBlockTest { } @Test - public void testDirection() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testDirection() throws Exception { String script = "NUM{-> T1};"; script += "FOREACH(t,true) T1{}{\n"; script += "(# t{-PARTOF(T2)}){->T2};\n"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,11 @@ package org.apache.uima.ruta.block; -import java.io.IOException; - -import org.apache.uima.analysis_engine.AnalysisEngineProcessException; import org.apache.uima.cas.CAS; -import org.apache.uima.cas.CASException; -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; public class RutaScriptBlockTest { @@ -62,8 +55,7 @@ public class RutaScriptBlockTest { } @Test - public void testExternalBlockCall() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, CASException, SAXException { + public void testExternalBlockCall() throws Exception { String script = "SCRIPT org.apache.uima.ruta.ScriptWithStackedBlocks;"; script += "(# PERIOD){-> T3} (# PERIOD){->T4};"; script += "T3{-> CALL(ScriptWithStackedBlocks.First)};"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java Wed Feb 13 12:35:18 2019 @@ -19,20 +19,13 @@ package org.apache.uima.ruta.condition; -import java.io.IOException; -import java.net.URISyntaxException; 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.util.InvalidXMLException; import org.junit.Test; -import org.xml.sax.SAXException; public class ContainsTest { @@ -53,9 +46,7 @@ public class ContainsTest { } @Test - public void testAlias() throws ResourceInitializationException, InvalidXMLException, IOException, - AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException, - SAXException { + public void testAlias() throws Exception { String document = "1 some text; 2 some text; 3 some text;"; String script = "IMPORT PACKAGE * FROM org.apache.uima.ruta.ImportStatementsTestTypeSystemWithManyPackages AS ruta;"; @@ -78,9 +69,7 @@ public class ContainsTest { } @Test - public void testContainsOverlappingAnnotations() throws ResourceInitializationException, - InvalidXMLException, IOException, AnalysisEngineProcessException, - ResourceConfigurationException, URISyntaxException, SAXException { + public void testContainsOverlappingAnnotations() throws Exception { String document = "1 2 3 4 5 6 7 8"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java Wed Feb 13 12:35:18 2019 @@ -21,23 +21,16 @@ package org.apache.uima.ruta.condition; import static org.junit.Assert.assertEquals; -import java.io.IOException; - -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.text.AnnotationFS; import org.apache.uima.cas.text.AnnotationIndex; import org.apache.uima.jcas.JCas; -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; -import org.xml.sax.SAXException; public class ContextCountTest { @@ -63,8 +56,7 @@ public class ContextCountTest { } @Test - public void testIndex() throws CASException, ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, SAXException { + public void testIndex() throws Exception { JCas jcas = RutaTestUtils.getCAS("A B C a b c").getJCas(); Assert.assertTrue(Ruta.matches(jcas, "INT index; CW{CONTEXTCOUNT(Document,index,index)} # @SW{CONTEXTCOUNT(Document,0,100,index)-> MARK(T1,1,3)};")); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,10 @@ package org.apache.uima.ruta.condition; -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; -import org.xml.sax.SAXException; public class CountTest { @@ -48,9 +40,7 @@ public class CountTest { } @Test - public void testCountWithPeriodPostfix() throws ResourceInitializationException, - InvalidXMLException, IOException, AnalysisEngineProcessException, - ResourceConfigurationException, URISyntaxException, SAXException { + public void testCountWithPeriodPostfix() throws Exception { String document = "Some text."; String script = "(CW SW) {-> T1};"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java Wed Feb 13 12:35:18 2019 @@ -19,29 +19,21 @@ package org.apache.uima.ruta.condition; -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.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 FeatureTest { @Test - public void test() throws AnalysisEngineProcessException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, URISyntaxException, - IOException { + public void test() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java Wed Feb 13 12:35:18 2019 @@ -19,31 +19,23 @@ package org.apache.uima.ruta.condition; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; 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.FeatureMatch1Test; 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 ImplicitCondition1Test { @Test - public void test() throws AnalysisEngineProcessException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, URISyntaxException, - IOException { + public void test() throws Exception { String name = this.getClass().getSimpleName(); String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/"); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,11 @@ package org.apache.uima.ruta.condition; -import java.io.IOException; - -import org.apache.uima.analysis_engine.AnalysisEngineProcessException; import org.apache.uima.cas.CAS; -import org.apache.uima.cas.CASException; -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; -import org.xml.sax.SAXException; public class ImplicitCondition2Test { @@ -64,8 +57,7 @@ public class ImplicitCondition2Test { } @Test - public void testStringCompare() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, CASException, SAXException { + public void testStringCompare() throws Exception { String document = "a b. a b."; CAS cas = RutaTestUtils.getCAS(document); Assert.assertTrue(Ruta.matches(cas.getJCas(), "(w:W # W{W.ct==w.ct}){->T1};")); @@ -75,8 +67,7 @@ public class ImplicitCondition2Test { } @Test - public void testStringCompareNull() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, CASException, SAXException { + public void testStringCompareNull() throws Exception { String document = "a b. a b."; CAS cas = RutaTestUtils.getCAS(document); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java Wed Feb 13 12:35:18 2019 @@ -19,18 +19,10 @@ package org.apache.uima.ruta.condition; -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; -import org.xml.sax.SAXException; public class MacroConditionTest { @@ -79,9 +71,7 @@ public class MacroConditionTest { } @Test - public void testVariable() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException, - URISyntaxException, SAXException { + public void testVariable() throws Exception { String document = "This is a Test."; String script = "INT j;\n"; script += "CONDITION cc(VAR INT var) = TOTALCOUNT(W,1,1000,var);\n"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java Wed Feb 13 12:35:18 2019 @@ -19,13 +19,10 @@ package org.apache.uima.ruta.descriptor; -import java.io.IOException; -import java.net.URISyntaxException; import java.net.URL; import java.util.HashMap; import java.util.Map; -import org.antlr.runtime.RecognitionException; import org.apache.commons.lang3.tuple.Pair; import org.apache.uima.UIMAFramework; import org.apache.uima.analysis_engine.AnalysisEngine; @@ -33,7 +30,6 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.cas.CAS; import org.apache.uima.cas.Type; import org.apache.uima.fit.util.CasUtil; -import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.ResourceManager; import org.apache.uima.resource.impl.ResourceManager_impl; import org.apache.uima.resource.metadata.ConfigurationParameterSettings; @@ -42,7 +38,6 @@ import org.apache.uima.resource.metadata import org.apache.uima.resource.metadata.TypeSystemDescription; import org.apache.uima.ruta.engine.HtmlAnnotator; import org.apache.uima.ruta.engine.RutaEngine; -import org.apache.uima.util.InvalidXMLException; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -72,8 +67,7 @@ public class GenerateDescriptorTest { } @Test - public void testCreateAnalysisEngineDescription() - throws InvalidXMLException, IOException, RecognitionException, URISyntaxException { + public void testCreateAnalysisEngineDescription() throws Exception { String script = ""; script += "PACKAGE test.package;\n"; @@ -117,8 +111,7 @@ public class GenerateDescriptorTest { } @Test - public void testCreateTypeSystemDescription() throws URISyntaxException, IOException, - RecognitionException, InvalidXMLException, ResourceInitializationException { + public void testCreateTypeSystemDescription() throws Exception { String script = ""; script += "PACKAGE test.package;\n"; @@ -187,8 +180,7 @@ public class GenerateDescriptorTest { } @Test - public void testRuleScriptName() throws URISyntaxException, IOException, RecognitionException, - InvalidXMLException, ResourceInitializationException { + public void testRuleScriptName() throws Exception { String script = ""; script += "PACKAGE test.package;\n"; Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java Wed Feb 13 12:35:18 2019 @@ -21,32 +21,23 @@ package org.apache.uima.ruta.engine; import static org.junit.Assert.assertEquals; -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.AnalysisEngineProcessException; import org.apache.uima.cas.CAS; import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.Type; 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.util.InvalidXMLException; import org.apache.uima.util.XMLInputSource; import org.junit.Test; -import org.xml.sax.SAXException; public class CascadedModifierTest { @Test - public void test() throws IOException, URISyntaxException, InvalidXMLException, - ResourceInitializationException, ResourceConfigurationException, - AnalysisEngineProcessException, SAXException { + public void test() throws Exception { URL url = RutaEngine.class.getClassLoader().getResource("AAE.xml"); if (url == null) { Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java Wed Feb 13 12:35:18 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/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java Wed Feb 13 12:35:18 2019 @@ -19,28 +19,23 @@ 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; -import org.xml.sax.SAXException; public class ResourcesFromDataPathTest { @Test - public void test() throws IOException, ResourceInitializationException, InvalidXMLException, - AnalysisEngineProcessException, SAXException { + public void test() throws Exception { final String datapath = "target/datapath/"; new File(datapath).mkdirs(); Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java Wed Feb 13 12:35:18 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/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java Wed Feb 13 12:35:18 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,11 +42,9 @@ 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; -import org.xml.sax.SAXException; public class RutaTest { @@ -122,8 +116,7 @@ public class RutaTest { } @Test - public void testApplyRule() throws ResourceInitializationException, InvalidXMLException, - IOException, CASException, AnalysisEngineProcessException, SAXException { + public void testApplyRule() throws Exception { CAS cas = RutaTestUtils.getCAS("Some document."); JCas jcas = cas.getJCas(); @@ -138,8 +131,7 @@ public class RutaTest { } @Test - public void testSelect() throws ResourceInitializationException, InvalidXMLException, IOException, - CASException, AnalysisEngineProcessException, SAXException { + public void testSelect() throws Exception { String document = "Some text."; CAS cas = RutaTestUtils.getCAS(document); JCas jcas = cas.getJCas(); @@ -158,8 +150,7 @@ public class RutaTest { } @Test - public void testSelectWithInjection() throws ResourceInitializationException, InvalidXMLException, - IOException, CASException, AnalysisEngineProcessException, SAXException { + public void testSelectWithInjection() throws Exception { String document = "Some text."; CAS cas = RutaTestUtils.getCAS(document); AnnotationImpl t1 = (AnnotationImpl) cas.createAnnotation(RutaTestUtils.getTestType(cas, 1), 5, @@ -176,17 +167,14 @@ public class RutaTest { } @Test - public void testMatches() throws ResourceInitializationException, InvalidXMLException, - IOException, CASException, AnalysisEngineProcessException, SAXException { + 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, SAXException { + public void testMatchesWithInjection() throws Exception { String document = "Some text."; CAS cas = RutaTestUtils.getCAS(document); AnnotationImpl t1 = (AnnotationImpl) cas.createAnnotation(RutaTestUtils.getTestType(cas, 1), 5, Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java?rev=1853498&r1=1853497&r2=1853498&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java (original) +++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java Wed Feb 13 12:35:18 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,17 +28,12 @@ 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; -import org.xml.sax.SAXException; public class StackedScriptsTest { @@ -56,9 +50,7 @@ public class StackedScriptsTest { String rules3 = "W{PARTOF({T1,T2,T3})->T4};"; @Test - public void testWithUimaFitAggregated() - throws ResourceInitializationException, InvalidXMLException, IOException, - AnalysisEngineProcessException, ResourceConfigurationException, SAXException { + public void testWithUimaFitAggregated() throws Exception { AnalysisEngine aae = createEngine(createEngineDescription( createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules1), @@ -75,9 +67,7 @@ public class StackedScriptsTest { } @Test - public void testWithoutUimaFit() - throws ResourceInitializationException, InvalidXMLException, IOException, - AnalysisEngineProcessException, ResourceConfigurationException, SAXException { + public void testWithoutUimaFit() throws Exception { AnalysisEngine rutaAE1 = createAnalysisEngine(rules1, null); AnalysisEngine rutaAE2 = createAnalysisEngine(rules2, null); @@ -88,8 +78,7 @@ public class StackedScriptsTest { } private void processAndTest(AnalysisEngine rutaAE1, AnalysisEngine rutaAE2, - AnalysisEngine rutaAE3) throws ResourceInitializationException, IOException, - InvalidXMLException, AnalysisEngineProcessException, SAXException { + AnalysisEngine rutaAE3) throws Exception { CAS cas = getCAS(LINES); rutaAE1.process(cas); @@ -130,8 +119,7 @@ public class StackedScriptsTest { RutaTestUtils.assertAnnotationsEquals(cas, 4, 3 * lines, t4); } - private CAS getCAS(int lines) - throws ResourceInitializationException, IOException, InvalidXMLException, SAXException { + private CAS getCAS(int lines) throws Exception { StringBuilder sb = new StringBuilder(); for (int i = 0; i < lines; i++) { sb.append(DOC_TEXT); @@ -141,9 +129,7 @@ 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() @@ -173,8 +159,7 @@ public class StackedScriptsTest { } @Test - public void testPerformanceOfReindexOnly() throws ResourceInitializationException, - InvalidXMLException, IOException, AnalysisEngineProcessException, SAXException { + public void testPerformanceOfReindexOnly() throws Exception { AnalysisEngine aaeNoReindex = createEngine(createEngineDescription( createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules1), createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES, rules2),