TUSCANY-2968 - Moving unit tests to iTest to avoid circular references

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@771207 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 3 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/bean/TestBean.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/Echo.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java
index ba87f22cf6..ba87f22cf6 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
index bf8c7d2c8a..bf8c7d2c8a 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
index 3e7b848221..3e7b848221 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
index 6b59aae03e..6b59aae03e 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
index b652f742b0..b652f742b0 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
index b9608115be..a982bb7ff6 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
@@ -41,13 +41,13 @@ public class JSONRPCServiceTestCase {
 
     private static final String SERVICE_PATH = "/EchoService";
 
-    private static final String SERVICE_URL = "http://localhost:8085/SCADomain" + SERVICE_PATH;
+    private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH;
 
     private SCADomain domain;
 
     //@Before
     public void setUp() throws Exception {
-        domain = SCADomain.newInstance("JSONRPCBinding.composite");
+        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
     }
 
     //@After
diff --git a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
index ddbd9d1fc3..07eb4907f6 100644
--- a/branches/sca-java-1.x/modules/binding-http-new-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
@@ -25,7 +25,7 @@
 

     <service name="EchoService" promote="EchoComponent">

         <interface.java interface="echo.Echo"/>

-        <tuscany:binding.http uri="http://localhost:8085/SCADomain/EchoService">

+        <tuscany:binding.http uri="http://localhost:8085/EchoService">

            <tuscany:wireFormat.jsonrpc/>

            <tuscany:operationSelector.jsonrpc/>

         </tuscany:binding.http>