[java-identity-provider] 14/27: Fix tests after API change.
Scott Cantor
cantor.2 at osu.edu
Fri May 3 14:32:04 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=93c4b6c1f197e276097176b86de59f2b598db750
commit 93c4b6c1f197e276097176b86de59f2b598db750
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 23 11:59:28 2019 -0400
Fix tests after API change.
---
.../transcoding/impl/SAML1ByteAttributeTranscoderTest.java | 8 ++++----
.../impl/SAML1ScopedStringAttributeTranscoderTest.java | 8 ++++----
.../transcoding/impl/SAML1StringAttributeTranscoderTest.java | 8 ++++----
.../transcoding/impl/SAML2ByteAttributeTranscoderTest.java | 8 ++++----
.../impl/SAML2ScopedStringAttributeTranscoderTest.java | 8 ++++----
.../transcoding/impl/SAML2StringAttributeTranscoderTest.java | 8 ++++----
.../transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java | 8 ++++----
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index 62a3885..65e744d 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -176,7 +176,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ScopedStringAttributeValue("foo", "bar"),
new IdPAttributeValue<Object>() {
public Object getValue() {
@@ -198,7 +198,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ByteAttributeValue(BYTE_ARRAY_1));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
@@ -233,7 +233,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ByteAttributeValue(BYTE_ARRAY_1));
final IdPRequestedAttribute inputAttribute = new IdPRequestedAttribute(ATTR_NAME);
@@ -291,7 +291,7 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(BYTE_ARRAY_1), new ByteAttributeValue(BYTE_ARRAY_2));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index 657624b..dde03a9 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -170,7 +170,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
@Override
public Object getValue() {
@@ -193,7 +193,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1),
new StringAttributeValue(STRING_1),
@@ -231,7 +231,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1));
@@ -278,7 +278,7 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1),
new ScopedStringAttributeValue(STRING_2, SCOPE_2));
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index c7521c7..bd2410a 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -173,7 +173,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
@Override
public Object getValue() {
@@ -196,7 +196,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new StringAttributeValue(STRING_1));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
@@ -230,7 +230,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new StringAttributeValue(STRING_1));
final IdPRequestedAttribute inputAttribute = new IdPRequestedAttribute(ATTR_NAME);
@@ -271,7 +271,7 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new StringAttributeValue(STRING_1),
new StringAttributeValue(STRING_2),
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index 09f252a..db65966 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -169,7 +169,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ScopedStringAttributeValue("foo", "bar"),
new IdPAttributeValue<Object>() {
public Object getValue() {
@@ -191,7 +191,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ByteAttributeValue(BYTE_ARRAY_1));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
@@ -227,7 +227,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new StringAttributeValue("foo"), new ByteAttributeValue(BYTE_ARRAY_1));
final IdPRequestedAttribute inputAttribute = new IdPRequestedAttribute(ATTR_NAME);
@@ -328,7 +328,7 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(BYTE_ARRAY_1), new ByteAttributeValue(BYTE_ARRAY_2));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index 766b5ea..03e4cee 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -171,7 +171,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
@Override
public Object getValue() {
@@ -194,7 +194,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1),
new StringAttributeValue(STRING_1),
@@ -232,7 +232,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1));
@@ -323,7 +323,7 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new ScopedStringAttributeValue(STRING_1, SCOPE_1),
new ScopedStringAttributeValue(STRING_2, SCOPE_2));
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index 1923161..00e57d7 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -166,7 +166,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
@Override
public Object getValue() {
@@ -189,7 +189,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void single() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new StringAttributeValue(STRING_1));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
@@ -224,7 +224,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void singleRequested() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new StringAttributeValue(STRING_1));
final IdPRequestedAttribute inputAttribute = new IdPRequestedAttribute(ATTR_NAME);
@@ -308,7 +308,7 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
}
@Test public void multi() throws Exception {
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}),
new StringAttributeValue(STRING_1),
new StringAttributeValue(STRING_2),
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index 482699a..ae3851c 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -173,7 +173,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void inappropriate() throws Exception {
final int[] intArray = {1, 2, 3, 4};
- final Collection<? extends IdPAttributeValue<?>> values =
+ final Collection<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), new IdPAttributeValue<Object>() {
@Override
public Object getValue() {
@@ -196,7 +196,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
}
@Test public void single() throws Exception {
- final List<? extends IdPAttributeValue<?>> values =
+ final List<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), objectFor(STRING_1));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
@@ -226,7 +226,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
}
@Test public void singleRequested() throws Exception {
- final List<? extends IdPAttributeValue<?>> values =
+ final List<IdPAttributeValue<?>> values =
Arrays.asList(new ByteAttributeValue(new byte[] {1, 2, 3,}), objectFor(STRING_1));
final IdPRequestedAttribute inputAttribute = new IdPRequestedAttribute(ATTR_NAME);
@@ -318,7 +318,7 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
}
@Test public void multi() throws Exception {
- final List<? extends IdPAttributeValue<?>> values =
+ final List<IdPAttributeValue<?>> values =
Arrays.asList(objectFor(STRING_1), objectFor(STRING_2));
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list