tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r804193 - in /tuscany/java/sca/itest/endpoints/src/test/java/test: EndpointsTestCase.java NestedEndpointsTestCase.java Utils.java
Date Fri, 14 Aug 2009 12:30:19 GMT
Author: antelder
Date: Fri Aug 14 12:30:19 2009
New Revision: 804193

URL: http://svn.apache.org/viewvc?rev=804193&view=rev
Log:
Add WS endpoints to nested endpoints tests, correct localhost instead of machine name, refactor
common code to utility class

Added:
    tuscany/java/sca/itest/endpoints/src/test/java/test/Utils.java
Modified:
    tuscany/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java
    tuscany/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java

Modified: tuscany/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java?rev=804193&r1=804192&r2=804193&view=diff
==============================================================================
--- tuscany/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java (original)
+++ tuscany/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java Fri Aug 14
12:30:19 2009
@@ -18,21 +18,8 @@
  */
 package test;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import junit.framework.Assert;
 
 import org.apache.tuscany.sca.http.jetty.JettyServer;
 import org.apache.tuscany.sca.node.Node;
@@ -48,95 +35,65 @@
     @Test
     public void testJSONP1() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp />
-        invokeJSONPEndpoint("http://localhost:8085/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP2() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp2"/>
-        invokeJSONPEndpoint("http://localhost:8085/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP3() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp uri="jsonp3"/>
-        invokeJSONPEndpoint("http://localhost:8085/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP4() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp uri="/jsonp4"/>
-        invokeJSONPEndpoint("http://localhost:8085/jsonp4/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp4/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP5() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp5a" uri="/jsonp5b"/>
-        invokeJSONPEndpoint("http://localhost:8085/jsonp5b/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp5b/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP6() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp6a" uri="jsonp6b"/>
-        invokeJSONPEndpoint("http://localhost:8085/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
     }
 
     @Test
     public void testWS1() throws MalformedURLException, Exception {
         // <tuscany:binding.WS />
-        invokeWSEndpoint("http://localhost:8085/WSComponent1/HelloWorldService");
+        Utils.invokeWSEndpoint("http://localhost:8085/WSComponent1/HelloWorldService");
     }
     @Test
     public void testWS2() throws MalformedURLException, Exception {
         // <tuscany:binding.WS name="WS2"/>
-        invokeWSEndpoint("http://localhost:8085/WSComponent2/HelloWorldService/ws2");
+        Utils.invokeWSEndpoint("http://localhost:8085/WSComponent2/HelloWorldService/ws2");
     }
     @Test
     public void testWS3() throws MalformedURLException, Exception {
         // <tuscany:binding.WS uri="WS3"/>
-        invokeWSEndpoint("http://localhost:8085/WSComponent3/HelloWorldService/ws3");
+        Utils.invokeWSEndpoint("http://localhost:8085/WSComponent3/HelloWorldService/ws3");
     }
     @Test
     public void testWS4() throws MalformedURLException, Exception {
         // <tuscany:binding.WS uri="/WS4"/>
-        invokeWSEndpoint("http://localhost:8085/ws4");
+        Utils.invokeWSEndpoint("http://localhost:8085/ws4");
     }
     @Test
     public void testWS5() throws MalformedURLException, Exception {
         // <tuscany:binding.WS name="WS5a" uri="/WS5b"/>
-        invokeWSEndpoint("http://localhost:8085/ws5b");
+        Utils.invokeWSEndpoint("http://localhost:8085/ws5b");
     }
     @Test
     public void testWS6() throws Exception {
         // <tuscany:binding.ws name="ws6a" uri="ws6b"/>
-        invokeWSEndpoint("http://localhost:8085/WSComponent6/HelloWorldService/ws6a/ws6b");
-    }
-
-    private void invokeJSONPEndpoint(String s) throws MalformedURLException, IOException
{
-        URL url = new URL(s);
-        BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-        String response = br.readLine();
-        Assert.assertEquals("foo(\"Hello petra\");", response);
+        Utils.invokeWSEndpoint("http://localhost:8085/WSComponent6/HelloWorldService/ws6a/ws6b");
     }
 
-    public void invokeWSEndpoint(String endpoint) throws Exception {
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL(endpoint + "?wsdl");
-        Assert.assertNotNull(definition);
-        Service service = (Service)definition.getServices().values().iterator().next();
-        Port port = (Port)service.getPorts().values().iterator().next();
-
-        Assert.assertEquals(new URL(endpoint).getPath(), new URL(getEndpoint(port)).getPath());
-    }
-    
-    protected String getEndpoint(Port port) {
-        List<?> wsdlPortExtensions = port.getExtensibilityElements();
-        for (final Object extension : wsdlPortExtensions) {
-            if (extension instanceof SOAPAddress) {
-                return ((SOAPAddress) extension).getLocationURI();
-            }
-        }
-        throw new RuntimeException("no SOAPAddress");
-    }
-    
     @BeforeClass
     public static void init() throws Exception {
         JettyServer.portDefault = 8085;

Modified: tuscany/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java?rev=804193&r1=804192&r2=804193&view=diff
==============================================================================
--- tuscany/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java (original)
+++ tuscany/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java Fri Aug
14 12:30:19 2009
@@ -18,13 +18,8 @@
  */
 package test;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
-import java.net.URL;
-
-import junit.framework.Assert;
 
 import org.apache.tuscany.sca.http.jetty.JettyServer;
 import org.apache.tuscany.sca.node.Node;
@@ -40,39 +35,63 @@
     @Test
     public void testJSONP1() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp />
-        invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP2() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp2"/>
-        invokeJSONPEndpoint("http://IBM-B4ADCA311EA:8085/NestedComponent1/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP3() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp uri="jsonp3"/>
-        invokeJSONPEndpoint("http://IBM-B4ADCA311EA:8085/NestedComponent1/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP4() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp uri="/jsonp4"/>
-        invokeJSONPEndpoint("http://IBM-B4ADCA311EA:8085/jsonp4/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp4/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP5() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp5a" uri="/jsonp5b"/>
-        invokeJSONPEndpoint("http://IBM-B4ADCA311EA:8085/jsonp5b/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp5b/sayHello?name=petra&callback=foo");
     }
     @Test
     public void testJSONP6() throws MalformedURLException, IOException {
         // <tuscany:binding.jsonp name="jsonp6a" uri="jsonp6b"/>
-        invokeJSONPEndpoint("http://IBM-B4ADCA311EA:8085/NestedComponent1/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
+        Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
     }
 
-    private void invokeJSONPEndpoint(String s) throws MalformedURLException, IOException
{
-        URL url = new URL(s);
-        BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-        String response = br.readLine();
-        Assert.assertEquals("foo(\"Hello petra\");", response);
+    @Test
+    public void testWS1() throws MalformedURLException, Exception {
+        // <tuscany:binding.WS />
+        Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent1/HelloWorldService");
+    }
+    @Test
+    public void testWS2() throws MalformedURLException, Exception {
+        // <tuscany:binding.WS name="WS2"/>
+        Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent2/HelloWorldService/ws2");
+    }
+    @Test
+    public void testWS3() throws MalformedURLException, Exception {
+        // <tuscany:binding.WS uri="WS3"/>
+        Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent3/HelloWorldService/ws3");
+    }
+    @Test
+    public void testWS4() throws MalformedURLException, Exception {
+        // <tuscany:binding.WS uri="/WS4"/>
+        Utils.invokeWSEndpoint("http://localhost:8085/ws4");
+    }
+    @Test
+    public void testWS5() throws MalformedURLException, Exception {
+        // <tuscany:binding.WS name="WS5a" uri="/WS5b"/>
+        Utils.invokeWSEndpoint("http://localhost:8085/ws5b");
+    }
+    @Test
+    public void testWS6() throws Exception {
+        // <tuscany:binding.ws name="ws6a" uri="ws6b"/>
+        Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent6/HelloWorldService/ws6a/ws6b");
     }
 
     @BeforeClass

Added: tuscany/java/sca/itest/endpoints/src/test/java/test/Utils.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/endpoints/src/test/java/test/Utils.java?rev=804193&view=auto
==============================================================================
--- tuscany/java/sca/itest/endpoints/src/test/java/test/Utils.java (added)
+++ tuscany/java/sca/itest/endpoints/src/test/java/test/Utils.java Fri Aug 14 12:30:19 2009
@@ -0,0 +1,70 @@
+/*
+ * 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 test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+
+import junit.framework.Assert;
+
+public class Utils {
+
+    public static void invokeJSONPEndpoint(String s) throws MalformedURLException, IOException
{
+        URL url = new URL(s);
+        BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+        String response = br.readLine();
+        Assert.assertEquals("foo(\"Hello petra\");", response);
+    }
+
+    public static void invokeWSEndpoint(String endpoint) throws Exception {
+        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+        wsdlReader.setFeature("javax.wsdl.verbose",false);
+        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
+
+        Definition definition = wsdlReader.readWSDL(endpoint + "?wsdl");
+        Assert.assertNotNull(definition);
+        Service service = (Service)definition.getServices().values().iterator().next();
+        Port port = (Port)service.getPorts().values().iterator().next();
+
+        Assert.assertEquals(new URL(endpoint).getPath(), new URL(getEndpoint(port)).getPath());
+    }
+    
+    private static String getEndpoint(Port port) {
+        List<?> wsdlPortExtensions = port.getExtensibilityElements();
+        for (final Object extension : wsdlPortExtensions) {
+            if (extension instanceof SOAPAddress) {
+                return ((SOAPAddress) extension).getLocationURI();
+            }
+        }
+        throw new RuntimeException("no SOAPAddress");
+    }
+    
+}



Mime
View raw message