From 580087675cfd2faac0018ec06964be2abc04dacd Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Aug 2009 21:19:14 +0000
Subject: [PATCH] Clean up launcher test case

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@805147 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/scatours/IntroducingTestCase.java    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java
index dc4586b491..8430f1846b 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java
@@ -27,8 +27,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Test driver for introducing-tuscanyscatours-contribution and
- * introducing-goodvaluetrips-contribution.
+ * Test case to run the test code in introducing-client-contribution that
+ * tests components and services in introducing-tuscanyscatours-contribution
+ * and introducing-goodvaluetrips-contribution.
  */
 public class IntroducingTestCase {
 
@@ -36,21 +37,17 @@ public class IntroducingTestCase {
 
     @Before
     public void startServer() throws Exception {
-        try {
-            node = SCANodeFactory.newInstance().createSCANode(null, 
-                new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),
-                new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),
-                new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"));
-            node.start();
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
+        node = SCANodeFactory.newInstance().createSCANode(null, 
+            new SCAContribution("introducing-tours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),
+            new SCAContribution("introducing-trips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),
+            new SCAContribution("introducing-client", "../../contributions/introducing-client-contribution/target/classes"));
+        node.start();
     }
 
     @Test
     public void testClient() throws Exception {
-        Runnable runner = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
-        runner.run();
+        Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+        proxy.run();
     }
 
     @After