[jbossws-commits] JBossWS SVN: r5057 - in stack/native/branches/jbossws-native-2.0.2/src/test: resources and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2007-11-16 07:07:23 -0500 (Fri, 16 Nov 2007) New Revision: 5057 Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt Log: Fix webserviceref stub properties Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-16 10:51:59 UTC (rev 5056) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-16 12:07:23 UTC (rev 5057) @@ -57,16 +57,25 @@ if (args.length > 2) password = args[2]; - SecureEndpoint port = secureService1.getSecureEndpointPort(); - String retMsg = invokeEndpoint(port, reqMsg, username, password); - - port = secureService2.getPort(SecureEndpoint.class); - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - port = securePort1; - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - retStr = retMsg; + if (reqMsg.equals("SecureService1")) + { + SecureEndpoint port = secureService1.getSecureEndpointPort(); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecureService2")) + { + SecureEndpoint port = secureService2.getPort(SecureEndpoint.class); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecurePort1")) + { + SecureEndpoint port = securePort1; + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else + { + throw new IllegalArgumentException("Invalid req messge: " + reqMsg); + } } private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-16 10:51:59 UTC (rev 5056) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-16 12:07:23 UTC (rev 5057) @@ -73,17 +73,45 @@ assertEquals(helloWorld, retObj); } - public void testUnconfiguredStub() throws Throwable + public void testExplicitSecureService1() throws Throwable { - String reqMsg = "Hello World"; + String reqMsg = "SecureService1"; new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + assertEquals(reqMsg, SecureEndpointClient.retStr); } - public void testConfiguredStub() throws Throwable + public void testExplicitSecureService2() throws Throwable { - String reqMsg = "Hello World"; + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testExplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecureService1() throws Throwable + { + String reqMsg = "SecureService1"; new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + assertEquals(reqMsg, SecureEndpointClient.retStr); } + + public void testImplicitSecureService2() throws Throwable + { + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 10:51:59 UTC (rev 5056) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-16 12:07:23 UTC (rev 5057) @@ -7,5 +7,4 @@ org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.* # [JBAS-4931] Fix ejb3 ClientLaucher -org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.* -org/jboss/test/ws/jaxws/webserviceref/** +#org/jboss/test/ws/jaxws/webserviceref/**