Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5D131859F for ; Tue, 22 Dec 2015 15:52:01 +0000 (UTC) Received: (qmail 14996 invoked by uid 500); 22 Dec 2015 15:52:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14929 invoked by uid 500); 22 Dec 2015 15:52:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14740 invoked by uid 99); 22 Dec 2015 15:52:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 15:52:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57C62E05D0; Tue, 22 Dec 2015 15:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Tue, 22 Dec 2015 15:52:04 -0000 Message-Id: <2611b24ab3a94e18bd43ef58eb1fb002@git.apache.org> In-Reply-To: <5eeb25297d0148ef8735abfb59be2e7c@git.apache.org> References: <5eeb25297d0148ef8735abfb59be2e7c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cxf-fediz git commit: Fixing merge 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 Authored: Tue Dec 22 15:51:53 2015 +0000 Committer: Colm O hEigeartaigh 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",