You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/09/05 19:30:56 UTC
svn commit: r1807393 -
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
Author: schor
Date: Tue Sep 5 19:30:55 2017
New Revision: 1807393
URL: http://svn.apache.org/viewvc?rev=1807393&view=rev
Log:
[UIMA-5411] merge
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (contents, props changed)
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1807393&r1=1807392&r2=1807393&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Tue Sep 5 19:30:55 2017
@@ -328,7 +328,9 @@ public class AnalysisEngine_implTest ext
String resDir = "src/test/resources/TextAnalysisEngineImplTest/";
String prevDatapath = System.setProperty(RelativePathResolver.UIMA_DATAPATH_PROP, resDir);
System.setProperty("UimaExternalOverrides",
- resDir+"testExternalOverride.settings,TextAnalysisEngineImplTest/testExternalOverride2.settings,testExternalOverride4.settings");
+ resDir+"testExternalOverride.settings," +
+ "path:TextAnalysisEngineImplTest.testExternalOverride2," +
+ "path:testExternalOverride4");
in = new XMLInputSource(JUnitExtension.getFile("TextAnalysisEngineImplTest/AnnotatorWithExternalOverrides.xml"));
desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in);
ae1 = new PrimitiveAnalysisEngine_impl();
@@ -372,7 +374,7 @@ public class AnalysisEngine_implTest ext
System.clearProperty("UimaExternalOverrides");
// Same aggregate with invalid syntax for an array in the external overrides file
- System.setProperty("UimaExternalOverrides", resDir+"testExternalOverride3.settings");
+ System.setProperty("UimaExternalOverrides", "file:"+resDir+"testExternalOverride3.settings");
try {
UIMAFramework.produceAnalysisEngine(desc);
fail(); // should not get here
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 5 19:30:55 2017
@@ -4,4 +4,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:933273-944396
-/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1690273-1779993,1781560
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1690273-1807392