svn commit: r1756776 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/type/RutaBasic.java test/java/org/apache/uima/ruta/engine/NoSeedersTest.java

[pk...@apache.org]

Author: pkluegl
Date: Thu Aug 18 13:06:35 2016
New Revision: 1756776

URL: http://svn.apache.org/viewvc?rev=1756776&view=rev
Log:
UIMA-5061
- fix "empty" of RutaBasic
- added test

Added:
    uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java   (with props)
Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java?rev=1756776&r1=1756775&r2=1756776&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java Thu Aug 18 13:06:35 2016
@@ -297,6 +297,7 @@ public class RutaBasic extends Annotatio
     for (Collection<?> each : beginMap) {
       if (each != null && !each.isEmpty()) {
         this.empty = false;
+        break;
       }
     }
   }
@@ -306,6 +307,7 @@ public class RutaBasic extends Annotatio
     for (Collection<?> each : endMap) {
       if (each != null && !each.isEmpty()) {
         this.empty = false;
+        break;
       }
     }
   }
@@ -317,6 +319,12 @@ public class RutaBasic extends Annotatio
 
   public void clearEndMap() {
     this.endMap = new ArrayList<?>[((TypeSystemImpl) getCAS().getTypeSystem()).getLargestTypeCode()];
+    for (Collection<?> each : beginMap) {
+      if (each != null && !each.isEmpty()) {
+        return;
+      }
+    }
+    this.empty = true;
   }
 
   /**

Added: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java?rev=1756776&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java (added)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java Thu Aug 18 13:06:35 2016
@@ -0,0 +1,63 @@
+/*
+ * 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.engine;
+
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.fit.factory.AnalysisEngineFactory;
+import org.apache.uima.jcas.JCas;
+import org.junit.Test;
+
+public class NoSeedersTest {
+
+  @Test
+  public void test() throws Exception {
+    CAS cas = RutaTestUtils.getCAS("This is a test.");
+    JCas jcas = cas.getJCas();
+    
+    String script = "";
+    script += "\"This\"-> T1;";
+    script += "\"is\"-> T2;";
+    script += "\"a\"-> T3;";
+    script += "\"test\"-> T4;";
+    script += "ANY{-> T5};";
+    script += "CW{-> T6};";
+    script += "T1{-> T7};";
+    script += "T2 T3{-> T8};";
+    script += "T1 # T4{-> T9};";
+    
+    AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class, 
+            RutaEngine.PARAM_RULES, script,
+            RutaEngine.PARAM_SEEDERS, new String[0]);
+    
+    ae.process(jcas);
+    
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "is", "is");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "a");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "test");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 1, "This");
+    RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "a");
+    RutaTestUtils.assertAnnotationsEquals(cas, 9, 1, "test");
+    
+  }
+  
+}

Propchange: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java
------------------------------------------------------------------------------
    svn:eol-style = native