From ddce09144c53a0edd85f5929605cd3d3191d4ea4 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 10 Feb 2011 08:36:51 +0000 Subject: Copy trunk to beta2 release branch. (I've not yet changed the version so that would need to be done first before the branch is used) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069272 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/binding/http/BeanA.java | 60 ++++++++++ .../tuscany/sca/binding/http/ComplexStuff.java | 32 +++++ .../tuscany/sca/binding/http/ComplexStuffImpl.java | 53 +++++++++ .../sca/binding/http/ComplexStuffTestCase.java | 129 +++++++++++++++++++++ .../tuscany/sca/binding/http/Helloworld.java | 26 +++++ .../tuscany/sca/binding/http/HelloworldImpl.java | 28 +++++ .../sca/binding/http/HelloworldTestCase.java | 93 +++++++++++++++ .../tuscany/sca/binding/http/SomeException.java | 29 +++++ 8 files changed, 450 insertions(+) create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/BeanA.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuff.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffImpl.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffTestCase.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/Helloworld.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldImpl.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldTestCase.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/SomeException.java (limited to 'sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org') diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/BeanA.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/BeanA.java new file mode 100644 index 0000000000..2c33895f67 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/BeanA.java @@ -0,0 +1,60 @@ +/* + * 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; + +public class BeanA { + + protected Boolean b; + protected String s; + protected int x; + protected Integer y; + + public Boolean getB() { + return b; + } + + public void setB(Boolean b) { + this.b = b; + } + + public String getS() { + return s; + } + + public void setS(String s) { + this.s = s; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public Integer getY() { + return y; + } + + public void setY(Integer y) { + this.y = y; + } +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuff.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuff.java new file mode 100644 index 0000000000..cf0d457317 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuff.java @@ -0,0 +1,32 @@ +/* + * 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; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface ComplexStuff { + BeanA echoBeanA(BeanA bean); + String multiParams(int x, String s, Boolean b); + String noArgs(); + void voidReturn(); + String checkedException() throws SomeException; + String runtimeException(); +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffImpl.java new file mode 100644 index 0000000000..9395024e5b --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffImpl.java @@ -0,0 +1,53 @@ +/* + * 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; + +public class ComplexStuffImpl implements ComplexStuff { + + @Override + public BeanA echoBeanA(BeanA bean) { + return bean; + } + + @Override + public String multiParams(int x, String s, Boolean b) { + return x + s + b; + } + + @Override + public String noArgs() { + return "noArgs"; + } + + @Override + public void voidReturn() { + } + + @Override + public String checkedException() throws SomeException { + throw new SomeException("some msg"); + } + + @Override + public String runtimeException() { + throw new RuntimeException("bang"); + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffTestCase.java new file mode 100644 index 0000000000..704a24554b --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/ComplexStuffTestCase.java @@ -0,0 +1,129 @@ +/* + * 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; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * HTTP binding unit tests for Helloworld service. + */ +public class ComplexStuffTestCase { + + private static Node node; + + @BeforeClass + public static void setUp() throws Exception { + node = NodeFactory.newInstance().createNode("complex.composite", new String[] {"target/test-classes"}); + node.start(); + } + + @AfterClass + public static void tearDown() throws Exception { + if (node != null) { + node.stop(); + } + } + + @Test + public void testGet() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/multiParams?x=1&s=petra&b=true"); + InputStream is = url.openStream(); + Assert.assertEquals("\"1petratrue\"", read(is)); + } + + @Test + public void testNoArgs() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/noArgs"); + InputStream is = url.openStream(); + Assert.assertEquals("\"noArgs\"", read(is)); + } + + @Test + public void testEchoBean() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/echoBeanA?x={\"s\":\"petra\",\"b\":true,\"y\":42,\"x\":1}"); + InputStream is = url.openStream(); + String result = read(is); + Assert.assertTrue(result.startsWith("{")); + Assert.assertTrue(result.contains("\"s\":\"petra\"")); + Assert.assertTrue(result.contains("\"b\":true")); + Assert.assertTrue(result.contains("\"y\":42")); + Assert.assertTrue(result.contains("\"x\":1")); + // Assert.assertEquals("{\"s\":\"petra\",\"b\":true,\"y\":42,\"x\":1}", read(is)); + } + + @Test + public void testVoidReturn() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/voidReturn"); + InputStream is = url.openStream(); + Assert.assertEquals("", read(is)); + } + + @Test + public void testCheckedException() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/checkedException"); + try { + InputStream is = url.openStream(); + Assert.fail(); + } catch (IOException e) { + // expected + // TODO: what should happen with checked exceptions? + } + } + + @Test + public void testRuntimeException() throws Exception { + URL url = new URL("http://localhost:8080/ComplexComponent/ComplexStuff/runtimeException"); + try { + InputStream is = url.openStream(); + Assert.fail(); + } catch (IOException e) { + Assert.assertTrue(e.getMessage().contains("HTTP response code: 500")); + } + } + + private static String read(InputStream is) throws IOException { + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(is)); + StringBuffer sb = new StringBuffer(); + String str; + while ((str = reader.readLine()) != null) { + sb.append(str); + } + return sb.toString(); + } finally { + if (reader != null) { + reader.close(); + } + } + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/Helloworld.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/Helloworld.java new file mode 100644 index 0000000000..17a0b28fdb --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/Helloworld.java @@ -0,0 +1,26 @@ +/* + * 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; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Helloworld { + String sayHello(String name); +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldImpl.java new file mode 100644 index 0000000000..e245f607f1 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldImpl.java @@ -0,0 +1,28 @@ +/* + * 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; + +public class HelloworldImpl implements Helloworld { + + @Override + public String sayHello(String name) { + return "Hello " + name; + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldTestCase.java new file mode 100644 index 0000000000..89598b91c7 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HelloworldTestCase.java @@ -0,0 +1,93 @@ +/* + * 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; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * HTTP binding unit tests for Helloworld service. + */ +public class HelloworldTestCase { + + private static Node node; + + @BeforeClass + public static void setUp() throws Exception { + node = NodeFactory.newInstance().createNode("helloworld.composite", new String[] {"target/test-classes"}); + node.start(); + } + + @AfterClass + public static void tearDown() throws Exception { + if (node != null) { + node.stop(); + } + } + + @Test + public void testGet() throws Exception { + URL url = new URL("http://localhost:8080/HelloworldComponent/Helloworld/sayHello?name=Petra"); + InputStream is = url.openStream(); + Assert.assertEquals("\"Hello Petra\"", read(is)); + } + + @Test + public void testGetArg0() throws Exception { + URL url = new URL("http://localhost:8080/HelloworldComponent/Helloworld/sayHello?arg0=Petra"); + InputStream is = url.openStream(); + Assert.assertEquals("\"Hello Petra\"", read(is)); + } + + @Test + public void testXml() throws Exception { + URL url = new URL("http://localhost:8080/HelloworldXmlComponent/Helloworld/sayHello?arg0=Petra"); + InputStream is = url.openStream(); + Assert.assertTrue(read(is).endsWith(">Hello Petra")); + } + + private static String read(InputStream is) throws IOException { + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(is)); + StringBuffer sb = new StringBuffer(); + String str; + while ((str = reader.readLine()) != null) { + sb.append(str); + } + return sb.toString(); + } finally { + if (reader != null) { + reader.close(); + } + } + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/SomeException.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/SomeException.java new file mode 100644 index 0000000000..f4ffd19c9c --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/SomeException.java @@ -0,0 +1,29 @@ +/* + * 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; + +public class SomeException extends Exception { + private static final long serialVersionUID = 1L; + + public SomeException(String msg) { + super(msg); + } + +} -- cgit v1.2.3