From fb3875351584a25ec64ef0d5140e61e26e695ee3 Mon Sep 17 00:00:00 2001 From: lresende Date: Thu, 28 May 2009 16:12:09 +0000 Subject: TUSCANY-3063 - Adding new tests to ensure JSON-RPC binding can handle special characters when generating SMD git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779640 13f79535-47bb-0310-9956-ffa450edef68 --- .../http-jsonrpc/src/test/java/bean/TestBean.java | 1 - .../http-jsonrpc/src/test/java/echo/Echo.java | 3 + .../src/test/java/echo/EchoComponentImpl.java | 5 ++ .../wireformat/jsonrpc/JSONRPCSmdTestCase.java | 71 +++++++++++++++++++++ .../src/test/java/echo/Echo.java | 2 + .../src/test/java/echo/EchoComponentImpl.java | 5 ++ .../sca/binding/jsonrpc/JSONRPCSmdTestCase.java | 73 ++++++++++++++++++++++ 7 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java create mode 100644 branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java (limited to 'branches') diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java index 4b159fb563..5117bcf7c9 100644 --- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java +++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java @@ -47,5 +47,4 @@ public class TestBean { public void setTestInt(int testInt) { this.testInt = testInt; } - } diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java index ba87f22cf6..0775a59135 100644 --- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java +++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java @@ -59,4 +59,7 @@ public interface Echo { Set echoSet(HashSet set); + + void get\u03a9\u03bb\u03c0(); + } diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java index 3e7b848221..87ab8b4b48 100644 --- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java +++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java @@ -95,4 +95,9 @@ public class EchoComponentImpl implements Echo { return set; } + + + public void get\u03a9\u03bb\u03c0() { + + } } diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java new file mode 100644 index 0000000000..f142f53223 --- /dev/null +++ b/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java @@ -0,0 +1,71 @@ +/* + * 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/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java index ba87f22cf6..580af6cf31 100644 --- a/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java +++ b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java @@ -59,4 +59,6 @@ public interface Echo { Set echoSet(HashSet set); + void get\u03a9\u03bb\u03c0(); + } diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java index 3e7b848221..2f4880286f 100644 --- a/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java +++ b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java @@ -95,4 +95,9 @@ public class EchoComponentImpl implements Echo { return set; } + + + public void get\u03a9\u03bb\u03c0() { + + } } diff --git a/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java new file mode 100644 index 0000000000..64c2dd31f2 --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java @@ -0,0 +1,73 @@ +/* + * 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.jsonrpc; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +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/SCADomain" + SERVICE_PATH; + + private static final String SMD_URL = SERVICE_URL + "?smd"; + + private static SCADomain domain; + + @Before + public void setUp() throws Exception { + domain = SCADomain.newInstance("JSONRPCBinding.composite"); + } + + @After + public 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()); + } +} -- cgit v1.2.3