You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/07/18 16:02:13 UTC
[cxf] 01/02: Simplifying the security parameterized tests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ed7b8097bd1f76814d9a0d6b26f7dbbb35c9512a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 18 14:53:02 2018 +0100
Simplifying the security parameterized tests
---
.../asymmetric_encr/AsymmetricEncryptionTest.java | 6 +-
.../systest/sts/basic_auth/JaxwsBasicAuthTest.java | 10 +-
.../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 6 +-
.../BinarySecurityTokenTest.java | 10 +-
.../apache/cxf/systest/sts/claims/ClaimsTest.java | 18 +-
.../cxf/systest/sts/renew/SAMLRenewUnitTest.java | 6 +-
.../secure_conv/SecurityContextTokenUnitTest.java | 6 +-
.../apache/cxf/systest/sts/soap12/Soap12Test.java | 18 +-
.../sts_sender_vouches/STSSenderVouchesTest.java | 6 +-
.../sts/usernametoken/UsernameTokenTest.java | 10 +-
.../sts/asymmetric/AsymmetricBindingTest.java | 21 ++-
.../apache/cxf/systest/sts/bearer/BearerTest.java | 18 +-
.../sts/sendervouches/SenderVouchesTest.java | 10 +-
.../sts/symmetric/SymmetricBindingTest.java | 18 +-
.../cxf/systest/sts/template/TemplateTest.java | 6 +-
.../sts/transport/TransportBindingTest.java | 18 +-
.../sts/username_actas/UsernameActAsTest.java | 11 +-
.../UsernameOnBehalfOfTest.java | 10 +-
.../systest/sts/x509/X509SymmetricBindingTest.java | 18 +-
.../systest/wssec/examples/saml/SamlTokenTest.java | 10 +-
.../examples/secconv/SecureConversationTest.java | 10 +-
.../wssec/examples/ut/UsernameTokenTest.java | 10 +-
.../systest/wssec/examples/x509/X509TokenTest.java | 10 +-
.../systest/ws/action/SignatureWhitespaceTest.java | 6 +-
.../systest/ws/bindings/BindingPropertiesTest.java | 10 +-
.../apache/cxf/systest/ws/cache/CachingTest.java | 6 +-
.../CryptoCoverageCheckerTest.java | 10 +-
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 10 +-
.../cxf/systest/ws/https/HttpsTokenTest.java | 10 +-
.../org/apache/cxf/systest/ws/parts/PartsTest.java | 10 +-
.../systest/ws/policy/PolicyAlternativeTest.java | 7 +-
.../apache/cxf/systest/ws/saml/SamlTokenTest.java | 10 +-
.../ws/saml/subjectconf/SamlSubjectConfTest.java | 6 +-
.../systest/ws/security/WSSecurityClientTest.java | 6 +-
.../apache/cxf/systest/ws/swa/SWAPolicyTest.java | 10 +-
.../ws/tokens/EndorsingSupportingTokenTest.java | 6 +-
.../cxf/systest/ws/tokens/SupportingTokenTest.java | 10 +-
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 10 +-
.../cxf/systest/ws/ut/UsernameTokenTest.java | 10 +-
.../org/apache/cxf/systest/ws/wssc/WSSCTest.java | 208 ++++++++++-----------
.../apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 6 +-
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 38 ++--
.../cxf/systest/ws/wssec11/WSSecurity111Test.java | 90 ++++-----
.../cxf/systest/ws/wssec11/WSSecurity112Test.java | 62 +++---
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 10 +-
.../org/apache/cxf/systest/ws/xkms/XKMSTest.java | 10 +-
46 files changed, 413 insertions(+), 414 deletions(-)
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
index 57c9d9e..14a6519 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
@@ -73,10 +73,10 @@ public class AsymmetricEncryptionTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam("", false, STSPORT)},
- {new TestParam("", false, STAX_STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam("", false, STSPORT),
+ new TestParam("", false, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
index 4e8d642..96810ce 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
@@ -91,12 +91,12 @@ public class JaxwsBasicAuthTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, "")},
- {new TestParam(PORT, true, "")},
- {new TestParam(STAX_PORT, false, "")},
- {new TestParam(STAX_PORT, true, "")},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, ""),
+ new TestParam(PORT, true, ""),
+ new TestParam(STAX_PORT, false, ""),
+ new TestParam(STAX_PORT, true, ""),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index f6d9852..d8cc294 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -75,10 +75,10 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam("", false, STSPORT)},
- {new TestParam("", false, STAX_STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam("", false, STSPORT),
+ new TestParam("", false, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
index 14fa6ea..0057b14 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
@@ -91,12 +91,12 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, "")},
- {new TestParam(PORT, true, "")},
- {new TestParam(STAX_PORT, false, "")},
- {new TestParam(STAX_PORT, true, "")},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, ""),
+ new TestParam(PORT, true, ""),
+ new TestParam(STAX_PORT, false, ""),
+ new TestParam(STAX_PORT, true, ""),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
index 3f3c2d4..a7d3291 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
@@ -94,17 +94,17 @@ public class ClaimsTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(PORT, true, STSPORT)},
- {new TestParam(STAX_PORT, false, STSPORT)},
- {new TestParam(STAX_PORT, true, STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(PORT, true, STSPORT),
+ new TestParam(STAX_PORT, false, STSPORT),
+ new TestParam(STAX_PORT, true, STSPORT),
- {new TestParam(PORT, false, STAX_STSPORT)},
- {new TestParam(PORT, true, STAX_STSPORT)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT)},
+ new TestParam(PORT, false, STAX_STSPORT),
+ new TestParam(PORT, true, STAX_STSPORT),
+ new TestParam(STAX_PORT, false, STAX_STSPORT),
+ new TestParam(STAX_PORT, true, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index 91c6f69..1ac3b62 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -72,10 +72,10 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam("", false, STSPORT)},
- {new TestParam("", false, STAX_STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam("", false, STSPORT),
+ new TestParam("", false, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
index 3b3d91e..fe414de 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
@@ -70,10 +70,10 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam("", false, STSPORT)},
- {new TestParam("", true, STAX_STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam("", false, STSPORT),
+ new TestParam("", false, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
index 78518a9..31a829a 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
@@ -107,17 +107,17 @@ public class Soap12Test extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(PORT, true, STSPORT)},
- {new TestParam(STAX_PORT, false, STSPORT)},
- {new TestParam(STAX_PORT, true, STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(PORT, true, STSPORT),
+ new TestParam(STAX_PORT, false, STSPORT),
+ new TestParam(STAX_PORT, true, STSPORT),
- {new TestParam(PORT, false, STAX_STSPORT)},
- {new TestParam(PORT, true, STAX_STSPORT)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT)},
+ new TestParam(PORT, false, STAX_STSPORT),
+ new TestParam(PORT, true, STAX_STSPORT),
+ new TestParam(STAX_PORT, false, STAX_STSPORT),
+ new TestParam(STAX_PORT, true, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
index bdf6103..e8dcdc5 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
@@ -82,10 +82,10 @@ public class STSSenderVouchesTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(PORT, false, STAX_STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(PORT, false, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
index d701cbe..4fff99f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
@@ -93,12 +93,12 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, "")},
- {new TestParam(PORT, true, "")},
- {new TestParam(STAX_PORT, false, "")},
- {new TestParam(STAX_PORT, true, "")},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, ""),
+ new TestParam(PORT, true, ""),
+ new TestParam(STAX_PORT, false, ""),
+ new TestParam(STAX_PORT, true, ""),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index ab7c5b9..0f2f293 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -104,16 +104,17 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
-
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT2)},
- {new TestParam(PORT, true, STSPORT2)},
- {new TestParam(STAX_PORT, false, STSPORT2)},
- {new TestParam(STAX_PORT, true, STSPORT2)},
- {new TestParam(PORT, false, STAX_STSPORT2)},
- {new TestParam(PORT, true, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT2)},
+ public static Collection<TestParam> data() {
+
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT2),
+ new TestParam(PORT, true, STSPORT2),
+ new TestParam(STAX_PORT, false, STSPORT2),
+ new TestParam(STAX_PORT, true, STSPORT2),
+
+ new TestParam(PORT, false, STAX_STSPORT2),
+ new TestParam(PORT, true, STAX_STSPORT2),
+ new TestParam(STAX_PORT, false, STAX_STSPORT2),
+ new TestParam(STAX_PORT, true, STAX_STSPORT2),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
index 6782cb3..00bb52e 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
@@ -88,17 +88,17 @@ public class BearerTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(PORT, true, STSPORT)},
- {new TestParam(STAX_PORT, false, STSPORT)},
- {new TestParam(STAX_PORT, true, STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(PORT, true, STSPORT),
+ new TestParam(STAX_PORT, false, STSPORT),
+ new TestParam(STAX_PORT, true, STSPORT),
- {new TestParam(PORT, false, STAX_STSPORT)},
- {new TestParam(PORT, true, STAX_STSPORT)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT)},
+ new TestParam(PORT, false, STAX_STSPORT),
+ new TestParam(PORT, true, STAX_STSPORT),
+ new TestParam(STAX_PORT, false, STAX_STSPORT),
+ new TestParam(STAX_PORT, true, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
index ccc3857..c60d1aa 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
@@ -89,12 +89,12 @@ public class SenderVouchesTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index 4b6af41..04437a9 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -114,17 +114,17 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT2)},
- {new TestParam(PORT, true, STSPORT2)},
- {new TestParam(STAX_PORT, false, STSPORT2)},
- {new TestParam(STAX_PORT, true, STSPORT2)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT2),
+ new TestParam(PORT, true, STSPORT2),
+ new TestParam(STAX_PORT, false, STSPORT2),
+ new TestParam(STAX_PORT, true, STSPORT2),
- {new TestParam(PORT, false, STAX_STSPORT2)},
- {new TestParam(PORT, true, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT2)},
+ new TestParam(PORT, false, STAX_STSPORT2),
+ new TestParam(PORT, true, STAX_STSPORT2),
+ new TestParam(STAX_PORT, false, STAX_STSPORT2),
+ new TestParam(STAX_PORT, true, STAX_STSPORT2),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index 11ed484..027bcca 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -86,10 +86,10 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(STAX_PORT, false, STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(STAX_PORT, false, STSPORT),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index b8cac13..76bb7ac 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -112,17 +112,17 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT)},
- {new TestParam(PORT, true, STSPORT)},
- {new TestParam(STAX_PORT, false, STSPORT)},
- {new TestParam(STAX_PORT, true, STSPORT)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT),
+ new TestParam(PORT, true, STSPORT),
+ new TestParam(STAX_PORT, false, STSPORT),
+ new TestParam(STAX_PORT, true, STSPORT),
- {new TestParam(PORT, false, STAX_STSPORT)},
- {new TestParam(PORT, true, STAX_STSPORT)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT)},
+ new TestParam(PORT, false, STAX_STSPORT),
+ new TestParam(PORT, true, STAX_STSPORT),
+ new TestParam(STAX_PORT, false, STAX_STSPORT),
+ new TestParam(STAX_PORT, true, STAX_STSPORT),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index 6fc923c..b4aa6c3 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -86,13 +86,12 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT2)},
- {new TestParam(PORT, true, STSPORT2)},
-
- {new TestParam(PORT, false, STAX_STSPORT2)},
- {new TestParam(PORT, true, STAX_STSPORT2)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT2),
+ new TestParam(PORT, true, STSPORT2),
+ new TestParam(PORT, false, STAX_STSPORT2),
+ new TestParam(PORT, true, STAX_STSPORT2),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
index 5c0fe61..a5d651b 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
@@ -85,13 +85,13 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT2)},
- {new TestParam(PORT, true, STSPORT2)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT2),
+ new TestParam(PORT, true, STSPORT2),
- {new TestParam(PORT, false, STAX_STSPORT2)},
- {new TestParam(PORT, true, STAX_STSPORT2)},
+ new TestParam(PORT, false, STAX_STSPORT2),
+ new TestParam(PORT, true, STAX_STSPORT2),
});
}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
index aded347..e90539f 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
@@ -90,17 +90,17 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false, STSPORT2)},
- {new TestParam(PORT, true, STSPORT2)},
- {new TestParam(STAX_PORT, false, STSPORT2)},
- {new TestParam(STAX_PORT, true, STSPORT2)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false, STSPORT2),
+ new TestParam(PORT, true, STSPORT2),
+ new TestParam(STAX_PORT, false, STSPORT2),
+ new TestParam(STAX_PORT, true, STSPORT2),
- {new TestParam(PORT, false, STAX_STSPORT2)},
- {new TestParam(PORT, true, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, false, STAX_STSPORT2)},
- {new TestParam(STAX_PORT, true, STAX_STSPORT2)},
+ new TestParam(PORT, false, STAX_STSPORT2),
+ new TestParam(PORT, true, STAX_STSPORT2),
+ new TestParam(STAX_PORT, false, STAX_STSPORT2),
+ new TestParam(STAX_PORT, true, STAX_STSPORT2),
});
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
index d277480..66da409 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
@@ -85,12 +85,12 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
index a7e91f0..177d3f5 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
@@ -73,12 +73,12 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
index 4a4f669..e8298ca 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
@@ -75,12 +75,12 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
index 917b8d8..d3d7662 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
@@ -73,12 +73,12 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
index 0bdd30f..370c5cb 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
@@ -88,10 +88,10 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(STAX_PORT, false)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(STAX_PORT, false),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
index 6ffd5c1..083a649 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
@@ -72,12 +72,12 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
index 1dd3554..efda80b 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
@@ -70,10 +70,10 @@ public class CachingTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index fddb1ca..17d4908 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -83,12 +83,12 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
index 75a5e45..d7eaccd 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
@@ -89,12 +89,12 @@ public class GCMTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index b8384e0..421823c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -72,12 +72,12 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
index c2eab58..baab7e6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
@@ -76,12 +76,12 @@ public class PartsTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
index c2aae1a..6f869f3 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
@@ -67,14 +67,13 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
});
}
-
@org.junit.AfterClass
public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
index bf26404..7ff4718 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
@@ -92,12 +92,12 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
index aef8a8f..c8596bc 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
@@ -77,10 +77,10 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(STAX_PORT, false)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(STAX_PORT, false),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
index 2e93039..a8fc06b 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
@@ -128,10 +128,10 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
index 74143ab..a977387 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
@@ -75,12 +75,12 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
index 18c9451..bcb48bc 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
@@ -73,10 +73,10 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(STAX_PORT, false)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(STAX_PORT, false),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index a5c3291..1da2a46 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
@@ -87,12 +87,12 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 9564387..4107e71 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
@@ -72,12 +72,12 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
index 6a99d39..62b0b12 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
@@ -89,12 +89,12 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
index cf86db3..354c0ec 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
@@ -114,121 +114,121 @@ public class WSSCTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
- return Arrays.asList(new TestParam[][] {
- {new TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2, false)},
- {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService", PORT, false)},
- {new TestParam("AC_IPingService", PORT, false)},
- {new TestParam("ADC_IPingService", PORT, false)},
- {new TestParam("ADC-ES_IPingService", PORT, false)},
- {new TestParam("_A_IPingService", PORT, false)},
- {new TestParam("_AD_IPingService", PORT, false)},
- {new TestParam("_AD-ES_IPingService", PORT, false)},
- {new TestParam("UXC_IPingService", PORT, false)},
- {new TestParam("UXDC_IPingService", PORT, false)},
- {new TestParam("UXDC-SEES_IPingService", PORT, false)},
- {new TestParam("_UX_IPingService", PORT, false)},
- {new TestParam("_UXD_IPingService", PORT, false)},
- {new TestParam("_UXD-SEES_IPingService", PORT, false)},
- {new TestParam("XC_IPingService", PORT, false)},
- {new TestParam("XDC_IPingService", PORT, false)},
- {new TestParam("XDC_IPingService1", PORT, false)},
- {new TestParam("XDC-ES_IPingService", PORT, false)},
- {new TestParam("XDC-SEES_IPingService", PORT, false)},
- {new TestParam("_X_IPingService", PORT, false)},
- {new TestParam("_X10_IPingService", PORT, false)},
- {new TestParam("_XD_IPingService", PORT, false)},
- {new TestParam("_XD-SEES_IPingService", PORT, false)},
- {new TestParam("_XD-ES_IPingService", PORT, false)},
+ public static Collection<TestParam> data() {
+ return Arrays.asList(new TestParam[] {
+ new TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2, false),
+ new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService", PORT, false),
+ new TestParam("AC_IPingService", PORT, false),
+ new TestParam("ADC_IPingService", PORT, false),
+ new TestParam("ADC-ES_IPingService", PORT, false),
+ new TestParam("_A_IPingService", PORT, false),
+ new TestParam("_AD_IPingService", PORT, false),
+ new TestParam("_AD-ES_IPingService", PORT, false),
+ new TestParam("UXC_IPingService", PORT, false),
+ new TestParam("UXDC_IPingService", PORT, false),
+ new TestParam("UXDC-SEES_IPingService", PORT, false),
+ new TestParam("_UX_IPingService", PORT, false),
+ new TestParam("_UXD_IPingService", PORT, false),
+ new TestParam("_UXD-SEES_IPingService", PORT, false),
+ new TestParam("XC_IPingService", PORT, false),
+ new TestParam("XDC_IPingService", PORT, false),
+ new TestParam("XDC_IPingService1", PORT, false),
+ new TestParam("XDC-ES_IPingService", PORT, false),
+ new TestParam("XDC-SEES_IPingService", PORT, false),
+ new TestParam("_X_IPingService", PORT, false),
+ new TestParam("_X10_IPingService", PORT, false),
+ new TestParam("_XD_IPingService", PORT, false),
+ new TestParam("_XD-SEES_IPingService", PORT, false),
+ new TestParam("_XD-ES_IPingService", PORT, false),
- {new TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2, true)},
+ new TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2, true),
// TODO Endorsing streaming not supported
- // {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService", PORT, true)},
- {new TestParam("AC_IPingService", PORT, true)},
- {new TestParam("ADC_IPingService", PORT, true)},
- {new TestParam("ADC-ES_IPingService", PORT, true)},
- {new TestParam("_A_IPingService", PORT, true)},
- {new TestParam("_AD_IPingService", PORT, true)},
- {new TestParam("_AD-ES_IPingService", PORT, true)},
- {new TestParam("UXC_IPingService", PORT, true)},
- {new TestParam("UXDC_IPingService", PORT, true)},
- {new TestParam("UXDC-SEES_IPingService", PORT, true)},
- {new TestParam("_UX_IPingService", PORT, true)},
- {new TestParam("_UXD_IPingService", PORT, true)},
- {new TestParam("_UXD-SEES_IPingService", PORT, true)},
+ // new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService", PORT, true),
+ new TestParam("AC_IPingService", PORT, true),
+ new TestParam("ADC_IPingService", PORT, true),
+ new TestParam("ADC-ES_IPingService", PORT, true),
+ new TestParam("_A_IPingService", PORT, true),
+ new TestParam("_AD_IPingService", PORT, true),
+ new TestParam("_AD-ES_IPingService", PORT, true),
+ new TestParam("UXC_IPingService", PORT, true),
+ new TestParam("UXDC_IPingService", PORT, true),
+ new TestParam("UXDC-SEES_IPingService", PORT, true),
+ new TestParam("_UX_IPingService", PORT, true),
+ new TestParam("_UXD_IPingService", PORT, true),
+ new TestParam("_UXD-SEES_IPingService", PORT, true),
// TODO Streaming endorsing not working
- // {new TestParam("XC_IPingService", PORT, true)},
- // {new TestParam("XDC_IPingService", PORT, true)},
- // {new TestParam("XDC_IPingService1", PORT, true)},
- // {new TestParam("XDC-ES_IPingService", PORT, true)},
- // {new TestParam("XDC-SEES_IPingService", PORT, true)},
- // {new TestParam("_X_IPingService", PORT, true)},
- {new TestParam("_X10_IPingService", PORT, true)},
+ // new TestParam("XC_IPingService", PORT, true),
+ // new TestParam("XDC_IPingService", PORT, true),
+ // new TestParam("XDC_IPingService1", PORT, true),
+ // new TestParam("XDC-ES_IPingService", PORT, true),
+ // new TestParam("XDC-SEES_IPingService", PORT, true),
+ // new TestParam("_X_IPingService", PORT, true),
+ new TestParam("_X10_IPingService", PORT, true),
// TODO Streaming endorsing not working
- // {new TestParam("_XD_IPingService", PORT, true)},
- // {new TestParam("_XD-SEES_IPingService", PORT, true)},
- // {new TestParam("_XD-ES_IPingService", PORT, true)},
+ // new TestParam("_XD_IPingService", PORT, true),
+ // new TestParam("_XD-SEES_IPingService", PORT, true),
+ // new TestParam("_XD-ES_IPingService", PORT, true),
- {new TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2, false)},
+ new TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2, false),
// TODO StAX Policy Validation error caused by incorrect DOM message
- // {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
- // STAX_PORT, false)},
- {new TestParam("AC_IPingService", STAX_PORT, false)},
- {new TestParam("ADC_IPingService", STAX_PORT, false)},
- {new TestParam("ADC-ES_IPingService", STAX_PORT, false)},
- {new TestParam("_A_IPingService", STAX_PORT, false)},
- {new TestParam("_AD_IPingService", STAX_PORT, false)},
- {new TestParam("_AD-ES_IPingService", STAX_PORT, false)},
- {new TestParam("UXC_IPingService", STAX_PORT, false)},
- {new TestParam("UXDC_IPingService", STAX_PORT, false)},
- {new TestParam("UXDC-SEES_IPingService", STAX_PORT, false)},
- {new TestParam("_UX_IPingService", STAX_PORT, false)},
- {new TestParam("_UXD_IPingService", STAX_PORT, false)},
- {new TestParam("_UXD-SEES_IPingService", STAX_PORT, false)},
- {new TestParam("XC_IPingService", STAX_PORT, false)},
- {new TestParam("XDC_IPingService", STAX_PORT, false)},
- {new TestParam("XDC_IPingService1", STAX_PORT, false)},
- {new TestParam("XDC-ES_IPingService", STAX_PORT, false)},
- {new TestParam("XDC-SEES_IPingService", STAX_PORT, false)},
- {new TestParam("_X_IPingService", STAX_PORT, false)},
- {new TestParam("_X10_IPingService", STAX_PORT, false)},
- {new TestParam("_XD_IPingService", STAX_PORT, false)},
- {new TestParam("_XD-SEES_IPingService", STAX_PORT, false)},
- {new TestParam("_XD-ES_IPingService", STAX_PORT, false)},
+ // new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
+ // STAX_PORT, false),
+ new TestParam("AC_IPingService", STAX_PORT, false),
+ new TestParam("ADC_IPingService", STAX_PORT, false),
+ new TestParam("ADC-ES_IPingService", STAX_PORT, false),
+ new TestParam("_A_IPingService", STAX_PORT, false),
+ new TestParam("_AD_IPingService", STAX_PORT, false),
+ new TestParam("_AD-ES_IPingService", STAX_PORT, false),
+ new TestParam("UXC_IPingService", STAX_PORT, false),
+ new TestParam("UXDC_IPingService", STAX_PORT, false),
+ new TestParam("UXDC-SEES_IPingService", STAX_PORT, false),
+ new TestParam("_UX_IPingService", STAX_PORT, false),
+ new TestParam("_UXD_IPingService", STAX_PORT, false),
+ new TestParam("_UXD-SEES_IPingService", STAX_PORT, false),
+ new TestParam("XC_IPingService", STAX_PORT, false),
+ new TestParam("XDC_IPingService", STAX_PORT, false),
+ new TestParam("XDC_IPingService1", STAX_PORT, false),
+ new TestParam("XDC-ES_IPingService", STAX_PORT, false),
+ new TestParam("XDC-SEES_IPingService", STAX_PORT, false),
+ new TestParam("_X_IPingService", STAX_PORT, false),
+ new TestParam("_X10_IPingService", STAX_PORT, false),
+ new TestParam("_XD_IPingService", STAX_PORT, false),
+ new TestParam("_XD-SEES_IPingService", STAX_PORT, false),
+ new TestParam("_XD-ES_IPingService", STAX_PORT, false),
- {new TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2, true)},
+ new TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2, true),
// TODO Endorsing derived keys not supported.
- // {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
- // STAX_PORT, true)},
- {new TestParam("AC_IPingService", STAX_PORT, true)},
- {new TestParam("ADC_IPingService", STAX_PORT, true)},
- {new TestParam("ADC-ES_IPingService", STAX_PORT, true)},
- {new TestParam("_A_IPingService", STAX_PORT, true)},
- {new TestParam("_AD_IPingService", STAX_PORT, true)},
- {new TestParam("_AD-ES_IPingService", STAX_PORT, true)},
- {new TestParam("UXC_IPingService", STAX_PORT, true)},
- {new TestParam("UXDC_IPingService", STAX_PORT, true)},
- {new TestParam("UXDC-SEES_IPingService", STAX_PORT, true)},
- {new TestParam("_UX_IPingService", STAX_PORT, true)},
- {new TestParam("_UXD_IPingService", STAX_PORT, true)},
- {new TestParam("_UXD-SEES_IPingService", STAX_PORT, true)},
+ // new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
+ // STAX_PORT, true),
+ new TestParam("AC_IPingService", STAX_PORT, true),
+ new TestParam("ADC_IPingService", STAX_PORT, true),
+ new TestParam("ADC-ES_IPingService", STAX_PORT, true),
+ new TestParam("_A_IPingService", STAX_PORT, true),
+ new TestParam("_AD_IPingService", STAX_PORT, true),
+ new TestParam("_AD-ES_IPingService", STAX_PORT, true),
+ new TestParam("UXC_IPingService", STAX_PORT, true),
+ new TestParam("UXDC_IPingService", STAX_PORT, true),
+ new TestParam("UXDC-SEES_IPingService", STAX_PORT, true),
+ new TestParam("_UX_IPingService", STAX_PORT, true),
+ new TestParam("_UXD_IPingService", STAX_PORT, true),
+ new TestParam("_UXD-SEES_IPingService", STAX_PORT, true),
// TODO Streaming endorsing not working
- // {new TestParam("XC_IPingService", STAX_PORT, true)},
- // {new TestParam("XDC_IPingService", STAX_PORT, true)},
- // {new TestParam("XDC_IPingService1", STAX_PORT, true)},
- // {new TestParam("XDC-ES_IPingService", STAX_PORT, true)},
- // {new TestParam("XDC-SEES_IPingService", STAX_PORT, true)},
- // {new TestParam("_X_IPingService", STAX_PORT, true)},
- {new TestParam("_X10_IPingService", STAX_PORT, true)},
+ // new TestParam("XC_IPingService", STAX_PORT, true),
+ // new TestParam("XDC_IPingService", STAX_PORT, true),
+ // new TestParam("XDC_IPingService1", STAX_PORT, true),
+ // new TestParam("XDC-ES_IPingService", STAX_PORT, true),
+ // new TestParam("XDC-SEES_IPingService", STAX_PORT, true),
+ // new TestParam("_X_IPingService", STAX_PORT, true),
+ new TestParam("_X10_IPingService", STAX_PORT, true),
// TODO Streaming endorsing not working
- // {new TestParam("_XD_IPingService", STAX_PORT, true)},
- // {new TestParam("_XD-SEES_IPingService", STAX_PORT, true)},
- // {new TestParam("_XD-ES_IPingService", STAX_PORT, true)},
+ // new TestParam("_XD_IPingService", STAX_PORT, true),
+ // new TestParam("_XD-SEES_IPingService", STAX_PORT, true),
+ // new TestParam("_XD-ES_IPingService", STAX_PORT, true),
- {new TestParam("AC_IPingService", PORT, false, true)},
- {new TestParam("AC_IPingService", PORT, true, true)},
- {new TestParam("AC_IPingService", STAX_PORT, false, true)},
- {new TestParam("AC_IPingService", STAX_PORT, true, true)},
+ new TestParam("AC_IPingService", PORT, false, true),
+ new TestParam("AC_IPingService", PORT, true, true),
+ new TestParam("AC_IPingService", STAX_PORT, false, true),
+ new TestParam("AC_IPingService", STAX_PORT, true, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index 081d114..e092d83 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -101,10 +101,10 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
index 276f8b6..18397ef 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
@@ -86,25 +86,25 @@ public class WSSecurity10Test extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
-
- return Arrays.asList(new TestParam[][] {
- {new TestParam("UserName", PORT, false)},
- {new TestParam("UserNameOverTransport", SSL_PORT, false)},
- {new TestParam("MutualCertificate10SignEncrypt", PORT, false)},
- {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, false)},
- {new TestParam("UserName", PORT, true)},
- {new TestParam("UserNameOverTransport", SSL_PORT, true)},
- {new TestParam("MutualCertificate10SignEncrypt", PORT, true)},
- {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, true)},
- {new TestParam("UserName", STAX_PORT, false)},
- {new TestParam("UserNameOverTransport", STAX_SSL_PORT, false)},
- {new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, false)},
- {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, false)},
- {new TestParam("UserName", STAX_PORT, true)},
- {new TestParam("UserNameOverTransport", STAX_SSL_PORT, true)},
- {new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, true)},
- {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, true)}
+ public static Collection<TestParam> data() {
+
+ return Arrays.asList(new TestParam[] {
+ new TestParam("UserName", PORT, false),
+ new TestParam("UserNameOverTransport", SSL_PORT, false),
+ new TestParam("MutualCertificate10SignEncrypt", PORT, false),
+ new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, false),
+ new TestParam("UserName", PORT, true),
+ new TestParam("UserNameOverTransport", SSL_PORT, true),
+ new TestParam("MutualCertificate10SignEncrypt", PORT, true),
+ new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, true),
+ new TestParam("UserName", STAX_PORT, false),
+ new TestParam("UserNameOverTransport", STAX_SSL_PORT, false),
+ new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, false),
+ new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, false),
+ new TestParam("UserName", STAX_PORT, true),
+ new TestParam("UserNameOverTransport", STAX_SSL_PORT, true),
+ new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, true),
+ new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, true)
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
index 4ae1b19..a421239 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
@@ -105,7 +105,7 @@ public class WSSecurity111Test extends WSSecurity11Common {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
String domPort = null;
if (unrestrictedPoliciesInstalled) {
domPort = Server11.PORT;
@@ -120,50 +120,50 @@ public class WSSecurity111Test extends WSSecurity11Common {
staxPort = StaxServer11Restricted.PORT;
}
- return Arrays.asList(new TestParam[][] {
- {new TestParam("A", domPort, false)},
- {new TestParam("A-NoTimestamp", domPort, false)},
- {new TestParam("AD", domPort, false)},
- {new TestParam("A-ES", domPort, false)},
- {new TestParam("AD-ES", domPort, false)},
- {new TestParam("UX", domPort, false)},
- {new TestParam("UX-NoTimestamp", domPort, false)},
- {new TestParam("UXD", domPort, false)},
- {new TestParam("UX-SEES", domPort, false)},
- {new TestParam("UXD-SEES", domPort, false)},
-
- {new TestParam("A", domPort, true)},
- {new TestParam("A-NoTimestamp", domPort, true)},
- {new TestParam("AD", domPort, true)},
- {new TestParam("A-ES", domPort, true)},
- {new TestParam("AD-ES", domPort, true)},
- {new TestParam("UX", domPort, true)},
- {new TestParam("UX-NoTimestamp", domPort, true)},
- {new TestParam("UXD", domPort, true)},
- {new TestParam("UX-SEES", domPort, true)},
- {new TestParam("UXD-SEES", domPort, true)},
-
- {new TestParam("A", staxPort, false)},
- {new TestParam("A-NoTimestamp", staxPort, false)},
- {new TestParam("AD", staxPort, false)},
- {new TestParam("A-ES", staxPort, false)},
- {new TestParam("AD-ES", staxPort, false)},
- {new TestParam("UX", staxPort, false)},
- {new TestParam("UX-NoTimestamp", staxPort, false)},
- {new TestParam("UXD", staxPort, false)},
- {new TestParam("UX-SEES", staxPort, false)},
- {new TestParam("UXD-SEES", staxPort, false)},
-
- {new TestParam("A", staxPort, true)},
- {new TestParam("A-NoTimestamp", staxPort, true)},
- {new TestParam("AD", staxPort, true)},
- {new TestParam("A-ES", staxPort, true)},
- {new TestParam("AD-ES", staxPort, true)},
- {new TestParam("UX", staxPort, true)},
- {new TestParam("UX-NoTimestamp", staxPort, true)},
- {new TestParam("UXD", staxPort, true)},
- {new TestParam("UX-SEES", staxPort, true)},
- {new TestParam("UXD-SEES", staxPort, true)},
+ return Arrays.asList(new TestParam[] {
+ new TestParam("A", domPort, false),
+ new TestParam("A-NoTimestamp", domPort, false),
+ new TestParam("AD", domPort, false),
+ new TestParam("A-ES", domPort, false),
+ new TestParam("AD-ES", domPort, false),
+ new TestParam("UX", domPort, false),
+ new TestParam("UX-NoTimestamp", domPort, false),
+ new TestParam("UXD", domPort, false),
+ new TestParam("UX-SEES", domPort, false),
+ new TestParam("UXD-SEES", domPort, false),
+
+ new TestParam("A", domPort, true),
+ new TestParam("A-NoTimestamp", domPort, true),
+ new TestParam("AD", domPort, true),
+ new TestParam("A-ES", domPort, true),
+ new TestParam("AD-ES", domPort, true),
+ new TestParam("UX", domPort, true),
+ new TestParam("UX-NoTimestamp", domPort, true),
+ new TestParam("UXD", domPort, true),
+ new TestParam("UX-SEES", domPort, true),
+ new TestParam("UXD-SEES", domPort, true),
+
+ new TestParam("A", staxPort, false),
+ new TestParam("A-NoTimestamp", staxPort, false),
+ new TestParam("AD", staxPort, false),
+ new TestParam("A-ES", staxPort, false),
+ new TestParam("AD-ES", staxPort, false),
+ new TestParam("UX", staxPort, false),
+ new TestParam("UX-NoTimestamp", staxPort, false),
+ new TestParam("UXD", staxPort, false),
+ new TestParam("UX-SEES", staxPort, false),
+ new TestParam("UXD-SEES", staxPort, false),
+
+ new TestParam("A", staxPort, true),
+ new TestParam("A-NoTimestamp", staxPort, true),
+ new TestParam("AD", staxPort, true),
+ new TestParam("A-ES", staxPort, true),
+ new TestParam("AD-ES", staxPort, true),
+ new TestParam("UX", staxPort, true),
+ new TestParam("UX-NoTimestamp", staxPort, true),
+ new TestParam("UXD", staxPort, true),
+ new TestParam("UX-SEES", staxPort, true),
+ new TestParam("UXD-SEES", staxPort, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
index 1512472..27c9c3d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
@@ -106,40 +106,40 @@ public class WSSecurity112Test extends WSSecurity11Common {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
if (unrestrictedPoliciesInstalled) {
- return Arrays.asList(new TestParam[][] {
- {new TestParam("X", Server12.PORT, false)},
- {new TestParam("X-NoTimestamp", Server12.PORT, false)},
- {new TestParam("X-AES128", Server12.PORT, false)},
- {new TestParam("X-AES256", Server12.PORT, false)},
- {new TestParam("X-TripleDES", Server12.PORT, false)},
- {new TestParam("XD", Server12.PORT, false)},
- {new TestParam("XD-ES", Server12.PORT, false)},
- {new TestParam("XD-SEES", Server12.PORT, false)},
-
- {new TestParam("X", StaxServer12.PORT, false)},
- {new TestParam("X-NoTimestamp", StaxServer12.PORT, false)},
- {new TestParam("X-AES128", StaxServer12.PORT, false)},
- {new TestParam("X-AES256", StaxServer12.PORT, false)},
- {new TestParam("X-TripleDES", StaxServer12.PORT, false)},
- {new TestParam("XD", StaxServer12.PORT, false)},
- {new TestParam("XD-ES", StaxServer12.PORT, false)},
- {new TestParam("XD-SEES", StaxServer12.PORT, false)},
+ return Arrays.asList(new TestParam[] {
+ new TestParam("X", Server12.PORT, false),
+ new TestParam("X-NoTimestamp", Server12.PORT, false),
+ new TestParam("X-AES128", Server12.PORT, false),
+ new TestParam("X-AES256", Server12.PORT, false),
+ new TestParam("X-TripleDES", Server12.PORT, false),
+ new TestParam("XD", Server12.PORT, false),
+ new TestParam("XD-ES", Server12.PORT, false),
+ new TestParam("XD-SEES", Server12.PORT, false),
+
+ new TestParam("X", StaxServer12.PORT, false),
+ new TestParam("X-NoTimestamp", StaxServer12.PORT, false),
+ new TestParam("X-AES128", StaxServer12.PORT, false),
+ new TestParam("X-AES256", StaxServer12.PORT, false),
+ new TestParam("X-TripleDES", StaxServer12.PORT, false),
+ new TestParam("XD", StaxServer12.PORT, false),
+ new TestParam("XD-ES", StaxServer12.PORT, false),
+ new TestParam("XD-SEES", StaxServer12.PORT, false),
});
}
- return Arrays.asList(new TestParam[][] {
- {new TestParam("X", Server12Restricted.PORT, false)},
- {new TestParam("X-NoTimestamp", Server12Restricted.PORT, false)},
- {new TestParam("XD", Server12Restricted.PORT, false)},
- {new TestParam("XD-ES", Server12Restricted.PORT, false)},
- {new TestParam("XD-SEES", Server12Restricted.PORT, false)},
-
- {new TestParam("X", StaxServer12Restricted.PORT, false)},
- {new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, false)},
- {new TestParam("XD", StaxServer12Restricted.PORT, false)},
- {new TestParam("XD-ES", StaxServer12Restricted.PORT, false)},
- {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
+ return Arrays.asList(new TestParam[] {
+ new TestParam("X", Server12Restricted.PORT, false),
+ new TestParam("X-NoTimestamp", Server12Restricted.PORT, false),
+ new TestParam("XD", Server12Restricted.PORT, false),
+ new TestParam("XD-ES", Server12Restricted.PORT, false),
+ new TestParam("XD-SEES", Server12Restricted.PORT, false),
+
+ new TestParam("X", StaxServer12Restricted.PORT, false),
+ new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, false),
+ new TestParam("XD", StaxServer12Restricted.PORT, false),
+ new TestParam("XD-ES", StaxServer12Restricted.PORT, false),
+ new TestParam("XD-SEES", StaxServer12Restricted.PORT, false),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 25fdfe5..28d14af 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -96,12 +96,12 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
index a9e444f..ceccb75 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
@@ -79,12 +79,12 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
}
@Parameters(name = "{0}")
- public static Collection<TestParam[]> data() {
+ public static Collection<TestParam> data() {
- return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
- {new TestParam(PORT, true)},
- {new TestParam(STAX_PORT, false)},
- {new TestParam(STAX_PORT, true)},
+ return Arrays.asList(new TestParam[] {new TestParam(PORT, false),
+ new TestParam(PORT, true),
+ new TestParam(STAX_PORT, false),
+ new TestParam(STAX_PORT, true),
});
}