You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2017/09/08 11:45:50 UTC
svn commit: r1807718 - in /uima/uimafit-v3/trunk:
uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
Author: rec
Date: Fri Sep 8 11:45:49 2017
New Revision: 1807718
URL: http://svn.apache.org/viewvc?rev=1807718&view=rev
Log:
UIMA-5555 - ExternalResourceFactoryTest hangs at some tests due to remote URL accesses
- Comment the problematic tests out for the time being.
Modified:
uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
Modified: uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java?rev=1807718&r1=1807717&r2=1807718&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java Fri Sep 8 11:45:49 2017
@@ -24,7 +24,6 @@ import static org.apache.uima.fit.factor
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindExternalResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindResource;
-import static org.apache.uima.fit.factory.ExternalResourceFactory.createDependencyAndBind;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -78,7 +77,8 @@ import org.springframework.mock.jndi.Sim
*
*/
public class ExternalResourceFactoryTest extends ComponentTestBase {
- private static final String EX_URI = "http://dum.my";
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // private static final String EX_URI = "http://dum.my";
private static final String EX_FILE_1 = "src/test/resources/data/docs/test.xcas";
@@ -359,9 +359,11 @@ public class ExternalResourceFactoryTest
AnnotatedResource.PARAM_VALUE, "2");
bindResource(desc, DummyAE.RES_KEY_3, AnnotatedParametrizedDataResource.class,
AnnotatedParametrizedDataResource.PARAM_EXTENSION, ".lala");
- bindResource(desc, DummySharedResourceObject.class, EX_URI,
- DummySharedResourceObject.PARAM_VALUE, "3",
- DummySharedResourceObject.PARAM_ARRAY_VALUE, new String[] {"1", "2", "3"});
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // bindResource(desc, DummySharedResourceObject.class, EX_URI,
+ // DummySharedResourceObject.PARAM_VALUE, "3",
+ // DummySharedResourceObject.PARAM_ARRAY_VALUE, new String[] {"1", "2", "3"});
+
// An undefined URL may be used if the specified file/remote URL does not exist or if
// the network is down.
bindResource(desc, DummyAE.RES_SOME_URL, new File(EX_FILE_1).toURI().toURL());
@@ -369,9 +371,11 @@ public class ExternalResourceFactoryTest
bindResource(desc, DummyAE.RES_SOME_FILE, new File(EX_FILE_1));
bindResource(desc, DummyAE.RES_JNDI_OBJECT, JndiResourceLocator.class,
JndiResourceLocator.PARAM_NAME, "dictionaries/german");
- createDependencyAndBind(desc, "legacyResource", DummySharedResourceObject.class, EX_URI,
- DummySharedResourceObject.PARAM_VALUE, "3",
- DummySharedResourceObject.PARAM_ARRAY_VALUE, new String[] {"1", "2", "3"});
+
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // createDependencyAndBind(desc, "legacyResource", DummySharedResourceObject.class, EX_URI,
+ // DummySharedResourceObject.PARAM_VALUE, "3",
+ // DummySharedResourceObject.PARAM_ARRAY_VALUE, new String[] {"1", "2", "3"});
}
public static class DummyAE extends JCasAnnotator_ImplBase {
@@ -390,8 +394,9 @@ public class ExternalResourceFactoryTest
static final String RES_KEY_3 = "Key3";
- @ExternalResource
- DummySharedResourceObject sharedObject;
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // @ExternalResource
+ // DummySharedResourceObject sharedObject;
static final String RES_SOME_URL = "SomeUrl";
@@ -432,12 +437,13 @@ public class ExternalResourceFactoryTest
throw new AnalysisEngineProcessException(e);
}
- assertNotNull(sharedObject);
- assertEquals("3", sharedObject.getValue());
- assertEquals(asList("1", "2", "3"), asList(sharedObject.getArrayValue()));
-
- assertNotNull(sharedObject);
- assertEquals(EX_URI, sharedObject.getUrl().toString());
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // assertNotNull(sharedObject);
+ // assertEquals("3", sharedObject.getValue());
+ // assertEquals(asList("1", "2", "3"), asList(sharedObject.getArrayValue()));
+ //
+ // assertNotNull(sharedObject);
+ // assertEquals(EX_URI, sharedObject.getUrl().toString());
assertNotNull(jndiPropertes);
assertEquals("proper noun", jndiPropertes.get("Hans"));
@@ -452,11 +458,12 @@ public class ExternalResourceFactoryTest
assertTrue("URL [" + someFile.getUrl() + "] should end in [" + EX_FILE_1 + "]", someFile
.getUrl().toString().endsWith(EX_FILE_1));
- try {
- assertNotNull(getContext().getResourceObject("legacyResource"));
- } catch (ResourceAccessException e) {
- throw new AnalysisEngineProcessException(e);
- }
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // try {
+ // assertNotNull(getContext().getResourceObject("legacyResource"));
+ // } catch (ResourceAccessException e) {
+ // throw new AnalysisEngineProcessException(e);
+ // }
}
}
@@ -619,14 +626,17 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_EXTENSION, mandatory = true)
private String extension;
+ @Override
public InputStream getInputStream() throws IOException {
return null;
}
+ @Override
public URI getUri() {
return URI.create(uri + extension);
}
+ @Override
public URL getUrl() {
return null;
}
@@ -639,6 +649,7 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_EXTENSION, mandatory = true)
private String extension;
+ @Override
public DataResource getDataResource(String[] aParams) throws ResourceInitializationException {
List<String> params = new ArrayList<String>(Arrays.asList(aParams));
params.add(AnnotatedDataResource.PARAM_EXTENSION);
@@ -658,17 +669,21 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_ARRAY_VALUE, mandatory = true)
private String[] arrayValue;
- private URI uri;
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // private URI uri;
+ @Override
public void load(DataResource aData) throws ResourceInitializationException {
ConfigurationParameterInitializer.initialize(this, aData);
- assertEquals(EX_URI, aData.getUri().toString());
- uri = aData.getUri();
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // assertEquals(EX_URI, aData.getUri().toString());
+ // uri = aData.getUri();
}
- public URI getUrl() {
- return uri;
- }
+ // https://issues.apache.org/jira/browse/UIMA-5555
+ // public URI getUrl() {
+ // return uri;
+ // }
public String getValue() {
return value;
Modified: uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java?rev=1807718&r1=1807717&r2=1807718&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java (original)
+++ uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java Fri Sep 8 11:45:49 2017
@@ -23,7 +23,6 @@ import static org.apache.uima.fit.factor
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindExternalResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindResource;
-import static org.apache.uima.fit.factory.ExternalResourceFactory.createDependencyAndBind;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -73,7 +72,7 @@ import org.uimafit.descriptor.ExternalRe
*
*/
public class ExternalResourceFactoryTest extends ComponentTestBase {
- private static final String EX_URI = "http://dum.my";
+ //private static final String EX_URI = "http://dum.my";
private static final String EX_FILE_1 = "src/test/resources/data/docs/test.xcas";
@@ -184,8 +183,8 @@ public class ExternalResourceFactoryTest
ConfigurableResource.PARAM_VALUE, "2");
bindResource(desc, DummyAE.RES_KEY_3, ParametrizedResource.class,
ParametrizedResource.PARAM_EXTENSION, ".lala");
- bindResource(desc, DummySharedResourceObject.class, EX_URI,
- DummySharedResourceObject.PARAM_VALUE, "3");
+// bindResource(desc, DummySharedResourceObject.class, EX_URI,
+// DummySharedResourceObject.PARAM_VALUE, "3");
// An undefined URL may be used if the specified file/remote URL does not exist or if
// the network is down.
bindResource(desc, DummyAE.RES_SOME_URL, new File(EX_FILE_1).toURI().toURL());
@@ -193,8 +192,8 @@ public class ExternalResourceFactoryTest
bindResource(desc, DummyAE.RES_SOME_FILE, new File(EX_FILE_1));
bindResource(desc, DummyAE.RES_JNDI_OBJECT, JndiResourceLocator.class,
JndiResourceLocator.PARAM_NAME, "dictionaries/german");
- createDependencyAndBind(desc, "legacyResource", DummySharedResourceObject.class, EX_URI,
- DummySharedResourceObject.PARAM_VALUE, "3");
+// createDependencyAndBind(desc, "legacyResource", DummySharedResourceObject.class, EX_URI,
+// DummySharedResourceObject.PARAM_VALUE, "3");
}
public static class DummyAE extends JCasAnnotator_ImplBase {
@@ -213,8 +212,8 @@ public class ExternalResourceFactoryTest
static final String RES_KEY_3 = "Key3";
- @ExternalResource
- DummySharedResourceObject sharedObject;
+// @ExternalResource
+// DummySharedResourceObject sharedObject;
static final String RES_SOME_URL = "SomeUrl";
@@ -255,11 +254,11 @@ public class ExternalResourceFactoryTest
throw new AnalysisEngineProcessException(e);
}
- assertNotNull(sharedObject);
- assertEquals("3", sharedObject.getValue());
-
- assertNotNull(sharedObject);
- assertEquals(EX_URI, sharedObject.getUrl().toString());
+// assertNotNull(sharedObject);
+// assertEquals("3", sharedObject.getValue());
+//
+// assertNotNull(sharedObject);
+// assertEquals(EX_URI, sharedObject.getUrl().toString());
assertNotNull(jndiPropertes);
assertEquals("proper noun", jndiPropertes.get("Hans"));
@@ -274,11 +273,11 @@ public class ExternalResourceFactoryTest
assertTrue("URL [" + someFile.getUrl() + "] should end in [" + EX_FILE_1 + "]", someFile
.getUrl().toString().endsWith(EX_FILE_1));
- try {
- assertNotNull(getContext().getResourceObject("legacyResource"));
- } catch (ResourceAccessException e) {
- throw new AnalysisEngineProcessException(e);
- }
+// try {
+// assertNotNull(getContext().getResourceObject("legacyResource"));
+// } catch (ResourceAccessException e) {
+// throw new AnalysisEngineProcessException(e);
+// }
}
}
@@ -356,14 +355,17 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_EXTENSION, mandatory = true)
private String extension;
+ @Override
public InputStream getInputStream() throws IOException {
return null;
}
+ @Override
public URI getUri() {
return URI.create(uri + extension);
}
+ @Override
public URL getUrl() {
return null;
}
@@ -376,6 +378,7 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_EXTENSION, mandatory = true)
private String extension;
+ @Override
public DataResource getDataResource(String[] aParams) throws ResourceInitializationException {
List<String> params = new ArrayList<String>(Arrays.asList(aParams));
params.add(ConfigurableDataResource.PARAM_EXTENSION);
@@ -392,17 +395,18 @@ public class ExternalResourceFactoryTest
@ConfigurationParameter(name = PARAM_VALUE, mandatory = true)
private String value;
- private URI uri;
+// private URI uri;
+ @Override
public void load(DataResource aData) throws ResourceInitializationException {
ConfigurationParameterInitializer.initialize(this, aData);
- assertEquals(EX_URI, aData.getUri().toString());
- uri = aData.getUri();
+// assertEquals(EX_URI, aData.getUri().toString());
+// uri = aData.getUri();
}
- public URI getUrl() {
- return uri;
- }
+// public URI getUrl() {
+// return uri;
+// }
public String getValue() {
return value;