svn commit: r775004 - in /tuscany/java/sca/modules/node-impl/src: main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java

[rfeng]

Author: rfeng
Date: Fri May 15 04:54:19 2009
New Revision: 775004

URL: http://svn.apache.org/viewvc?rev=775004&view=rev
Log:
Enable more test cases

Modified:
    
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
    
tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java

Modified: 
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java?rev=775004&r1=775003&r2=775004&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
 (original)
+++ 
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
 Fri May 15 04:54:19 2009
@@ -24,7 +24,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.logging.Logger;
 
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.ContributionFactory;
@@ -35,7 +34,9 @@
  * @version $Rev: $ $Date: $
  */
 public class NodeUtil {
-    private static final Logger logger = 
Logger.getLogger(NodeImpl.class.getName());
+
+    private NodeUtil() {
+    }
 
     static Contribution contribution(ContributionFactory contributionFactory, 
org.apache.tuscany.sca.node.Contribution c) {
         Contribution contribution = contributionFactory.createContribution();

Modified: 
tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java?rev=775004&r1=775003&r2=775004&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
 Fri May 15 04:54:19 2009
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * \"License\"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.node.impl;
@@ -51,28 +51,37 @@
         Node node = factory.createNode(compositeURI, composite, contribution);
         testNode2(node);
     }
-    
-//    @Test
-//    public void testNodeWithRelativeCompositeURI() {
-//        NodeFactory factory = new NodeFactoryImpl();
-//        Contribution contribution = new Contribution("c1", new 
File("target/test-classes").toURI().toString());
-//        String compositeURI = "HelloWorld.composite";
-//        Node node = factory.createNode(compositeURI, contribution);
-//        testNode(node);
-//    }
-//
-//    @Test
-//    public void testDefaultNode() {
-//        testNode(new NodeFactoryImpl().createNode());
-//    }
-//    
-//    private void testNode(Node node) {
-//        node.start();
-//        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld");
-//        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-//        node.stop();
-//    }
-        
+
+    @Test
+    public void testNodeWithRelativeCompositeURI() {
+        NodeFactory factory = new NodeFactoryImpl();
+        Contribution contribution = new Contribution("c1", new 
File("target/test-classes").toURI().toString());
+        String compositeURI = "HelloWorld.composite";
+        Node node = factory.createNode(compositeURI, contribution);
+        testNode(node);
+    }
+
+    @Test
+    public void testNodeWithAbsoluteCompositeURI() {
+        NodeFactory factory = new NodeFactoryImpl();
+        Contribution contribution = new Contribution("c1", new 
File("target/test-classes").toURI().toString());
+        String compositeURI = new 
File("target/test-classes/HelloWorld.composite").toURI().toString();
+        Node node = factory.createNode(compositeURI, contribution);
+        testNode(node);
+    }
+
+    @Test
+    public void testDefaultNode() {
+        testNode(new NodeFactoryImpl().createNode());
+    }
+
+    private void testNode(Node node) {
+        node.start();
+        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld");
+        Assert.assertEquals("Hello, Node", hw.hello("Node"));
+        node.stop();
+    }
+
     private void testNode2(Node node) {
         node.start();
         HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld2");