1 files changed, 127 insertions, 117 deletions

diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 9af85a970c..383344f3cb 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
@@ -27,7 +27,10 @@ import org.apache.abdera.model.Content;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.apache.tuscany.sca.binding.atom.collection.Collection;
-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.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,119 +40,126 @@ import org.junit.Test;
  */
 public class ConsumerProviderAtomTestCase {
 
-	protected static SCADomain scaConsumerDomain;
-	protected static SCADomain scaProviderDomain;
-	protected static CustomerClient testService;
-	protected static Abdera abdera;
-
-	@BeforeClass
-	public static void init() throws Exception {
-		System.out.println(">>>AtomBindingIntegratedTestCase.init entry");
-		scaProviderDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Provider.composite");
-		scaConsumerDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Consumer.composite");
-		testService = scaConsumerDomain.getService(CustomerClient.class,"CustomerClient");
-		abdera = new Abdera();
-	}
-
-	@AfterClass
-	public static void destroy() throws Exception {
-		System.out.println(">>>AtomBindingIntegratedTestCase.destroy entry");
-		scaConsumerDomain.close();
-		scaProviderDomain.close();
-	}
-
-	@Test
-	public void testPrelim() throws Exception {
-		Assert.assertNotNull(scaProviderDomain);
-		Assert.assertNotNull(scaConsumerDomain);
-		Assert.assertNotNull(testService);
-		Assert.assertNotNull(abdera);
-	}
-
-	@Test
-	public void testEntry() throws Exception {
-		// System.out.println( getClass().getName() + ".testEntry entry" );
-		Entry entry = abdera.newEntry();
-		Assert.assertNotNull(entry);
-
-		String testTitle = "Sponge Bob";
-		entry.setTitle(testTitle);
-		Assert.assertEquals(testTitle, entry.getTitle());
-
-		String testContent = "This is the content";
-		entry.setContent(testContent);
-		Assert.assertEquals(testContent, entry.getContent());
-
-		Date now = new Date();
-		entry.setEdited(now);
-		Assert.assertEquals(now, entry.getEdited());
-
-		Date later = new Date();
-		entry.setPublished(later);
-		Assert.assertEquals(later, entry.getPublished());
-
-		String testSummary = "This is the summary";
-		entry.setSummary(testSummary);
-		Assert.assertEquals(testSummary, entry.getSummary());
-	}
-
-	@Test
-	public void testCustomerCollection() throws Exception {
-		System.out.println(getClass().getName()	+ ".testCustomerCollection entry");
-		Collection resourceCollection = testService.getCustomerCollection();
-		Assert.assertNotNull(resourceCollection);
-		
-		Entry newEntry = newEntry("Sponge Bob");
-	        System.out.println(">>> post entry=" + newEntry.getTitle());
-	        newEntry = resourceCollection.post(newEntry);
-	        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-	        newEntry = newEntry("Jane Bond");
-	        System.out.println(">>> post entry=" + newEntry.getTitle());
-	        newEntry = resourceCollection.post(newEntry);
-	        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
-
-	        System.out.println(">>> get id=" + newEntry.getId());
-	        Entry entry = resourceCollection.get(newEntry.getId().toString());
-	        System.out.println("<<< get id=" + entry.getId() + " entry=" + entry.getTitle());
-
-	        System.out.println(">>> put id=" + newEntry.getId() + " entry=" + entry.getTitle());
-	        resourceCollection.put(entry.getId().toString(), updateEntry(entry, "James Bond"));
-	        System.out.println("<<< put id=" + entry.getId() + " entry=" + entry.getTitle());
-
-	        System.out.println(">>> delete id=" + entry.getId());
-	        resourceCollection.delete(entry.getId().toString());
-	        System.out.println("<<< delete id=" + entry.getId());
-	        
-	        System.out.println(">>> get collection");
-	        Feed feed = resourceCollection.getFeed();
-	        System.out.println("<<< get collection");
-	        for (Object o : feed.getEntries()) {
-	            Entry e = (Entry)o;
-	            System.out.println("id = " + e.getId() + " entry = " + e.getTitle());
-	        }
-	}
-
-	private Entry newEntry(String value) {
-		Entry entry = abdera.newEntry();
-		entry.setTitle("customer " + value);
-
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(value);
-		entry.setContentElement(content);
-
-		return entry;
-	}
-
-	private Entry updateEntry(Entry entry, String value) {
-		entry.setTitle("customer " + value);
-
-		Content content = abdera.getFactory().newContent();
-		content.setContentType(Content.Type.TEXT);
-		content.setValue(value);
-		entry.setContentElement(content);
-
-		return entry;
-	}
-}
\ No newline at end of file
+    protected static Node consumerNode;
+    protected static Node providerNode;
+    protected static CustomerClient testService;
+    protected static Abdera abdera;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        System.out.println(">>>AtomBindingIntegratedTestCase.init entry");
+        String contribution = ContributionLocationHelper.getContributionLocation(AtomDeleteTestCase.class);
+        providerNode = NodeFactory.newInstance().createNode(
+                                                               "org/apache/tuscany/sca/binding/atom/Provider.composite", new Contribution("provider", contribution));
+        consumerNode = NodeFactory.newInstance().createNode(
+                                                               "org/apache/tuscany/sca/binding/atom/Consumer.composite", new Contribution("consumer", contribution));
+        providerNode.start();
+        consumerNode.start();
+        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
+        abdera = new Abdera();
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println(">>>AtomBindingIntegratedTestCase.destroy entry");
+        consumerNode.stop();
+        consumerNode.destroy();
+        providerNode.stop();
+        providerNode.destroy();
+    }
+
+    @Test
+    public void testPrelim() throws Exception {
+        Assert.assertNotNull(providerNode);
+        Assert.assertNotNull(consumerNode);
+        Assert.assertNotNull(testService);
+        Assert.assertNotNull(abdera);
+    }
+
+    @Test
+    public void testEntry() throws Exception {
+        // System.out.println( getClass().getName() + ".testEntry entry" );
+        Entry entry = abdera.newEntry();
+        Assert.assertNotNull(entry);
+
+        String testTitle = "Sponge Bob";
+        entry.setTitle(testTitle);
+        Assert.assertEquals(testTitle, entry.getTitle());
+
+        String testContent = "This is the content";
+        entry.setContent(testContent);
+        Assert.assertEquals(testContent, entry.getContent());
+
+        Date now = new Date();
+        entry.setEdited(now);
+        Assert.assertEquals(now, entry.getEdited());
+
+        Date later = new Date();
+        entry.setPublished(later);
+        Assert.assertEquals(later, entry.getPublished());
+
+        String testSummary = "This is the summary";
+        entry.setSummary(testSummary);
+        Assert.assertEquals(testSummary, entry.getSummary());
+    }
+
+    @Test
+    public void testCustomerCollection() throws Exception {
+        System.out.println(getClass().getName() + ".testCustomerCollection entry");
+        Collection resourceCollection = testService.getCustomerCollection();
+        Assert.assertNotNull(resourceCollection);
+
+        Entry newEntry = newEntry("Sponge Bob");
+        System.out.println(">>> post entry=" + newEntry.getTitle());
+        newEntry = resourceCollection.post(newEntry);
+        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
+
+        newEntry = newEntry("Jane Bond");
+        System.out.println(">>> post entry=" + newEntry.getTitle());
+        newEntry = resourceCollection.post(newEntry);
+        System.out.println("<<< post id=" + newEntry.getId() + " entry=" + newEntry.getTitle());
+
+        System.out.println(">>> get id=" + newEntry.getId());
+        Entry entry = resourceCollection.get(newEntry.getId().toString());
+        System.out.println("<<< get id=" + entry.getId() + " entry=" + entry.getTitle());
+
+        System.out.println(">>> put id=" + newEntry.getId() + " entry=" + entry.getTitle());
+        resourceCollection.put(entry.getId().toString(), updateEntry(entry, "James Bond"));
+        System.out.println("<<< put id=" + entry.getId() + " entry=" + entry.getTitle());
+
+        System.out.println(">>> delete id=" + entry.getId());
+        resourceCollection.delete(entry.getId().toString());
+        System.out.println("<<< delete id=" + entry.getId());
+
+        System.out.println(">>> get collection");
+        Feed feed = resourceCollection.getFeed();
+        System.out.println("<<< get collection");
+        for (Object o : feed.getEntries()) {
+            Entry e = (Entry)o;
+            System.out.println("id = " + e.getId() + " entry = " + e.getTitle());
+        }
+    }
+
+    private Entry newEntry(String value) {
+        Entry entry = abdera.newEntry();
+        entry.setTitle("customer " + value);
+
+        Content content = abdera.getFactory().newContent();
+        content.setContentType(Content.Type.TEXT);
+        content.setValue(value);
+        entry.setContentElement(content);
+
+        return entry;
+    }
+
+    private Entry updateEntry(Entry entry, String value) {
+        entry.setTitle("customer " + value);
+
+        Content content = abdera.getFactory().newContent();
+        content.setContentType(Content.Type.TEXT);
+        content.setValue(value);
+        entry.setContentElement(content);
+
+        return entry;
+    }
+}