Author: jim.ma Date: 2015-01-27 05:06:13 -0500 (Tue, 27 Jan 2015) New Revision: 19431 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java Log: Fix test failures Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -24,24 +24,12 @@ import java.io.File; import java.net.URL; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.soap.SOAPFaultException; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.endpoint.Client; @@ -49,11 +37,17 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; /** * WS-Security sign & encrypt test case @@ -88,18 +82,9 @@ return archive; } - @Deployment(name="jaxws-samples-wsse-sign-encrypt-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class,("jaxws-samples-wsse-sign-encrypt-client.jar")); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties"), "alice.properties"); - return archive; - } - @Test @RunAsClient + @WrapThreadContextClassLoader public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); @@ -148,4 +133,16 @@ cxfEndpoint.getInInterceptors().add(wssIn); cxfEndpoint.getInInterceptors().add(new SAAJInInterceptor()); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-sign-encrypt-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties"), "alice.properties"); + } + }); + } + } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,16 +23,9 @@ import java.io.File; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTestHelper; public final class UsernameDeploymentArchives Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -26,23 +26,21 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.shrinkwrap.api.asset.StringAsset; - /** * WS-Security username test case * * @author alessio.soldano(a)jboss.com * @since 22-Aug-2010 */ +(a)RunWith(Arquillian.class) public final class UsernameServletTestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -28,23 +28,19 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; - /** * WS-Security username test case * Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,39 +23,32 @@ import java.io.File; import java.net.URL; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.feature.LoggingFeature; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.policy.WSPolicyFeature; import org.apache.cxf.ws.security.kerberos.KerberosClient; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItPortType; -import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; /** - * This test is excluded. Please modify modules/testsuite/pom.xml to enable this test. + * This test is ignored. Please remove @Ignore to enable this test. * Before run this test, a KDC of realm "WS.APACHE.ORG" is required to setup first. * Please look at these two links to find more info about setup a KDC on Fedora and configure it with realm and principals: * https://docs.fedoraproject.org/en-US/Fedora//html/Security_Guide/sect-Sec... @@ -97,12 +90,13 @@ @RunWith(Arquillian.class) +@Ignore("This test requires manually setup KDC") public class KerberosTestCase extends JBossWSTest { private static final String namespace = "http://www.example.org/contract/DoubleIt"; - @Deployment(name="jaxws-samples-wsse-kerberos", order=1, testable = false) + @Deployment(name="jaxws-samples-wsse-kerberos", testable = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-kerberos.war"); archive @@ -124,22 +118,10 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/WEB-INF/web.xml")); return archive; } - - @Deployment(name="jaxws-samples-wsse-kerberos-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class,"jaxws-samples-wsse-kerberos-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos//cxf.xml"), "cxf.xml") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.properties"), "alice.properties") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.jks"), "bob.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.properties"), "bob.properties"); - return archive; - } - + @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosSupport() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport"; @@ -156,6 +138,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosTransport() throws Exception { final int serverPort = getServerPort(); @@ -174,6 +157,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosSymmetricSupporting() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting"; @@ -189,6 +173,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosAsymmetric() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric"; @@ -203,6 +188,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosOverAsymmetricSignedEncrypted() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted"; @@ -217,6 +203,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosKerberosSymmetric() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric"; @@ -306,4 +293,19 @@ kerberosClient.setContextName("alice"); cxfEndpoint.put("ws-security.kerberos.client", kerberosClient); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-kerberos-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos//cxf.xml"), "cxf.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.properties"), "alice.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.jks"), "bob.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.properties"), "bob.properties"); + } + }); + } + } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -22,32 +22,26 @@ package org.jboss.test.ws.jaxws.samples.wssePolicy; import java.io.File; -import java.lang.Exception; import java.net.URL; -import java.net.MalformedURLException; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import javax.xml.ws.soap.SOAPFaultException; +import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.WrapThreadContextClassLoader; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.wsf.test.WrapThreadContextClassLoader; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.apache.cxf.ws.security.SecurityConstants; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; - /** * WS-Security Policy sign & encrypt test case * @@ -57,7 +51,7 @@ @RunWith(Arquillian.class) public final class SignEncryptTestCase extends JBossWSTest { - @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt", order=1, testable = false) + @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt", testable = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wssePolicy-sign-encrypt.war"); archive @@ -77,20 +71,9 @@ return archive; } - @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wssePolicy-sign-encrypt-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties"), "alice.properties"); - return archive; - } - @Test @RunAsClient @WrapThreadContextClassLoader - @OperateOnDeployment("jaxws-samples-wssePolicy-sign-encrypt-client") public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); @@ -116,4 +99,15 @@ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wssePolicy-sign-encrypt-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties"), "alice.properties"); + } + }); + } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,32 +23,23 @@ import java.io.File; import java.net.URL; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; +import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.cxf.ws.security.SecurityConstants; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; - /** * WS-Security Policy username test case *