[jbossws-commits] JBossWS SVN: r15627 - stack/cxf/branches/wstrust/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
Author: alessio.soldano(a)jboss.com
Date: 2012-02-09 11:19:35 -0500 (Thu, 09 Feb 2012)
New Revision: 15627
Modified:
stack/cxf/branches/wstrust/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
Log:
Cleanup to the testcase
Modified:
stack/cxf/branches/wstrust/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
===================================================================
---
stack/cxf/branches/wstrust/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-02-09
15:57:08 UTC (rev 15626)
+++
stack/cxf/branches/wstrust/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-02-09
16:19:35 UTC (rev 15627)
@@ -49,12 +49,11 @@
public final class WSTrustTestCase extends JBossWSTest
{
private final String serviceURL = "http://" + getServerHost() +
":8080/jaxws-samples-wsse-policy-trust";
-// private final String stsPath = "jaxws-samples-wsse-policy-trust-sts";
private final String stsURL = "http://" + getServerHost() +
":8080/jaxws-samples-wsse-policy-trust-sts";
-// private Endpoint stsEndpoint;
public static Test suite()
{
+ //deploy client, STS and service; start a security domain to be used by the STS for
authenticating client
JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup(
WSTrustTestCase.class, "jaxws-samples-wsse-policy-trust-client.jar
jaxws-samples-wsse-policy-trust-sts.war jaxws-samples-wsse-policy-trust.war");
Map<String, String> authenticationOptions = new HashMap<String,
String>();
@@ -66,48 +65,6 @@
testSetup.addSecurityDomainRequirement("JBossWS-trust-sts",
authenticationOptions);
return testSetup;
}
-
-// @Override
-// protected void setUp() throws Exception {
-// super.setUp();
-//
-// //Prepare the STS ...
-// StaticSTSProperties props = new StaticSTSProperties();
-// props.setSignaturePropertiesFile("stsKeystore.properties");
-// props.setSignatureUsername("mystskey");
-// props.setCallbackHandlerClass(STSCallbackHandler.class.getName());
-// props.setIssuer("DoubleItSTSIssuer");
-//
-// List<ServiceMBean> services = new LinkedList<ServiceMBean>();
-// StaticService service = new StaticService();
-//
//service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-sts"));
-// service.setEndpoints(Arrays.asList(stsURL));
-// services.add(service);
-//
-// TokenIssueOperation issueOperation = new TokenIssueOperation();
-// issueOperation.setServices(services);
-// issueOperation.getTokenProviders().add(new SAMLTokenProvider());
-// issueOperation.setStsProperties(props);
-//
-// TokenValidateOperation validateOperation = new TokenValidateOperation();
-// validateOperation.getTokenValidators().add(new SAMLTokenValidator());
-// validateOperation.setStsProperties(props);
-//
-// SecurityTokenServiceProvider sts = new SecurityTokenServiceProvider();
-// sts.setIssueOperation(issueOperation);
-// sts.setValidateOperation(validateOperation);
-//
-// //Publish STS through Endpoint API
-// stsEndpoint = Endpoint.publish(stsURL, sts);
-// }
-//
-// @Override
-// protected void tearDown() throws Exception {
-// if (stsEndpoint != null) {
-// stsEndpoint.stop();
-// }
-// super.tearDown();
-// }
public void test() throws Exception
{