[java-identity-provider COMMIT] in /trunk/idp-session-impl/src/test: java/net/shibboleth/idp/session/impl/StorageBack...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul  1 10:06:55 2014
New Revision: 6198

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6198&view=rev
Log:
Fix for JDK 8 test.

Added:
    trunk/idp-session-impl/src/test/resources/data/net/shibboleth/idp/session/impl/complexIdPSession.jdk8
Modified:
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java

Modified: trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java?rev=6198&r1=6197&r2=6198&view=diff
==============================================================================
--- trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java (original)
+++ trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java Tue Jul  1 10:06:55 2014
@@ -114,7 +114,7 @@
         session.doAddSPSession(new BasicSPSession("baz", "c", INSTANT, exp));
         
         String s = serializer.serialize(session);
-        String s2 = fileToString(DATAPATH + "complexIdPSession.json");
+        String s2 = fileToString(DATAPATH + "complexIdPSession." + (isV8() ? "jdk8" : "json"));
         Assert.assertEquals(s, s2);
         
         StorageBackedIdPSession session2 = serializer.deserialize(1, "test", KEY, s2, exp);
@@ -123,6 +123,11 @@
         Assert.assertEquals(session.getPrincipalName(), session2.getPrincipalName());
         Assert.assertEquals(session.getCreationInstant(), session2.getCreationInstant());
         Assert.assertEquals(session.getLastActivityInstant(), session2.getLastActivityInstant());
+    }
+    
+    private boolean isV8() {
+        final String ver = System.getProperty("java.version");
+        return ver.startsWith("1.8");
     }
     
     private String fileToString(String pathname) throws URISyntaxException, IOException {