You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/02 18:33:54 UTC
[15/28] incubator-taverna-common-activities git commit: always make
classloader
always make classloader
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/db41b591
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/db41b591
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/db41b591
Branch: refs/heads/cwl-browse
Commit: db41b5914f5dbe6377352c4afb78fe9fa501318a
Parents: 2ab4bc4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:11:18 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:11:18 2016 +0100
----------------------------------------------------------------------
.../org/apache/taverna/wsdl/testutils/WSDLTestHelper.java | 1 +
.../taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/db41b591/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
index 40fd823..ee4b461 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
@@ -96,6 +96,7 @@ public class WSDLTestHelper implements LocationConstants {
}
public static String wsdlResourcePath(String resourceName) throws Exception {
+ makeClassLoader();
return getResource(WSDL_RESOURCE_BASE+resourceName).toExternalForm();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/db41b591/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
index 4d856eb..afba005 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
@@ -32,11 +32,11 @@ import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
import org.junit.Test;
-public class XMLInputSplitterTest implements LocationConstants {
+public class XMLInputSplitterTest extends WSDLTestHelper {
@Test
public void testExecute() throws Exception {
- WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("eutils/eutils_lite.wsdl"));
+ WSDLParser parser = new WSDLParser(wsdlResourcePath("eutils/eutils_lite.wsdl"));
TypeDescriptor descriptor = parser.getOperationInputParameters("run_eInfo").get(0);
XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"db","tool","email"},new String[]{"text/plain","text/plain","text/plain"},new String[]{"output"});
Map<String,Object> inputMap = new HashMap<String, Object>();
@@ -54,7 +54,7 @@ public class XMLInputSplitterTest implements LocationConstants {
@Test
public void testOptional() throws Exception {
- WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("VSOi.wsdl"));
+ WSDLParser parser = new WSDLParser(wsdlResourcePath("VSOi.wsdl"));
TypeDescriptor descriptor = parser.getOperationInputParameters("Query").get(0);
XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"version","block"},new String[]{"text/plain","text/plain"},new String[]{"output"});
Map<String,Object> inputMap = new HashMap<String, Object>();
@@ -71,7 +71,7 @@ public class XMLInputSplitterTest implements LocationConstants {
@Test
public void testNillable() throws Exception {
- WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("VSOi.wsdl"));
+ WSDLParser parser = new WSDLParser(wsdlResourcePath("VSOi.wsdl"));
TypeDescriptor descriptor = parser.getOperationInputParameters("Query").get(0);
XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"version","block"},new String[]{"text/plain","text/plain"},new String[]{"output"});
Map<String,Object> inputMap = new HashMap<String, Object>();