You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/03/09 23:25:01 UTC

svn commit: r1299078 [4/4] - in /axis/axis1/java/trunk/integration: ./ src/test/java/test/ src/test/java/test/functional/ src/test/java/test/import2/ src/test/java/test/wsdl/_import/ src/test/java/test/wsdl/any/ src/test/java/test/wsdl/anytype/ src/tes...

Propchange: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_choice/ReportingServiceTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_holders/Wrapped_HoldersTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_holders/Wrapped_HoldersTestCase.java?rev=1299078&r1=1299077&r2=1299078&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_holders/Wrapped_HoldersTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_holders/Wrapped_HoldersTestCase.java Fri Mar  9 22:24:59 2012
@@ -7,6 +7,8 @@
 
 package test.wsdl.wrapped_holders;
 
+import test.HttpTestUtil;
+
 /**
  * This test verify's that arrays in a wrapped doc/lit service get holders
  * generated for them, and that they work.
@@ -20,7 +22,8 @@ public class Wrapped_HoldersTestCase ext
     public void test1ThingFind_aThing() throws Exception {
         test.wsdl.wrapped_holders.Thing binding;
         try {
-            binding = new test.wsdl.wrapped_holders.Wrapped_holdersLocator().getThing();
+            Wrapped_holdersLocator loc = new Wrapped_holdersLocator();
+            binding = loc.getThing(HttpTestUtil.getTestEndpoint(loc.getThingAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_inout/WrappedInOutTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_inout/WrappedInOutTestCase.java?rev=1299078&r1=1299077&r2=1299078&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_inout/WrappedInOutTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapped_inout/WrappedInOutTestCase.java Fri Mar  9 22:24:59 2012
@@ -7,6 +7,8 @@
 
 package test.wsdl.wrapped_inout;
 
+import test.HttpTestUtil;
+
 public class WrappedInOutTestCase extends junit.framework.TestCase {
     public WrappedInOutTestCase(java.lang.String name) {
         super(name);
@@ -14,7 +16,8 @@ public class WrappedInOutTestCase extend
     public void test1WrappedInOutEchoString() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -32,7 +35,8 @@ public class WrappedInOutTestCase extend
     public void test1WrappedInOutEchoEmptyString() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -50,7 +54,8 @@ public class WrappedInOutTestCase extend
     public void test2WrappedInOutEchoStringIO() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -68,7 +73,8 @@ public class WrappedInOutTestCase extend
     public void test3WrappedInOutEchoStringIOret() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -88,7 +94,8 @@ public class WrappedInOutTestCase extend
     public void test4WrappedInOutEchoStringInIO() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -106,7 +113,8 @@ public class WrappedInOutTestCase extend
     public void test5WrappedInOutEchoStringBig() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -128,7 +136,8 @@ public class WrappedInOutTestCase extend
     public void test6WrappedInOutHelloInOut() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)
@@ -151,7 +160,8 @@ public class WrappedInOutTestCase extend
     public void test7WrappedInOutEchoPhone() throws Exception {
         test.wsdl.wrapped_inout.WrappedInOutInterface binding;
         try {
-            binding = new test.wsdl.wrapped_inout.WrappedInOutLocator().getWrappedInOut();
+            WrappedInOutLocator loc = new WrappedInOutLocator();
+            binding = loc.getWrappedInOut(HttpTestUtil.getTestEndpoint(loc.getWrappedInOutAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java?rev=1299078&r1=1299077&r2=1299078&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java Fri Mar  9 22:24:59 2012
@@ -10,6 +10,8 @@ package test.wsdl.wrapperHolder;
 import javax.xml.rpc.holders.ByteArrayHolder;
 import javax.xml.rpc.holders.LongWrapperHolder;
 
+import test.HttpTestUtil;
+
 public class ExampleSoapTestCase extends junit.framework.TestCase {
     public ExampleSoapTestCase(java.lang.String name) {
         super(name);
@@ -17,7 +19,7 @@ public class ExampleSoapTestCase extends
 
     public void testWrapperHolderWSDL() throws Exception {
         javax.xml.rpc.ServiceFactory serviceFactory = javax.xml.rpc.ServiceFactory.newInstance();
-        java.net.URL url = new java.net.URL(new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getWrapperHolderAddress() + "?WSDL");
+        java.net.URL url = HttpTestUtil.getTestEndpoint(new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getWrapperHolderAddress() + "?WSDL");
         javax.xml.rpc.Service service = serviceFactory.createService(url, new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getServiceName());
         assertTrue(service != null);
     }
@@ -25,8 +27,8 @@ public class ExampleSoapTestCase extends
     public void test1WrapperHolderDoExample() throws Exception {
         test.wsdl.wrapperHolder.ExampleSoapStub binding;
         try {
-            binding = (test.wsdl.wrapperHolder.ExampleSoapStub)
-                          new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getWrapperHolder();
+            DoExample_ServiceLocator loc = new DoExample_ServiceLocator();
+            binding = (ExampleSoapStub)loc.getWrapperHolder(HttpTestUtil.getTestEndpoint(loc.getWrapperHolderAddress()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder2/ExampleSoapTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder2/ExampleSoapTestCase.java?rev=1299078&r1=1299077&r2=1299078&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder2/ExampleSoapTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/wrapperHolder2/ExampleSoapTestCase.java Fri Mar  9 22:24:59 2012
@@ -3,6 +3,8 @@ package test.wsdl.wrapperHolder2;
 import javax.xml.rpc.holders.ByteArrayHolder;
 import javax.xml.rpc.holders.LongWrapperHolder;
 
+import test.HttpTestUtil;
+
 public class ExampleSoapTestCase extends junit.framework.TestCase {
     public ExampleSoapTestCase(java.lang.String name) {
         super(name);
@@ -10,7 +12,7 @@ public class ExampleSoapTestCase extends
 
     public void testWrapperHolder2WSDL() throws Exception {
         javax.xml.rpc.ServiceFactory serviceFactory = javax.xml.rpc.ServiceFactory.newInstance();
-        java.net.URL url = new java.net.URL(new test.wsdl.wrapperHolder2.DoExample_ServiceLocator().getWrapperHolder2Address() + "?WSDL");
+        java.net.URL url = HttpTestUtil.getTestEndpoint(new test.wsdl.wrapperHolder2.DoExample_ServiceLocator().getWrapperHolder2Address() + "?WSDL");
         javax.xml.rpc.Service service = serviceFactory.createService(url, new test.wsdl.wrapperHolder2.DoExample_ServiceLocator().getServiceName());
         assertTrue(service != null);
     }
@@ -18,8 +20,8 @@ public class ExampleSoapTestCase extends
     public void test1WrapperHolder2DoExample() throws Exception {
         test.wsdl.wrapperHolder2.ExampleSoapStub binding;
         try {
-            binding = (test.wsdl.wrapperHolder2.ExampleSoapStub)
-                          new test.wsdl.wrapperHolder2.DoExample_ServiceLocator().getWrapperHolder2();
+            DoExample_ServiceLocator loc = new DoExample_ServiceLocator();
+            binding = (ExampleSoapStub)loc.getWrapperHolder2(HttpTestUtil.getTestEndpoint(loc.getWrapperHolder2Address()));
         }
         catch (javax.xml.rpc.ServiceException jre) {
             if(jre.getLinkedCause()!=null)

Modified: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/xsd/CPWSImplServiceTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/xsd/CPWSImplServiceTestCase.java?rev=1299078&r1=1299077&r2=1299078&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/wsdl/xsd/CPWSImplServiceTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/xsd/CPWSImplServiceTestCase.java Fri Mar  9 22:24:59 2012
@@ -15,7 +15,11 @@ import org.apache.axis.wsdl.symbolTable.
 import org.apache.axis.wsdl.symbolTable.SchemaUtils;
 import org.apache.axis.wsdl.symbolTable.SymbolTable;
 
+import test.HttpTestUtil;
+
 import javax.xml.namespace.QName;
+
+import java.net.URL;
 import java.util.Vector;
 
 public class CPWSImplServiceTestCase extends TestCase {
@@ -26,7 +30,7 @@ public class CPWSImplServiceTestCase ext
     /** Test case for Bug 25161
 	  	Axis 1.2 alpha WSDL xsd types problem prevent .Net integration */
     public void testCPWebServicesWSDL() throws Exception {
-        String url = new test.wsdl.xsd.CPWSImplServiceLocator().getCPWebServicesAddress();
+        URL url = HttpTestUtil.getTestEndpoint(new test.wsdl.xsd.CPWSImplServiceLocator().getCPWebServicesAddress());
         Parser wsdlParser = new Parser();
         System.out.println("Reading WSDL document from '" + url + "?WSDL'");
         wsdlParser.run(url + "?WSDL");