Author: alessio.soldano(a)jboss.com Date: 2011-06-08 05:07:35 -0400 (Wed, 08 Jun 2011) New Revision: 14491 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3257][JBWS-3308] Updating tests & exclusions Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-06-08 08:27:54 UTC (rev 14490) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-06-08 09:07:35 UTC (rev 14491) @@ -21,8 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws1988; -import java.io.File; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -47,7 +48,30 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988-config.sar jaxws-jbws1988.jar"); + JBossWSTestSetup testSetup; + if (!isTargetJBoss6()) + { + testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/jbws1988/META-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback"); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); + } + else + { + testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, + "jaxws-jbws1988-config.sar jaxws-jbws1988.jar"); + } + return testSetup; } public void testAuth() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-06-08 08:27:54 UTC (rev 14490) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-06-08 09:07:35 UTC (rev 14491) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws2116; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -52,7 +54,24 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116-config.sar jaxws-jbws2116.jar"); + JBossWSTestSetup testSetup; + if (!isTargetJBoss6()) + { + testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks"); + authenticationOptions.put("KeyStorePass", "password"); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions); + } + else + { + testSetup = new JBossWSTestSetup(CertAuthTestCase.class, + "jaxws-jbws2116-config.sar jaxws-jbws2116.jar"); + } + return testSetup; } protected void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-06-08 08:27:54 UTC (rev 14490) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-08 09:07:35 UTC (rev 14491) @@ -793,6 +793,7 @@ <!-- TODO: implement EJB security integration --> <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1988/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude> <!-- TODO: Unexpected element 'class-loading' encountered --> @@ -848,8 +849,7 @@ <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- # [JBWS-3257] No class available with name 'org.jboss.security.plugins.JaasSecurityDomain' --> - <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> + <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains --> <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>