You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2017/02/15 16:38:47 UTC
svn commit: r1783122 - in /uima/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/
test/java/org/apache/uima/ruta/expression/resource/
Author: pkluegl
Date: Wed Feb 15 16:38:47 2017
New Revision: 1783122
URL: http://svn.apache.org/viewvc?rev=1783122&view=rev
Log:
UIMA-5300
- fix resourceManager access
- added tests
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordTableStringExpressionTest.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?rev=1783122&r1=1783121&r2=1783122&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java Wed Feb 15 16:38:47 2017
@@ -326,7 +326,7 @@ public class RutaEnvironment {
private void importDeclaredTypesystems(TypeSystem casTS) throws InvalidXMLException {
String[] descriptors = typesystems.toArray(new String[typesystems.size()]);
TypeSystemDescription ts = TypeSystemDescriptionFactory.createTypeSystemDescription(descriptors);
- ts.resolveImports(resourceManager);
+ ts.resolveImports(getResourceManager());
for (TypeDescription td : ts.getTypes()) {
Type type = casTS.getType(td.getName());
if (type != null) {
@@ -651,7 +651,7 @@ public class RutaEnvironment {
}
if (result == null) {
if (list.endsWith("txt") || list.endsWith("twl") || list.endsWith("mtwl")) {
- ResourceLoader resourceLoader = new RutaResourceLoader(getResourcePaths(), resourceManager.getExtensionClassLoader());
+ ResourceLoader resourceLoader = new RutaResourceLoader(getResourcePaths(), getResourceManager().getExtensionClassLoader());
Resource resource = resourceLoader.getResource(list);
if (resource.exists()) {
try {
@@ -685,7 +685,7 @@ public class RutaEnvironment {
RutaTable result = tables.get(table);
if (result == null) {
if (table.endsWith("csv") || table.endsWith("txt") || table.endsWith("tsv")) {
- ResourceLoader resourceLoader = new RutaResourceLoader(getResourcePaths(), resourceManager.getExtensionClassLoader());
+ ResourceLoader resourceLoader = new RutaResourceLoader(getResourcePaths(), getResourceManager().getExtensionClassLoader());
Resource resource = resourceLoader.getResource(table);
if (resource.exists()) {
try {
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java?rev=1783122&r1=1783121&r2=1783122&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java Wed Feb 15 16:38:47 2017
@@ -42,4 +42,21 @@ public class WordListStringExpressionTes
}
+ @Test
+ public void testInBlock() throws Exception {
+ String document = "1 0 0 text 2 0 0.";
+
+ String script="STRING s = \"org/apache/uima/ruta/action/\";\n";
+ script +="BLOCK(block) Document{}{\n";
+ script +="WORDLIST wl = s + \"MarkFastTestList.txt\";\n";
+ script +="MARKFAST(T1,wl);\n";
+ script +="}\n";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "1 0 0", "2 0 0");
+
+ }
+
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordTableStringExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordTableStringExpressionTest.java?rev=1783122&r1=1783121&r2=1783122&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordTableStringExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordTableStringExpressionTest.java Wed Feb 15 16:38:47 2017
@@ -99,4 +99,65 @@ public class WordTableStringExpressionTe
}
+ @Test
+ public void testInBlock() throws Exception {
+ String document = "Kluegl Schor Kottmann";
+
+ String script="STRING s = \"org/apache/uima/ruta/action/\";\n";
+ script +="BLOCK(block) Document{}{\n";
+ script +="WORDTABLE table = s + \"table.csv\";\n";
+ script +="MARKTABLE(Person, 1, table, true, 0, \"-.,\", 10, \"firstname\" = 2, \"system\" = 3);\n";
+ script +="}\n";
+
+ Map<String, String> complexTypes = new TreeMap<String, String>();
+ String typeName = "org.apache.uima.Person";
+ complexTypes.put(typeName, "uima.tcas.Annotation");
+
+ Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
+ List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
+ features.put(typeName, list);
+ String fn1 = "firstname";
+ list.add(new TestFeature(fn1, "", "uima.cas.String"));
+ String fn2 = "system";
+ list.add(new TestFeature(fn2, "", "uima.cas.String"));
+
+ CAS cas = RutaTestUtils.getCAS(document, complexTypes, features);
+ Ruta.apply(cas, script);
+
+ Type t = null;
+ AnnotationIndex<AnnotationFS> ai = null;
+ FSIterator<AnnotationFS> iterator = null;
+ AnnotationFS next = null;
+ String v1 = null;
+ String v2 = null;
+ t = cas.getTypeSystem().getType(typeName);
+ Feature f1 = t.getFeatureByBaseName(fn1);
+ Feature f2 = t.getFeatureByBaseName(fn2);
+ ai = cas.getAnnotationIndex(t);
+
+ assertEquals(3, ai.size());
+ iterator = ai.iterator();
+
+ next = iterator.next();
+ v1 = next.getStringValue(f1);
+ v2 = next.getStringValue(f2);
+ assertEquals("Peter", v1);
+ assertEquals("Ruta", v2);
+
+ next = iterator.next();
+ v1 = next.getStringValue(f1);
+ v2 = next.getStringValue(f2);
+ assertEquals("Marshall", v1);
+ assertEquals("UIMA", v2);
+
+ next = iterator.next();
+ v1 = next.getStringValue(f1);
+ v2 = next.getStringValue(f2);
+ assertEquals("Joern", v1);
+ assertEquals("CAS Editor", v2);
+
+ cas.release();
+
+ }
+
}