Author: pkluegl
Date: Wed Nov 13 09:49:37 2019
New Revision: 1869732
URL: http://svn.apache.org/viewvc?rev=1869732&view=rev
Log:
ni jira - trying to get jenkins build more stable
Modified:
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/UimaFitAnalysisEngineWithManditoryParameterTest.java
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=1869732&r1=1869731&r2=1869732&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 Nov 13 09:49:37 2019
@@ -18,7 +18,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.net.URL;
@@ -29,6 +28,7 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.cas.CAS;
+import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.util.CasCreationUtils;
@@ -52,10 +52,13 @@ public class StackedScriptsTest {
@Test
public void testWithUimaFitAggregated() throws Exception {
- AnalysisEngine aae = createEngine(createEngineDescription(
+ AnalysisEngineDescription description = createEngineDescription(
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules1),
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules2),
- createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3)));
+ createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3));
+
+ ResourceManager resourceManager =
UIMAFramework.newDefaultResourceManager();
+ AnalysisEngine aae = UIMAFramework.produceAnalysisEngine(description,
resourceManager, null);
CAS cas = getCAS(LINES);
@@ -87,7 +90,6 @@ public class StackedScriptsTest {
checkResult(cas, LINES);
- cas.release();
}
private void checkResult(CAS cas, int lines) {
@@ -147,7 +149,8 @@ public class StackedScriptsTest {
tsds.add(basicTypeSystem);
TypeSystemDescription mergeTypeSystems =
CasCreationUtils.mergeTypeSystems(tsds);
aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
- AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed);
+ ResourceManager resourceManager =
UIMAFramework.newDefaultResourceManager();
+ AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed,
resourceManager, null);
ae.setConfigParameterValue(RutaEngine.PARAM_RULES, rules);
if (reindexOnly != null) {
@@ -160,18 +163,24 @@ public class StackedScriptsTest {
@Test
public void testPerformanceOfReindexOnly() throws Exception {
- AnalysisEngine aaeNoReindex = createEngine(createEngineDescription(
+ AnalysisEngineDescription noReindexDescription = createEngineDescription(
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules1),
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules2),
- createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3)));
- AnalysisEngine aaeReindex = createEngine(createEngineDescription(
+ createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3));
+ AnalysisEngineDescription reindexDescription = createEngineDescription(
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules1,
RutaEngine.PARAM_REINDEX_ONLY, new String[] {
CAS.TYPE_NAME_ANNOTATION }),
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules2,
RutaEngine.PARAM_REINDEX_ONLY, new String[] {
RutaTestUtils.TYPE + "1" }),
createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3,
RutaEngine.PARAM_REINDEX_ONLY,
- new String[] { RutaTestUtils.TYPE + "2",
RutaTestUtils.TYPE + "3" })));
+ new String[] { RutaTestUtils.TYPE + "2",
RutaTestUtils.TYPE + "3" }));
+
+ ResourceManager resourceManager =
UIMAFramework.newDefaultResourceManager();
+ AnalysisEngine aaeNoReindex =
UIMAFramework.produceAnalysisEngine(noReindexDescription,
+ resourceManager, null);
+ AnalysisEngine aaeReindex =
UIMAFramework.produceAnalysisEngine(reindexDescription,
+ resourceManager, null);
long start = 0;
long end = 0;
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java?rev=1869732&r1=1869731&r2=1869732&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java
Wed Nov 13 09:49:37 2019
@@ -19,10 +19,12 @@
package org.apache.uima.ruta.engine;
+import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.cas.CAS;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
+import org.apache.uima.resource.ResourceManager;
import org.apache.uima.ruta.descriptor.RutaBuildOptions;
import org.apache.uima.ruta.descriptor.RutaDescriptorFactory;
import org.apache.uima.ruta.descriptor.RutaDescriptorInformation;
@@ -42,15 +44,16 @@ public class UimaFitAnalysisEngineWithMa
RutaDescriptorInformation rdi = factory.parseDescriptorInformation(script);
AnalysisEngineDescription aed =
factory.createAnalysisEngineDescription(null, rdi,
new RutaBuildOptions(), null, null, null,
this.getClass().getClassLoader());
- AnalysisEngine ae = AnalysisEngineFactory.createEngine(aed,
RutaEngine.PARAM_RULES, script);
+ aed.getAnalysisEngineMetaData().getConfigurationParameterSettings()
+ .setParameterValue(RutaEngine.PARAM_RULES, script);
+ ResourceManager resourceManager =
UIMAFramework.newDefaultResourceManager();
+ AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed,
resourceManager, null);
CAS cas = RutaTestUtils.getCAS(document);
ae.process(cas);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text.");
-
- cas.release();
}
-
+
@Test
public void testScriptOnly() throws Exception {
@@ -58,12 +61,12 @@ public class UimaFitAnalysisEngineWithMa
String script = "UIMAFIT
org.apache.uima.ruta.engine.UimaFitAnalysisEngineWithManditoryParameter (type, "
+ RutaTestUtils.TYPE + "1);";
script += "EXEC(UimaFitAnalysisEngineWithManditoryParameter);";
-
- AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, script);
+
+ AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES,
+ script);
CAS cas = RutaTestUtils.getCAS(document);
ae.process(cas);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text.");
- cas.release();
}
}
