diff options
Diffstat (limited to '')
14 files changed, 67 insertions, 7 deletions
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java index 75b296bf32..3ea2d0c207 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java @@ -19,11 +19,12 @@ package context.multiple;
import junit.framework.TestCase;
-
+import org.junit.Ignore;
/**
* Tests out the big bank service
*
*/
+@Ignore("TUSCANY-3069")
public class MultipleContextTestCase extends TestCase {
public void testServer() throws Exception {
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java index ca64d5fcb9..0f4d9f7c42 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java @@ -18,6 +18,9 @@ */
package context.multiple;
+import java.io.File;
+
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
import org.springframework.context.ApplicationContext;
@@ -34,7 +37,8 @@ public class StockQuoteServer { System.out.println("Starting the Sample SCA StockQuote Service...");
SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("context/multiple/StockQuote.composite", StockQuoteServer.class.getClassLoader());
+ SCANode node = factory.createSCANode(new File("src/main/resources/context/multiple/StockQuote.composite").toURL().toString(),
+ new SCAContribution("TestContribution", new File("src/main/resources/context/multiple/").toURL().toString()));
node.start();
// Method 1: To access the Spring Application Context instance
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java index 27e634d301..bc29f54d86 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java @@ -46,8 +46,9 @@ public class CalculatorClient { }
SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("implementation/policies/Calculator.composite", CalculatorServiceImpl.class.getClassLoader());
- node.start();
+ SCANode node = factory.createSCANode(new File("src/main/resources/implementation/policies/Calculator.composite").toURL().toString(),
+ new SCAContribution("TestContribution", new File("src/main/resources/implementation/policies/").toURL().toString()));
+ node.start();
CalculatorService calculatorService =
((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java index 88ac2e8cb5..bd1150e99a 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java @@ -37,5 +37,9 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringFolderLocationTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringFolderLocationTestCase() {
+ super("SpringFolderLocation.composite", "location/folder");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java index e3600a355c..102cd69874 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java @@ -37,5 +37,9 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringJarLocationTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringJarLocationTestCase() {
+ super("SpringJarLocation.composite", "location/jar");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java index 634e3d34af..aa63fbd5c2 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java @@ -19,7 +19,6 @@ package org.apache.tuscany.sca.itest.spring; - /** * Basic "hello world" style test case for testing Spring component implementation * @@ -29,6 +28,10 @@ public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<Hel /** * Calls the hello world service and checks that it gives the right response... */ + public AbstractHelloWorldTestCase(String compositeName, String contributionLocation) { + super(compositeName, contributionLocation); + } + public void testHello() throws Exception { assertEquals("Hello petra", service.sayHello("petra")); } diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java index aeb7918add..e9fc938d7c 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java @@ -21,16 +21,36 @@ package org.apache.tuscany.sca.itest.spring; import junit.framework.TestCase; +import java.io.File; +import java.net.MalformedURLException; + import org.apache.tuscany.sca.host.embedded.SCADomain; public abstract class AbstractSCATestCase<T> extends TestCase { protected SCADomain domain; + protected String compositeName; + protected String contributionLocation; protected T service; + + public AbstractSCATestCase(String compositeName, String contributionLocation) { + super(); + this.compositeName = compositeName; + this.contributionLocation = contributionLocation; + try { + if (contributionLocation != null) { + File f = new File("target/classes/" + contributionLocation); + this.contributionLocation = f.toURL().toString(); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } @Override protected void setUp() throws Exception { - domain = SCADomain.newInstance(getCompositeName()); + domain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName); + //domain = SCADomain.newInstance(getCompositeName()); service = domain.getService(getServiceClass(), "ClientComponent"); } diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java index 4088691ccd..11ed16e6b4 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java @@ -28,4 +28,8 @@ package org.apache.tuscany.sca.itest.spring; */ public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase { // super class does it all getting composite based on this class name + + public SpringDelegationHelloWorldTestCase() { + super("SpringDelegationHelloWorld.composite", "org/apache/tuscany/sca/itest/spring"); + } } diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java index 840bf59b73..bec19b76de 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java @@ -29,4 +29,8 @@ package org.apache.tuscany.sca.itest.spring; */ public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase { // super class does it all getting composite based on this class name + + public SpringHelloWorldTestCase() { + super("SpringHelloWorld.composite", "org/apache/tuscany/sca/itest/spring"); + } } diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java index 9bc12c3e7b..603d2524f6 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java @@ -38,4 +38,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringExplicitReferenceTestCase() {
+ super("SpringExplicitReference.composite", "sca/references");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java index 52ea64a3ed..757f12c08b 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java @@ -39,6 +39,10 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringImplicitReferenceTestCase() {
+ super("SpringImplicitReference.composite", "sca/references");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java index 35f44b2af7..03af1e6b12 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java @@ -33,4 +33,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringExplicitServiceTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringExplicitServiceTestCase() {
+ super("SpringExplicitService.composite", "sca/services");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java index 488bdcb202..6f17be1970 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java @@ -31,4 +31,8 @@ import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; */
public class SpringImplicitServiceTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public SpringImplicitServiceTestCase() {
+ super("SpringImplicitService.composite", "sca/services");
+ }
}
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java index c21561a962..34e10de85b 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java @@ -27,7 +27,6 @@ import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory;
import calculator.CalculatorService;
-import calculator.CalculatorServiceImpl;
/**
|