[jbossws-commits] JBossWS SVN: r18974 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: resources/jaxws/clientConfig/META-INF and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: asoldano
Date: 2014-10-03 18:05:25 -0400 (Fri, 03 Oct 2014)
New Revision: 18974

Modified:
   stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
   stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
   stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/jaxws-client-config.xml
Log:
[JBWS-3836] More tests


Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java	2014-10-03 22:04:57 UTC (rev 18973)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java	2014-10-03 22:05:25 UTC (rev 18974)
@@ -48,6 +48,7 @@
       list.add(new JBossWSTestHelper.JarDeployment("jaxws-clientConfig-client.jar") { {
          archive
                .addManifest()
+               .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml")
                .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml");
          }
       });
@@ -60,6 +61,8 @@
                .addClass(org.jboss.test.helper.TestServlet.class)
                .addClass(org.jboss.test.ws.jaxws.clientConfig.CustomHandler.class)
                .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class)
+               .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint2.class)
+               .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml")
                .addClass(org.jboss.test.ws.jaxws.clientConfig.Helper.class)
                .addClass(org.jboss.test.ws.jaxws.clientConfig.LogHandler.class)
                .addClass(org.jboss.test.ws.jaxws.clientConfig.RoutingHandler.class)

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java	2014-10-03 22:04:57 UTC (rev 18973)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java	2014-10-03 22:05:25 UTC (rev 18974)
@@ -117,7 +117,31 @@
       bp.getBinding().setHandlerChain(hc);
 
       String resStr = port.echo("Kermit");
-      return ("Kermit|RoutOut|CustomOut|UserOut|LogOut|endpoint|LogIn|UserIn|CustomIn|RoutIn".equals(resStr));
+      if (!"Kermit|RoutOut|CustomOut|UserOut|LogOut|endpoint|LogIn|UserIn|CustomIn|RoutIn".equals(resStr)) {
+         return false;
+      }
+      
+      Endpoint port3 = (Endpoint)service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", null));
+
+      bp = (BindingProvider)port3;
+      hc = bp.getBinding().getHandlerChain();
+      hc.add(new UserHandler());
+      bp.getBinding().setHandlerChain(hc);
+
+      resStr = port3.echo("Kermit");
+      if (!"Kermit|RoutOut|UserOut|endpoint|UserIn|RoutIn".equals(resStr)) {
+         return false;
+      }
+      
+      Endpoint2 port2 = (Endpoint2)service.getPort(Endpoint2.class, new ClientConfigFeature(null, "My Custom Client Config"));
+
+      bp = (BindingProvider)port2;
+      hc = bp.getBinding().getHandlerChain();
+      hc.add(new UserHandler());
+      bp.getBinding().setHandlerChain(hc);
+
+      resStr = port2.echo("Kermit");
+      return ("Kermit|CustomOut|UserOut|endpoint|UserIn|CustomIn".equals(resStr));
    }
 
    public boolean testCustomClientConfigurationFromFileUsingFeatureOnDispatch() throws Exception

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml	2014-10-03 22:04:57 UTC (rev 18973)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml	2014-10-03 22:05:25 UTC (rev 18974)
@@ -22,5 +22,16 @@
       </javaee:handler-chain>
     </post-handler-chains>
   </client-config>
+  <client-config>
+    <config-name>My Custom Client Config</config-name>
+    <pre-handler-chains>
+      <javaee:handler-chain>
+        <javaee:handler>
+          <javaee:handler-name>Routing Handler</javaee:handler-name>
+          <javaee:handler-class>org.jboss.test.ws.jaxws.clientConfig.CustomHandler</javaee:handler-class>
+        </javaee:handler>
+      </javaee:handler-chain>
+    </pre-handler-chains>
+  </client-config>
   
 </jaxws-config>
\ No newline at end of file

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/jaxws-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/jaxws-client-config.xml	2014-10-03 22:04:57 UTC (rev 18973)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/jaxws-client-config.xml	2014-10-03 22:05:25 UTC (rev 18974)
@@ -27,6 +27,17 @@
     </post-handler-chains>
   </client-config>
   <client-config>
+    <config-name>org.jboss.test.ws.jaxws.clientConfig.Endpoint</config-name>
+    <pre-handler-chains>
+      <javaee:handler-chain>
+        <javaee:handler>
+          <javaee:handler-name>Routing Handler</javaee:handler-name>
+          <javaee:handler-class>org.jboss.test.ws.jaxws.clientConfig.RoutingHandler</javaee:handler-class>
+        </javaee:handler>
+      </javaee:handler-chain>
+    </pre-handler-chains>
+  </client-config>
+  <client-config>
     <config-name>Another Client Config</config-name>
     <pre-handler-chains>
       <javaee:handler-chain>