Author: pkluegl Date: Tue Aug 25 10:07:34 2015 New Revision: 1697639 URL: http://svn.apache.org/r1697639 Log: UIMA-4568 - removed debug logging - removed dirty uimafit test
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1697639&r1=1697638&r2=1697639&view=diff ============================================================================== --- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original) +++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Tue Aug 25 10:07:34 2015 @@ -528,9 +528,6 @@ public class RutaEngine extends JCasAnno CAS cas = jcas.getCas(); - // TODO: added logging method calls temporarily for UIMA-4568 - logInfoForFirstBasic("begin of process", cas); - if (reloadScript || (!initialized && !cas.getViewName().equals(CAS.NAME_DEFAULT_SOFA))) { initializeScript(cas.getViewName()); } else { @@ -690,38 +687,9 @@ public class RutaEngine extends JCasAnno simpleGreedyForComposed, crowd); stream.initalizeBasics(); - // TODO: added logging method calls temporarily for UIMA-4568 - logInfoForFirstBasic("after initBasics", cas); return stream; } - private void logInfoForFirstBasic(String context, CAS cas) { - AnnotationIndex<AnnotationFS> index = cas.getAnnotationIndex(cas.getTypeSystem().getType( - BASIC_TYPE)); - if (index.size() == 0) { - getLogger().info(context + " : "+ rules + " - no RutaBasic yet"); - } else { - AnnotationFS next = index.iterator().next(); - if (next instanceof RutaBasic) { - RutaBasic basic = (RutaBasic) next; - getLogger().info(context + " - first RutaBasic: "+ basic.getBegin()+"|"+basic.getEnd() + " addr:" + basic.getAddress()); - Collection<?>[] beginMap = basic.getBeginMap(); - int counter = 0; - for (Collection<?> collection : beginMap) { - if (collection != null) { - for (Object object : collection) { - if (object != null) { - counter++; - } - } - } - } - - getLogger().info(context + " : "+ rules + " - size of beginMap: " + counter); - } - } - } - private List<Type> seedAnnotations(CAS cas) throws AnalysisEngineProcessException { List<Type> result = new ArrayList<Type>(); if (seeders != null) { 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=1697639&r1=1697638&r2=1697639&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 Tue Aug 25 10:07:34 2015 @@ -52,17 +52,6 @@ public class StackedScriptsTest { String rules3 = "W{PARTOF({T1,T2,T3})->T4};"; - @Test - public void testWithUimaFit() throws ResourceInitializationException, InvalidXMLException, - IOException, AnalysisEngineProcessException, ResourceConfigurationException { - - AnalysisEngine rutaAE1 = createEngine(RutaEngine.class, RutaEngine.PARAM_RULES, rules1); - AnalysisEngine rutaAE2 = createEngine(RutaEngine.class, RutaEngine.PARAM_RULES, rules2); - AnalysisEngine rutaAE3 = createEngine(RutaEngine.class, RutaEngine.PARAM_RULES, rules3); - - processAndTest(rutaAE1, rutaAE2, rutaAE3); - - } @Test public void testWithUimaFitAggregated() throws ResourceInitializationException, @@ -77,6 +66,7 @@ public class StackedScriptsTest { CAS cas = getCAS(); aae.process(cas); + checkResult(cas); }