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 2019/05/02 14:37:50 UTC
[cxf] 01/03: Making an STS unit test less likely to fail
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9fdbfadea75db9a9d1864fcc7189df5a725211c7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 2 10:54:22 2019 +0100
Making an STS unit test less likely to fail
(cherry picked from commit 7a4335c3c205632ec2b6a08372b878a4356ab9ad)
---
.../sts/token/provider/SAMLProviderRealmTest.java | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
index e604a0b..c6935dd 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java
@@ -74,9 +74,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
Element token = (Element)providerResponse.getToken();
String tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertTrue(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertTrue(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Realm "B"
providerParameters.setRealm("B");
@@ -88,9 +88,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertTrue(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Default Realm
providerParameters.setRealm(null);
@@ -102,9 +102,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertTrue(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"STS\""));
}
@SuppressWarnings("deprecation")
@@ -135,9 +135,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
Element token = (Element)providerResponse.getToken();
String tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertTrue(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertTrue(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Realm "B"
providerParameters.setRealm("B");
@@ -149,9 +149,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertTrue(tokenString.contains("B-Issuer"));
- assertFalse(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"STS\""));
// Default Realm
providerParameters.setRealm(null);
@@ -163,9 +163,9 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
token = (Element)providerResponse.getToken();
tokenString = DOM2Writer.nodeToString(token);
assertTrue(tokenString.contains(providerResponse.getTokenId()));
- assertFalse(tokenString.contains("A-Issuer"));
- assertFalse(tokenString.contains("B-Issuer"));
- assertTrue(tokenString.contains("STS"));
+ assertFalse(tokenString.contains("Issuer=\"A-Issuer\""));
+ assertFalse(tokenString.contains("Issuer=\"B-Issuer\""));
+ assertTrue(tokenString.contains("Issuer=\"STS\""));
}
private TokenProviderParameters createProviderParameters(