Author: alessio.soldano(a)jboss.com Date: 2008-05-20 13:41:14 -0400 (Tue, 20 May 2008) New Revision: 7115 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java Log: Fixing SecureEJBTestCase (cleaning up security principal/credential after playing with them on client side) Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 15:12:52 UTC (rev 7114) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) @@ -53,6 +53,10 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -128,12 +132,23 @@ SOAPMessage soapMsg = factory.createMessage(null, inputStream); String expected = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); - WSSecurityAPI sec = new WSSecurityDispatcher(); - sec.encodeMessage(configuration, soapMsg, null, "kermit", "thefrog"); - sec.decodeMessage(configuration, soapMsg, null); - - String actual = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); - assertEquals(expected, actual); + try + { + WSSecurityAPI sec = new WSSecurityDispatcher(); + sec.encodeMessage(configuration, soapMsg, null, "kermit", "thefrog"); + sec.decodeMessage(configuration, soapMsg, null); + + String actual = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); + assertEquals(expected, actual); + } + finally + { + //Reset username/password since they're stored using a ThreadLocal + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + securityAdaptor.setPrincipal(null); + securityAdaptor.setCredential(null); + } } // WS-Security leaves wsu:id attributes around on elements which are not Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 15:12:52 UTC (rev 7114) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) @@ -40,6 +40,10 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.Element; @@ -121,6 +125,14 @@ { //OK } + finally + { + //Reset username/password since they're stored using a ThreadLocal + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + securityAdaptor.setPrincipal(null); + securityAdaptor.setCredential(null); + } } private SOAPMessage getMessage(Calendar created, String envStr) throws Exception @@ -131,7 +143,6 @@ return factory.createMessage(null, inputStream); } - public void testEncodeMessageWithNonceAndCreated() throws Exception { WSSecurityConfiguration configuration = WSSecurityOMFactory.newInstance().parse(new StringReader(clientConf));