[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/Process...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Oct 26 10:37:36 2014
New Revision: 6784

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6784&view=rev
Log:
Fix unit tests.

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java?rev=6784&r1=6783&r2=6784&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java Sun Oct 26 10:37:36 2014
@@ -190,15 +190,10 @@
         Assert.assertNotNull(sessionCtx);
         Assert.assertEquals(session.getId(), sessionCtx.getIdPSession().getId());
         
-        final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class, true);
-        Assert.assertEquals(logoutCtx.getSessionMap().size(), 1);
-        
-        SAML2SPSession sp = (SAML2SPSession) logoutCtx.getSessions(ActionTestingSupport.INBOUND_MSG_ISSUER).iterator().next();
-        Assert.assertNotNull(sp);
-        Assert.assertEquals(sp.getCreationInstant(), creation);
-        Assert.assertEquals(sp.getExpirationInstant(), expiration);
-        Assert.assertTrue(SAML2ObjectSupport.areNameIDsEquivalent(nameId, sp.getNameID()));
-        Assert.assertEquals(sp.getSessionIndex(), "index");
+        final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class);
+        if (logoutCtx != null) {
+            Assert.assertEquals(logoutCtx.getSessionMap().size(), 0);
+        }
     }
     
     @Test public void testSessionTwoSPSessions() throws SessionException, ResolverException {
@@ -232,16 +227,9 @@
         Assert.assertEquals(session.getId(), sessionCtx.getIdPSession().getId());
         
         final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class, true);
-        Assert.assertEquals(logoutCtx.getSessionMap().size(), 2);
-        
-        SAML2SPSession sp = (SAML2SPSession) logoutCtx.getSessions(ActionTestingSupport.INBOUND_MSG_ISSUER).iterator().next();
-        Assert.assertNotNull(sp);
-        Assert.assertEquals(sp.getCreationInstant(), creation);
-        Assert.assertEquals(sp.getExpirationInstant(), expiration);
-        Assert.assertTrue(SAML2ObjectSupport.areNameIDsEquivalent(nameId, sp.getNameID()));
-        Assert.assertEquals(sp.getSessionIndex(), "index");
-
-        sp = (SAML2SPSession) logoutCtx.getSessions(ActionTestingSupport.INBOUND_MSG_ISSUER + "/2").iterator().next();
+        Assert.assertEquals(logoutCtx.getSessionMap().size(), 1);
+        
+        final SAML2SPSession sp = (SAML2SPSession) logoutCtx.getSessions(ActionTestingSupport.INBOUND_MSG_ISSUER + "/2").iterator().next();
         Assert.assertNotNull(sp);
         Assert.assertEquals(sp.getCreationInstant(), creation);
         Assert.assertEquals(sp.getExpirationInstant(), expiration);
@@ -317,14 +305,10 @@
         Assert.assertNotNull(sessionCtx);
         Assert.assertEquals(session.getId(), sessionCtx.getIdPSession().getId());
         
-        final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class, true);
-        Assert.assertEquals(logoutCtx.getSessionMap().size(), 1);
-        SAML2SPSession sp = (SAML2SPSession) logoutCtx.getSessions(ActionTestingSupport.INBOUND_MSG_ISSUER).iterator().next();
-        Assert.assertNotNull(sp);
-        Assert.assertEquals(sp.getCreationInstant(), creation);
-        Assert.assertEquals(sp.getExpirationInstant(), expiration);
-        Assert.assertTrue(SAML2ObjectSupport.areNameIDsEquivalent(nameId, sp.getNameID()));
-        Assert.assertEquals(sp.getSessionIndex(), "index");
+        final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class, false);
+        if (logoutCtx != null) {
+            Assert.assertEquals(logoutCtx.getSessionMap().size(), 0);
+        }
         
         sessionManager.destroySession(session2.getId(), false);
     }
@@ -364,21 +348,10 @@
         final SessionContext sessionCtx = prc.getSubcontext(SessionContext.class);
         Assert.assertNull(sessionCtx);
         
-        final LogoutContext logoutCtx = prc.getSubcontext(LogoutContext.class, true);
-        Assert.assertEquals(logoutCtx.getSessionMap().size(), 2);
-        SAML2SPSession sp = (SAML2SPSession) logoutCtx.getSessionMap().get(ActionTestingSupport.INBOUND_MSG_ISSUER).toArray()[0];
-        Assert.assertNotNull(sp);
-        Assert.assertEquals(sp.getCreationInstant(), creation);
-        Assert.assertEquals(sp.getExpirationInstant(), expiration);
-        Assert.assertTrue(SAML2ObjectSupport.areNameIDsEquivalent(nameId, sp.getNameID()));
-        Assert.assertTrue("index".equals(sp.getSessionIndex()) || "index2".equals(sp.getSessionIndex()));
-

[... 14 lines stripped ...]