cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf-fediz git commit: Fixing merge
Date Tue, 22 Dec 2015 15:52:04 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/aafd1c27
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/aafd1c27
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/aafd1c27

Branch: refs/heads/1.2.x-fixes
Commit: aafd1c27563ff8e609501d4490b693c93d4e174e
Parents: fb2744a
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Dec 22 15:51:53 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Dec 22 15:51:53 2015 +0000

----------------------------------------------------------------------
 .../cxf/fediz/service/idp/integrationtests/RestITTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/aafd1c27/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
----------------------------------------------------------------------
diff --git a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
index 8c02d11..ef64b2d 100644
--- a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
+++ b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
@@ -119,7 +119,7 @@ public class RestITTest {
             Assert.assertEquals("Number of TokenTypesOffered doesn't match",
                                 2, idp.getTokenTypesOffered().size());
             Assert.assertEquals("Number of applications doesn't match",
-                                2, idp.getApplications().size());
+                                1, idp.getApplications().size());
             Assert.assertEquals("Number of trusted IDPs doesn't match",
                                 1, idp.getTrustedIdps().size());
             Assert.assertEquals("Number of claims doesn't match",
@@ -136,7 +136,7 @@ public class RestITTest {
             Assert.assertEquals("ServiceDisplayName doesn't match",
                                 "REALM B", idp.getServiceDisplayName());
             Assert.assertEquals("IdpUrl doesn't match",
-                                new URL("https://localhost:12443/fediz-idp-remote/federation"),
idp.getIdpUrl());
+                                new URL("https://localhost:12443/fediz-idp/federation"),
idp.getIdpUrl());
             Assert.assertEquals("StsUrl doesn't match",
                                 new URL("https://localhost:12443/fediz-idp-sts/REALMB"),
idp.getStsUrl());
             Assert.assertEquals("Uri doesn't match",


Mime
View raw message