From 539451c7e13d98504e6f3368d892406494ca711d Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 13 Nov 2009 01:23:07 +0000 Subject: Removing obsolete release candidate tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835693 13f79535-47bb-0310-9956-ffa450edef68 --- .../http-jsonrpc/src/test/java/bean/TestBean.java | 50 ------ .../http-jsonrpc/src/test/java/echo/Echo.java | 65 ------- .../src/test/java/echo/EchoBusinessException.java | 29 ---- .../src/test/java/echo/EchoComponentImpl.java | 103 ----------- .../jsonrpc/JSONRPCDataTypeTestCase.java | 193 --------------------- .../jsonrpc/JSONRPCExceptionTestCase.java | 86 --------- .../wireformat/jsonrpc/JSONRPCServiceTestCase.java | 70 -------- .../wireformat/jsonrpc/JSONRPCSmdTestCase.java | 71 -------- .../wireformat/jsonrpc/JSONRPCBinding.composite | 38 ---- 9 files changed, 705 deletions(-) delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/bean/TestBean.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/Echo.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite (limited to 'sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src') diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/bean/TestBean.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/bean/TestBean.java deleted file mode 100644 index 5117bcf7c9..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/bean/TestBean.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package bean; - -public class TestBean { - private String testString; - private String[] testStringArray; - private int testInt; - - - public String getTestString() { - return testString; - } - - public void setTestString(String testString) { - this.testString = testString; - } - - public String[] getTestStringArray() { - return testStringArray; - } - - public void setStringArray(String[] stringArray) { - this.testStringArray = stringArray; - } - - public int getTestInt() { - return testInt; - } - - public void setTestInt(int testInt) { - this.testInt = testInt; - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/Echo.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/Echo.java deleted file mode 100644 index 0775a59135..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/Echo.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package echo; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.osoa.sca.annotations.Remotable; - -import bean.TestBean; - -/** - * Interface of our sample JSONRPC service. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Echo { - - String echo(String msg); - - void echoRuntimeException() throws RuntimeException; - - void echoBusinessException() throws EchoBusinessException; - - int echoInt(int param); - - boolean echoBoolean(boolean param); - - Map echoMap(HashMap map); - - TestBean echoBean(TestBean testBean); - - List echoList(ArrayList list); - - String [] echoArrayString(String[] stringArray); - - int [] echoArrayInt(int[] intArray); - - Set echoSet(HashSet set); - - - void get\u03a9\u03bb\u03c0(); - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java deleted file mode 100644 index bf8c7d2c8a..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package echo; - -public class EchoBusinessException extends Exception { - private static final long serialVersionUID = 7234119326657905710L; - - public EchoBusinessException(String message) - { - super(message); - } - -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java deleted file mode 100644 index 87ab8b4b48..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package echo; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import bean.TestBean; - -/** - * A simple client component that uses a reference with an JSONRPC binding. - * - * @version $Rev$ $Date$ - */ -public class EchoComponentImpl implements Echo { - - public String echo(String msg) { - System.out.println("Echo: "+ msg); - return "echo: " + msg; - } - - public void echoBusinessException() throws EchoBusinessException { - throw new EchoBusinessException("Business Exception"); - - } - - public void echoRuntimeException() throws RuntimeException { - throw new RuntimeException("Runtime Exception"); - } - - public int echoInt(int param) { - int value = param; - return value; - } - - public boolean echoBoolean(boolean param) { - boolean value = param; - return value; - } - - public Map echoMap(HashMap param) { - Map map = new HashMap(); - map = param; - return map; - } - - public TestBean echoBean(TestBean testBean1) { - TestBean testBean = new TestBean(); - testBean.setTestString(testBean1.getTestString()); - testBean.setTestInt(testBean1.getTestInt()); - return testBean; - } - - public List echoList(ArrayList param){ - List list = new ArrayList(); - for(Iterator itr = param.iterator();itr.hasNext();) - { - list.add(itr.next()); - } - return list; - } - - public String[] echoArrayString(String[] stringArray) { - return stringArray; - } - - public int[] echoArrayInt(int[] intArray) { - return intArray; - } - - public Set echoSet(HashSet param){ - Set set = new HashSet(); - set = param; - return set; - - } - - - public void get\u03a9\u03bb\u03c0() { - - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java deleted file mode 100644 index b842f9b1e5..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc; - -import java.io.ByteArrayInputStream; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.json.JSONObject; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.meterware.httpunit.PostMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -/** - * @version $Rev$ $Date$ - */ -public class JSONRPCDataTypeTestCase { - - private static final String SERVICE_PATH = "/EchoService"; - private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH; - - private static SCADomain domain; - - @BeforeClass - public static void setUp() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite"); - } - - @AfterClass - public static void tearDown() throws Exception { - domain.close(); - } - - @Test - public void testInt() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoInt\", \"params\": [12345], \"id\": 4}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals(12345, jsonResp.getInt("result")); - } - - @Test - public void testBoolean() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoBoolean\", \"params\": [true], \"id\": 5}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals(true, jsonResp.getBoolean("result")); - } - - @Test - public void testMap() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoMap\", \"params\": [ {\"javaClass\": \"java.util.HashMap\", \"map\": { \"Binding\": \"JSON-RPC\"}}], \"id\": 6}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getJSONObject("map").getString("Binding")); - } - - @Test - public void testBean() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoBean\", \"params\": [ {\"javaClass\": \"bean.TestBean\", \"testString\": \"JSON-RPC\", \"testInt\":1234}], \"id\": 7}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals("JSON-RPC", jsonResp.getJSONObject("result").getString("testString")); - } - - @Test - public void testList() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoList\", \"params\": [ {\"javaClass\": \"java.util.ArrayList\", \"list\": [0,1,2,3,4]}], \"id\": 8}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals(0, jsonResp.getJSONObject("result").getJSONArray("list").get(0)); - } - - @Test - public void testArrayString() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{\"params\":[[\"1\",\"2\"]],\"method\":\"echoArrayString\",\"id\":9}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0)); - } - - - @Test - public void testArrayInt() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{\"params\":[[1,2]],\"method\":\"echoArrayInt\",\"id\":10}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals(1, jsonResp.getJSONArray("result").getInt(0)); - } - - - @Test - public void testSet() throws Exception { - JSONObject jsonRequest = new JSONObject( - "{ \"method\": \"echoSet\", \"params\": [ {\"javaClass\": \"java.util.HashSet\", \"set\": {\"1\": \"red\", \"2\": \"blue\"}}],\"id\": 11}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest(SERVICE_URL, - new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - - Assert.assertEquals("red", jsonResp.getJSONObject("result").getJSONObject("set").getString("red")); - } -} \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java deleted file mode 100644 index 159ae0e65e..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc; - -import java.io.ByteArrayInputStream; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.json.JSONObject; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.meterware.httpunit.PostMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -/** - * @version $Rev$ $Date$ - */ -public class JSONRPCExceptionTestCase{ - - private static final String SERVICE_PATH = "/EchoService"; - - private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH; - - private static SCADomain domain; - - @BeforeClass - public static void setUp() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite"); - } - - @AfterClass - public static void tearDown() throws Exception { - domain.close(); - } - - @Test - public void testRuntimeException() throws Exception{ - JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoRuntimeException\", \"params\": [], \"id\": 2}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error"); - - Assert.assertEquals("Runtime Exception", jsonErr.getString("msg")); - } - - @Test - public void testBusinessException() throws Exception{ - JSONObject jsonRequest = new JSONObject("{ \"method\": \"echoBusinessException\", \"params\": [], \"id\": 3}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonErr = new JSONObject(response.getText()).getJSONObject("error"); - - Assert.assertEquals("Business Exception", jsonErr.getString("msg")); - } -} \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java deleted file mode 100644 index e04e210596..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc; - -import java.io.ByteArrayInputStream; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.json.JSONObject; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.meterware.httpunit.PostMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -/** - * @version $Rev$ $Date$ - */ -public class JSONRPCServiceTestCase { - - private static final String SERVICE_PATH = "/EchoService"; - - private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH; - - private static SCADomain domain; - - @BeforeClass - public static void setUp() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite"); - } - - @AfterClass - public static void tearDown() throws Exception { - domain.close(); - } - - @Test - public void testJSONRPCBinding() throws Exception { - JSONObject jsonRequest = new JSONObject("{ \"method\": \"echo\", \"params\": [\"Hello JSON-RPC\"], \"id\": 1}"); - - WebConversation wc = new WebConversation(); - WebRequest request = new PostMethodWebRequest( SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json"); - 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")); - } -} \ No newline at end of file diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java deleted file mode 100644 index f142f53223..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ - -package org.apache.tuscany.sca.binding.http.wireformat.jsonrpc; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.meterware.httpunit.GetMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -/** - * @version $Rev$ $Date$ - */ -public class JSONRPCSmdTestCase { - - private static final String SERVICE_PATH = "/EchoService"; - - private static final String SERVICE_URL = "http://localhost:8085/" + SERVICE_PATH; - - private static final String SMD_URL = SERVICE_URL + "?smd"; - - private static SCADomain domain; - - @BeforeClass - public static void setUp() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite"); - } - - @AfterClass - public static void tearDown() throws Exception { - domain.close(); - } - - @Test - /** - * This test make sure the JSON-RPC Binding can handle special characters when generating SMD - */ - public void testJSONRPCSmdSpecialCharacters() throws Exception { - WebConversation wc = new WebConversation(); - WebRequest request = new GetMethodWebRequest(SMD_URL); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - Assert.assertNotNull(response.getText()); - - //System.out.println(">>>SMD:" + response.getText()); - } -} diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite deleted file mode 100644 index 07eb4907f6..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - -- cgit v1.2.3