svn commit: r1741976 - in /axis/axis2/java/core/trunk/modules: adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ testutils/src/main/java/org/apache/axis2/testutils/

[veithen]

Author: veithen
Date: Mon May  2 12:39:17 2016
New Revision: 1741976

URL: http://svn.apache.org/viewvc?rev=1741976&view=rev
Log:
Improve test infrastructure.

Modified:
    
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
    
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
    
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java

Modified: 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java?rev=1741976&r1=1741975&r2=1741976&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
 Mon May  2 12:39:17 2016
@@ -37,7 +37,7 @@ public class ServiceTest {
         FiverxLinkService client = new 
FiverxLinkService_Service().getFiverxLinkServicePort();
         ((BindingProvider)client).getRequestContext().put(
                 BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-                "http://localhost:"; + server.getPort() + 
"/axis2/services/FiverxLinkService");
+                server.getEndpoint("FiverxLinkService"));
         assertThat(client.ladeRzVersion("test")).isEqualTo("test result");
     }
 }

Modified: 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java?rev=1741976&r1=1741975&r2=1741976&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
 Mon May  2 12:39:17 2016
@@ -38,7 +38,7 @@ public class ServiceTest {
         ColorService client = new ColorService_Service().getColorServiceSOAP();
         ((BindingProvider)client).getRequestContext().put(
                 BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-                "http://localhost:"; + server.getPort() + 
"/axis2/services/ColorService");
+                server.getEndpoint("ColorService"));
         Color color = new Color();
         color.setIn("RED");
         assertThat(client.test(color).getOut()).isEqualTo("Red is good!");

Modified: 
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java?rev=1741976&r1=1741975&r2=1741976&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
 Mon May  2 12:39:17 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.axis2.testutils;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
@@ -26,6 +27,7 @@ import org.junit.rules.ExternalResource;
 public class Axis2Server extends ExternalResource {
     private final String repositoryPath;
     private int port = -1;
+    private ConfigurationContext configurationContext;
     private SimpleHTTPServer server;
 
     public Axis2Server(String repositoryPath) {
@@ -39,10 +41,17 @@ public class Axis2Server extends Externa
         return port;
     }
 
+    public String getEndpoint(String serviceName) throws AxisFault {
+        if (configurationContext == null) {
+            throw new IllegalStateException();
+        }
+        return 
configurationContext.getAxisConfiguration().getService(serviceName).getEPRs()[0];
+    }
+
     @Override
     protected void before() throws Throwable {
         port = PortAllocator.allocatePort();
-        ConfigurationContext configurationContext =
+        configurationContext =
                 
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
         server = new SimpleHTTPServer(configurationContext, port);
         server.start();
@@ -51,6 +60,8 @@ public class Axis2Server extends Externa
     @Override
     protected void after() {
         port = -1;
+        configurationContext = null;
         server.stop();
+        server = null;
     }
 }