Author: veithen
Date: Sun Jul 10 20:52:17 2011
New Revision: 1144959
URL: http://svn.apache.org/viewvc?rev=1144959&view=rev
Log:
Merged r1087998 to the 1.6 branch. No functional changes here, but this is a
prerequisite to be able to merge a couple of other changes without conflicts.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:52:17 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
Sun Jul 10 20:52:17 2011
@@ -31,26 +31,20 @@ public class TokenRequestDispatcherConfi
/**
* Testing a valid config file
*/
- public void testWithConfigFile() {
- try {
- TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
- .load("test-resources/trust/dispatcher.config.xml");
-
- assertEquals("Incorrect default issuer class name",
- "org.apache.rahas.TempIssuer", config
- .getDefaultIssuerName());
-
- TokenIssuer issuer = config
- .getIssuer("http://example.org/mySpecialToken1";);
-
- assertEquals("Incorrect issuer for token type : "
- + "http://example.org/mySpecialToken1";, TempIssuer.class
- .getName(), issuer.getClass().getName());
-
- } catch (TrustException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testWithConfigFile() throws Exception {
+ TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
+ .load("test-resources/trust/dispatcher.config.xml");
+
+ assertEquals("Incorrect default issuer class name",
+ "org.apache.rahas.TempIssuer", config
+ .getDefaultIssuerName());
+
+ TokenIssuer issuer = config
+ .getIssuer("http://example.org/mySpecialToken1";);
+
+ assertEquals("Incorrect issuer for token type : "
+ + "http://example.org/mySpecialToken1";, TempIssuer.class
+ .getName(), issuer.getClass().getName());
}
/**
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
Sun Jul 10 20:52:17 2011
@@ -27,224 +27,181 @@ import java.util.ArrayList;
public class AsymmetricBindingBuilderTest extends MessageBuilderTestBase {
- public void testAsymmBinding() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-1.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
+ public void testAsymmBinding() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingServerSide() {
- try {
- MessageContext ctx = getMsgCtx();
-
- ctx.setServerSide(true);
- String policyXml =
"test-resources/policy/rampart-asymm-binding-1.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingServerSide() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ ctx.setServerSide(true);
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithSigDK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithSigDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithDK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-3-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithDKEncrBeforeSig() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
-
- public void testAsymmBindingEncrBeforeSig() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-5-ebs.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingTripleDesRSA15() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-3-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithDKEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+
+ public void testAsymmBindingEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-5-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingTripleDesRSA15() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testAsymmBindingTripleDesRSA15DK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-asymm-binding-7-3des-r15-DK.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new
QName(WSConstants.WSSE_NS,WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testAsymmBindingTripleDesRSA15DK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-asymm-binding-7-3des-r15-DK.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
Sun Jul 10 20:52:17 2011
@@ -28,33 +28,26 @@ import org.apache.ws.security.conversati
public class SymmetricBindingBuilderTest extends MessageBuilderTestBase {
- public void testSymmBinding() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-symm-binding-1.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBinding() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-1.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
// public void testSymmBindingServerSide() {
@@ -84,127 +77,99 @@ public class SymmetricBindingBuilderTest
// }
// }
- public void testSymmBindingWithDK() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-symm-binding-2-dk.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBindingWithDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-symm-binding-2-dk.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingWithDKEncrSig() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-symm-binding-3-dk-es.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_DATA_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBindingWithDKEncrSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-symm-binding-3-dk-es.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_DATA_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingEncrBeforeSig() {
+ public void testSymmBindingEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-symm-binding-4-ebs.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-symm-binding-4-ebs.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingWithDKEncrBeforeSig() {
+ public void testSymmBindingWithDKEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-symm-binding-5-dk-ebs.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-symm-binding-5-dk-ebs.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
Sun Jul 10 20:52:17 2011
@@ -27,101 +27,79 @@ import java.util.List;
public class TransportBindingBuilderTest extends MessageBuilderTestBase {
- public void testTransportBinding() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-transport-binding.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- List list = new ArrayList();
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testTransportBinding() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-transport-binding.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ List list = new ArrayList();
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testTransportBindingNoBST() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-transport-binding-no-bst.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- List list = new ArrayList();
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testTransportBindingNoBST() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-transport-binding-no-bst.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ List list = new ArrayList();
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testTransportBindingWithDK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml =
"test-resources/policy/rampart-transport-binding-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- List list = new ArrayList();
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02,
- ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testTransportBindingWithDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml =
"test-resources/policy/rampart-transport-binding-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ List list = new ArrayList();
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,
WSConstants.USERNAME_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02,
+ ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testTransportBindingWithDKServerSide() {
- try {
- MessageContext ctx = getMsgCtx();
- ctx.setServerSide(true);
-
- String policyXml =
"test-resources/policy/rampart-transport-binding-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- List list = new ArrayList();
- list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testTransportBindingWithDKServerSide() throws Exception {
+ MessageContext ctx = getMsgCtx();
+ ctx.setServerSide(true);
+
+ String policyXml =
"test-resources/policy/rampart-transport-binding-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ List list = new ArrayList();
+ list.add(new QName(WSConstants.WSU_NS,
WSConstants.TIMESTAMP_TOKEN_LN));
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
Sun Jul 10 20:52:17 2011
@@ -33,55 +33,48 @@ public class RampartPolicyTest extends T
public final static QName RAMPART_CONFIG_NAME = new
QName(RampartConfig.NS,RampartConfig.RAMPART_CONFIG_LN);
public final static QName CRYPTO_CONFIG_NAME = new
QName(RampartConfig.NS,CryptoConfig.CRYPTO_LN);
- public void testLoadPolicy() {
- try {
- String xmlPath = "test-resources/policy/rampart-policy-1.xml";
- StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
-
- OMElement elem = builder.getDocumentElement();
-
- Policy policy = PolicyEngine.getPolicy(elem);
-
- Assertion assertion = (Assertion)policy.getAssertions().get(0);
-
- assertEquals("Incorrect namespace in RampartConfig",
- RAMPART_CONFIG_NAME.getNamespaceURI(), assertion.getName()
- .getNamespaceURI());
- assertEquals("Incorrect localname in RampartConfig",
- RAMPART_CONFIG_NAME.getLocalPart(), assertion.getName()
- .getLocalPart());
+ public void testLoadPolicy() throws Exception {
+ String xmlPath = "test-resources/policy/rampart-policy-1.xml";
+ StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+
+ OMElement elem = builder.getDocumentElement();
+
+ Policy policy = PolicyEngine.getPolicy(elem);
+
+ Assertion assertion = (Assertion)policy.getAssertions().get(0);
+
+ assertEquals("Incorrect namespace in RampartConfig",
+ RAMPART_CONFIG_NAME.getNamespaceURI(), assertion.getName()
+ .getNamespaceURI());
+ assertEquals("Incorrect localname in RampartConfig",
+ RAMPART_CONFIG_NAME.getLocalPart(), assertion.getName()
+ .getLocalPart());
- RampartConfig config = (RampartConfig) assertion;
- CryptoConfig sigCryptoConfig = config.getSigCryptoConfig();
+ RampartConfig config = (RampartConfig) assertion;
+ CryptoConfig sigCryptoConfig = config.getSigCryptoConfig();
- assertNotNull("Signature Crypto missing", sigCryptoConfig);
-
- assertEquals("Incorrect namespace in SignatureCrypto",
- CRYPTO_CONFIG_NAME.getNamespaceURI(), sigCryptoConfig
- .getName().getNamespaceURI());
- assertEquals("Incorrect localname in SignatureCrypto",
- CRYPTO_CONFIG_NAME.getLocalPart(),
sigCryptoConfig.getName()
- .getLocalPart());
-
- assertEquals("Incorrect provider value",
- "org.apache.ws.security.components.crypto.Merlin",
- sigCryptoConfig.getProvider());
-
- Properties prop = sigCryptoConfig.getProp();
- assertEquals("Incorrect number of properties", 3, prop.size());
-
- assertEquals("Incorrect property value", "JKS", prop
- .getProperty("keystoreType"));
- assertEquals("Incorrect property value", "/path/to/file.jks", prop
- .getProperty("keystoreFile"));
- assertEquals("Incorrect property value", "password", prop
- .getProperty("keystorePassword"));
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ assertNotNull("Signature Crypto missing", sigCryptoConfig);
+
+ assertEquals("Incorrect namespace in SignatureCrypto",
+ CRYPTO_CONFIG_NAME.getNamespaceURI(), sigCryptoConfig
+ .getName().getNamespaceURI());
+ assertEquals("Incorrect localname in SignatureCrypto",
+ CRYPTO_CONFIG_NAME.getLocalPart(), sigCryptoConfig.getName()
+ .getLocalPart());
+
+ assertEquals("Incorrect provider value",
+ "org.apache.ws.security.components.crypto.Merlin",
+ sigCryptoConfig.getProvider());
+
+ Properties prop = sigCryptoConfig.getProp();
+ assertEquals("Incorrect number of properties", 3, prop.size());
+ assertEquals("Incorrect property value", "JKS", prop
+ .getProperty("keystoreType"));
+ assertEquals("Incorrect property value", "/path/to/file.jks", prop
+ .getProperty("keystoreFile"));
+ assertEquals("Incorrect property value", "password", prop
+ .getProperty("keystorePassword"));
}
}
\ No newline at end of file
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java?rev=1144959&r1=1144958&r2=1144959&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
Sun Jul 10 20:52:17 2011
@@ -31,59 +31,43 @@ import junit.framework.TestCase;
public class SecpolicyModelTest extends TestCase {
- public void testSymmBinding() {
- try {
- Policy p =
this.getPolicy("test-resources/policy-symm-binding.xml");
- List assertions = (List)p.getAlternatives().next();
-
- boolean symmBindingFound = false;
-
- for (Iterator iter = assertions.iterator(); iter.hasNext();) {
- Assertion assertion = (Assertion) iter.next();
- if(assertion instanceof SymmetricBinding) {
- symmBindingFound = true;
- SymmetricBinding binding = (SymmetricBinding)assertion;
- assertEquals("IncludeTimestamp assertion not processed",
true, binding.isIncludeTimestamp());
-
- ProtectionToken protectionToken =
binding.getProtectionToken();
- assertNotNull("ProtectionToken missing", protectionToken);
-
- Token token = protectionToken.getProtectionToken();
- if(token instanceof X509Token) {
- assertEquals("incorrect X509 token versin and type",
- SPConstants.WSS_X509_V3_TOKEN10,
- ((X509Token) token).getTokenVersionAndType());
- } else {
- fail("ProtectionToken must contain a X509Token
assertion");
- }
-
+ public void testSymmBinding() throws Exception {
+ Policy p = this.getPolicy("test-resources/policy-symm-binding.xml");
+ List assertions = (List)p.getAlternatives().next();
+
+ boolean symmBindingFound = false;
+
+ for (Iterator iter = assertions.iterator(); iter.hasNext();) {
+ Assertion assertion = (Assertion) iter.next();
+ if(assertion instanceof SymmetricBinding) {
+ symmBindingFound = true;
+ SymmetricBinding binding = (SymmetricBinding)assertion;
+ assertEquals("IncludeTimestamp assertion not processed", true,
binding.isIncludeTimestamp());
+
+ ProtectionToken protectionToken = binding.getProtectionToken();
+ assertNotNull("ProtectionToken missing", protectionToken);
+
+ Token token = protectionToken.getProtectionToken();
+ if(token instanceof X509Token) {
+ assertEquals("incorrect X509 token versin and type",
+ SPConstants.WSS_X509_V3_TOKEN10,
+ ((X509Token) token).getTokenVersionAndType());
+ } else {
+ fail("ProtectionToken must contain a X509Token assertion");
}
+
}
- //The Asymm binding mean is not built in the policy processing :-(
- assertTrue("SymmetricBinding not porcessed", symmBindingFound);
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
}
+ //The Asymm binding mean is not built in the policy processing :-(
+ assertTrue("SymmetricBinding not porcessed", symmBindingFound);
}
- public void testAsymmBinding() {
- try {
- this.getPolicy("test-resources/policy-asymm-binding.xml");
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testAsymmBinding() throws Exception {
+ this.getPolicy("test-resources/policy-asymm-binding.xml");
}
- public void testTransportBinding() {
- try {
- this.getPolicy("test-resources/policy-transport-binding.xml");
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testTransportBinding() throws Exception {
+ this.getPolicy("test-resources/policy-transport-binding.xml");
}
private Policy getPolicy(String filePath) throws Exception {
