svn commit: r904064 - in /tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient: DomainURITestCase.java SCAClientTestCase.java

[antelder]

Author: antelder
Date: Thu Jan 28 12:31:36 2010
New Revision: 904064

URL: http://svn.apache.org/viewvc?rev=904064&view=rev
Log:
Simpify be merging into a single test

Removed:
    
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/DomainURITestCase.java
Modified:
    
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java

Modified: 
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java?rev=904064&r1=904063&r2=904064&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
 Thu Jan 28 12:31:36 2010
@@ -20,11 +20,14 @@
 package test.scaclient;
 
 import itest.HelloworldService;
-import junit.framework.TestCase;
+
 import java.net.URI;
 
+import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.Test;
 import org.oasisopen.sca.client.SCAClientFactory;
 
 /**
@@ -36,15 +39,22 @@
 
     private Node node;
 
-    @Override
-    protected void setUp() throws Exception {
-        node = NodeFactory.getInstance().createNode();
+    @Test
+    public void testDefault() throws Exception {
+
+        node = NodeFactory.getInstance().createNode((String)null, new String[] 
{"target/classes"});
         node.start();
+
+        HelloworldService service = 
SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class,
 "HelloworldComponent");
+        assertEquals("Hello petra", service.sayHello("petra"));
     }
 
-    public void testInvoke() throws Exception {
-        HelloworldService service =
-            
SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class,
 "HelloworldComponent");
+    @Test
+    public void testExplicit() throws Exception {
+        node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), 
new String[] {"target/classes"});
+        node.start();
+
+        HelloworldService service = 
SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class,
 "HelloworldComponent");
         assertEquals("Hello petra", service.sayHello("petra"));
     }