Author: lresende
Date: Tue May 5 07:29:08 2009
New Revision: 771606
URL: http://svn.apache.org/viewvc?rev=771606&view=rev
Log:
TUSCANY-2968 - Enabling more tests that are currently passing
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java?rev=771606&r1=771605&r2=771606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
Tue May 5 07:29:08 2009
@@ -24,8 +24,8 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -40,21 +40,22 @@
public class JSONRPCDataTypeTestCase {
private static final String SERVICE_PATH = "/EchoService";
- private static final String SERVICE_URL =
"http://localhost:8085/SCADomain"; + SERVICE_PATH;
- private SCADomain domain;
+ private static final String SERVICE_URL = "http://localhost:8085/"; +
SERVICE_PATH;
+
+ private static SCADomain domain;
- //@Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("JSONRPCBinding.composite");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ domain =
SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
}
- //@After
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void tearDown() throws Exception {
domain.close();
}
- //@Test
- @Ignore("Work in progress")
+ @Test
+ //@Ignore("Work in progress")
public void testInt() throws Exception {
JSONObject jsonRequest = new JSONObject(
"{ \"method\": \"echoInt\", \"params\":
[12345], \"id\": 4}");
@@ -71,8 +72,8 @@
Assert.assertEquals(12345, jsonResp.getInt("result"));
}
- //@Test
- @Ignore("Work in progress")
+ @Test
+ //@Ignore("Work in progress")
public void testBoolean() throws Exception {
JSONObject jsonRequest = new JSONObject(
"{ \"method\": \"echoBoolean\", \"params\":
[true], \"id\": 5}");
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java?rev=771606&r1=771605&r2=771606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
Tue May 5 07:29:08 2009
@@ -24,8 +24,8 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -41,17 +41,17 @@
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;
+ private static SCADomain domain;
- //@Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("JSONRPCBinding.composite");
+ //@BeforeClass
+ public static void setUp() throws Exception {
+ domain =
SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite");
}
- //@After
- public void tearDown() throws Exception {
+ //@AfterClass
+ public static void tearDown() throws Exception {
domain.close();
}
Modified:
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java?rev=771606&r1=771605&r2=771606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
Tue May 5 07:29:08 2009
@@ -52,7 +52,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.close();
}
@Test
@@ -65,13 +65,13 @@
WebResponse response = wc.getResource(request);
Assert.assertEquals(200, response.getResponseCode());
-
+
JSONObject jsonResp = new JSONObject(response.getText());
Assert.assertEquals("echo: Hello JSON-RPC",
jsonResp.getString("result"));
}
-
+
@Test
public void testDummy() throws Exception {
-
+
}
}
\ No newline at end of file
