[jbossws-commits] JBossWS SVN: r14485 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/wsf/test and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-06-07 12:01:14 -0400 (Tue, 07 Jun 2011) New Revision: 14485 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java Log: [JBWS-3257] Use new option for deploying security domain Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war"); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6()); } public void testAuthorized() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -36,11 +36,21 @@ { super(testClass, archiveList); } + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(testClass, archiveList, requiresDefaultSecurityDomain); + } public JBossWSCXFTestSetup(Test test, String archiveList) { super(test, archiveList); } + + public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(test, archiveList, requiresDefaultSecurityDomain); + } public JBossWSCXFTestSetup(Test test) { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaas; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -30,6 +32,7 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -46,8 +49,30 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, + JBossWSCXFTestSetup testSetup; + if (!isTargetJBoss6()) + { + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-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", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); + } + else + { + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war"); + } + return testSetup; } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar"); + return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6()); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -46,7 +46,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war"); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6()); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 14:33:42 UTC (rev 14484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-06-07 16:01:14 UTC (rev 14485) @@ -36,11 +36,21 @@ { super(testClass, archiveList); } + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(testClass, archiveList, requiresDefaultSecurityDomain); + } public JBossWSCXFTestSetup(Test test, String archiveList) { super(test, archiveList); } + + public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(test, archiveList, requiresDefaultSecurityDomain); + } public JBossWSCXFTestSetup(Test test) {