Author: mageshbk(a)jboss.com Date: 2010-04-07 10:56:44 -0400 (Wed, 07 Apr 2010) New Revision: 11958 Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java Log: Fix Test case failures Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-04-07 14:49:59 UTC (rev 11957) +++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-04-07 14:56:44 UTC (rev 11958) @@ -65,7 +65,7 @@ http://jira.codehaus.org/browse/MANTRUN-91 --> <javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true" - executable="${java.jdk15.home}/bin/javac" compiler="javac1.5"> + source="1.5" target="1.5"> <src path="${tests.output.dir}/wstools/java"/> <classpath> <pathelement path="${maven.test.classpath}"/> Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-04-07 14:49:59 UTC (rev 11957) +++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-04-07 14:56:44 UTC (rev 11958) @@ -100,6 +100,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = usernameDispatch.getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + String payload = "<ns1:getUsernameToken xmlns:ns1='http://org.jboss.ws/samples/wssecurity'/>"; usernameDispatch.invoke(new StreamSource(new StringReader(payload))); fail("Server should respond with [401] - Unauthorized"); Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-04-07 14:49:59 UTC (rev 11957) +++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-04-07 14:56:44 UTC (rev 11958) @@ -72,6 +72,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + port.getUsernameToken(); fail("Server should respond with [401] - Unauthorized"); } @@ -90,4 +95,4 @@ String retObj = port.getUsernameToken(); assertEquals("kermit", retObj); } -} +} \ No newline at end of file