Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java (revision 17777) +++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java (working copy) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.samples.wsse.policy.basic; import java.io.BufferedReader; +import java.io.File; import java.io.InputStreamReader; import java.net.URL; @@ -32,8 +33,11 @@ import junit.framework.Test; 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.JarDeployment; +import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment; /** * WS-SecurityPolicy code first dev test @@ -43,13 +47,47 @@ */ public final class AnnotatedSignEncryptTestCase extends JBossWSTest { + private static final String WAR_NAME = "jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first.war"; + public static final String CLIENT_JAR_NAME = "jaxws-samples-wsse-policy-sign-encrypt-client.jar"; private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first/AnnotatedSecurityService"; public static Test suite() { - return new JBossWSCXFTestSetup(AnnotatedSignEncryptTestCase.class, "jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first.war jaxws-samples-wsse-policy-sign-encrypt-client.jar"); + createWarDeployment(WAR_NAME).writeToFile(); + createClientJarDeployment(CLIENT_JAR_NAME).writeToFile(); + + return new JBossWSCXFTestSetup(AnnotatedSignEncryptTestCase.class, WAR_NAME + " " + CLIENT_JAR_NAME); } + public static JarDeployment createClientJarDeployment(String name) + { + return new JarDeployment(name) { { + archive + .addManifest() + .addAsManifestResource(new File(testResourcesPath + "jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/alice.properties"), "alice.properties") + .addAsManifestResource(new File(testResourcesPath + "jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(testResourcesPath + "jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml") + ; + } }; + } + + private static WarDeployment createWarDeployment(String name) + { + return new WarDeployment(name) { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.basic.AnnotatedServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.basic.AnnotatedServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsResource(new File(testResourcesPath + "jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.jks"), "bob.jks") + .addAsResource(new File(testResourcesPath + "jaxws/samples/wsse/policy/basic/gcm/WEB-INF/bob.properties"), "bob.properties") + ; + } }; + } + public void testWsdl() throws Exception { URL wsdlURL = new URL(serviceURL + "?wsdl"); @@ -66,7 +104,7 @@ String wsdl = sb.toString(); assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy")); } - + public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "AnnotatedSecurityService");