svn commit: r1748671 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java

[pkluegl]

Author: pkluegl
Date: Thu Jun 16 08:59:53 2016
New Revision: 1748671

URL: http://svn.apache.org/viewvc?rev=1748671&view=rev
Log:
UIMA-4976
- extended test, avoid npe

Modified:
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
    
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java?rev=1748671&r1=1748670&r2=1748671&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/SimpleFeatureExpression.java
 Thu Jun 16 08:59:53 2016
@@ -117,7 +117,9 @@ public class SimpleFeatureExpression ext
       IAnnotationExpression annotationExpression = 
mr.getAnnotationExpression(context, stream);
       if(annotationExpression != null) {
         AnnotationFS annotation = annotationExpression.getAnnotation(context, 
stream);
-        return annotation.getType();
+        if(annotation != null) {
+          return annotation.getType();
+        }
       }
     }
     return null;

Modified: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java?rev=1748671&r1=1748670&r2=1748671&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
 Thu Jun 16 08:59:53 2016
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertEqu
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.uima.ruta.expression.annotation.AnnotationLabelExpression;
+import org.apache.uima.ruta.expression.annotation.AnnotationVariableExpression;
 import org.apache.uima.ruta.expression.bool.AbstractBooleanListExpression;
 import org.apache.uima.ruta.expression.bool.BooleanListVariableExpression;
 import org.apache.uima.ruta.expression.bool.BooleanNumberExpression;
@@ -217,4 +219,12 @@ public class ExpressionVerbalizerTest {
     assertEquals("anyVar", s);
 
   }
+  
+  @Test
+  public void testAnnotationExpression() {
+    RutaVerbalizer v = new RutaVerbalizer();
+    assertEquals("l" , v.verbalize(new AnnotationLabelExpression("l")));
+    assertEquals("l" , v.verbalize(new AnnotationVariableExpression("l")));
+  }
+  
 }