diff options
Diffstat (limited to '')
7 files changed, 85 insertions, 30 deletions
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java index 2517c7233a..50a3ec3886 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java @@ -19,7 +19,10 @@ package org.apache.tuscany.sca.binding.gdata; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.google.gdata.data.Entry; import com.google.gdata.data.Feed; @@ -30,8 +33,11 @@ public class Consumer { public static void main(String[] args) throws Exception { //Initialize the GData client service (Reference Binding test) - SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite"); - CustomerClient testService = scaDomain.getService(CustomerClient.class, "CustomerClient"); + String contribution = ContributionLocationHelper.getContributionLocation(Consumer.class); + Node node = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite", new Contribution("consumer", contribution)); + node.start(); + CustomerClient testService = node.getService(CustomerClient.class, "CustomerClient"); Feed feed = testService.clientGetFeed(); diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java index 3ac79e5f0a..e4d502357d 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java @@ -20,18 +20,23 @@ package org.apache.tuscany.sca.binding.gdata; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; + import com.google.gdata.data.Entry; import com.google.gdata.data.Feed; import com.google.gdata.data.PlainTextConstruct; public class ConsumerProviderTestCase extends TestCase { - private SCADomain scaDomainProvider = null; - private SCADomain scaDomainConsumer = null; + private Node providerNode = null; + private Node consumerNode = null; private CustomerClient testService = null; @Before @@ -40,18 +45,26 @@ public class ConsumerProviderTestCase extends TestCase { System.out.println("Method Test Start-----------------------------------------------------------------------"); // Setup the local GData servlet (Service Binding test) - scaDomainProvider = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite"); + String contribution = ContributionLocationHelper.getContributionLocation(ConsumerProviderTestCase.class); + providerNode = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution)); + providerNode.start(); System.out.println("[Debug Info] Provider.composite ready..."); // Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Consumer.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + consumerNode = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/Consumer.composite", new Contribution("consumer", contribution)); + consumerNode.start(); + testService = consumerNode.getService(CustomerClient.class, "CustomerClient"); } @After @Override public void tearDown() { - scaDomainProvider.close(); + providerNode.stop(); + providerNode.destroy(); + consumerNode.stop(); + consumerNode.destroy(); System.out.println("Method Test End------------------------------------------------------------------------"); System.out.println("\n\n"); } diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java index b4f6ec7b36..902d251200 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java @@ -23,7 +23,10 @@ import java.net.URL; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,11 +39,10 @@ import com.google.gdata.data.PlainTextConstruct; public class GoogleBloggerServiceTestCase extends TestCase{ - private SCADomain scaDomainConsumer = null; + private Node consumerNode = null; private CustomerClient testService = null; public GoogleBloggerServiceTestCase(){ - } @Before @@ -49,8 +51,11 @@ public class GoogleBloggerServiceTestCase extends TestCase{ System.out.println("Method Test Start-----------------------------------------------------------------------"); //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + String contribution = ContributionLocationHelper.getContributionLocation(GoogleBloggerServiceTestCase.class); + consumerNode = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite", new Contribution("consumer", contribution)); + consumerNode.start(); + testService = consumerNode.getService(CustomerClient.class, "CustomerClient"); } @After @@ -58,6 +63,8 @@ public class GoogleBloggerServiceTestCase extends TestCase{ public void tearDown(){ System.out.println("Method Test End------------------------------------------------------------------------"); System.out.println("\n\n"); + consumerNode.stop(); + consumerNode.destroy(); } @Test diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java index 882716575b..749dd41710 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java @@ -23,7 +23,10 @@ import java.net.URL; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,11 +39,10 @@ import com.google.gdata.data.PlainTextConstruct; public class GoogleCalendarServiceTestCase extends TestCase{ - private SCADomain scaDomainConsumer = null; + private Node consumerNode = null; private CustomerClient testService = null; public GoogleCalendarServiceTestCase(){ - } @Before @@ -49,8 +51,11 @@ public class GoogleCalendarServiceTestCase extends TestCase{ System.out.println("Method Test Start-----------------------------------------------------------------------"); //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + String contribution = ContributionLocationHelper.getContributionLocation(GoogleCalendarServiceTestCase.class); + consumerNode = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite", new Contribution("consumer", contribution)); + consumerNode.start(); + testService = consumerNode.getService(CustomerClient.class, "CustomerClient"); } @After @@ -58,6 +63,8 @@ public class GoogleCalendarServiceTestCase extends TestCase{ public void tearDown(){ System.out.println("Method Test End------------------------------------------------------------------------"); System.out.println("\n\n"); + consumerNode.stop(); + consumerNode.destroy(); } @Test diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java index 959c153074..cab7196a69 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java @@ -23,7 +23,10 @@ import java.net.URL; import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,7 +39,7 @@ import com.google.gdata.data.PlainTextConstruct; public class GoogleContactsServiceTestCase extends TestCase{ - private SCADomain scaDomainConsumer = null; + private Node consumerNode = null; private CustomerClient testService = null; public GoogleContactsServiceTestCase(){ @@ -49,8 +52,11 @@ public class GoogleContactsServiceTestCase extends TestCase{ System.out.println("Method Test Start-----------------------------------------------------------------------"); //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + String contribution = ContributionLocationHelper.getContributionLocation(GoogleContactsServiceTestCase.class); + consumerNode = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite", new Contribution("consumer", contribution)); + consumerNode.start(); + testService = consumerNode.getService(CustomerClient.class, "CustomerClient"); } @After @@ -58,6 +64,8 @@ public class GoogleContactsServiceTestCase extends TestCase{ public void tearDown(){ System.out.println("Method Test End------------------------------------------------------------------------"); System.out.println("\n\n"); + consumerNode.stop(); + consumerNode.destroy(); } @Test diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java index 21bff30256..a9b12c3d32 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java @@ -21,13 +21,19 @@ package org.apache.tuscany.sca.binding.gdata; import java.io.IOException; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class Provider { public static void main(String[] args) { - SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite"); + String contribution = ContributionLocationHelper.getContributionLocation(Provider.class); + Node node = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution)); + node.start(); System.out.println("Provider.composite ready..."); try { @@ -36,6 +42,7 @@ public class Provider { e.printStackTrace(); } - scaDomain.close(); + node.stop(); + node.destroy(); } } diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java index 2773398426..141f641575 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java @@ -21,13 +21,19 @@ package org.apache.tuscany.sca.binding.gdata; import java.io.IOException; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class StartLocalhostServlet { public static void main(String[] args) { - SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite"); + String contribution = ContributionLocationHelper.getContributionLocation(Provider.class); + Node node = NodeFactory.newInstance().createNode( + "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution)); + node.start(); System.out.println("Provider.composite ready..."); try { @@ -36,6 +42,7 @@ public class StartLocalhostServlet { e.printStackTrace(); } - scaDomain.close(); + node.stop(); + node.destroy(); } } |