[java-identity-provider COMMIT] /trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul  2 04:54:26 2014
New Revision: 6201

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6201&view=rev
Log:
IDP-394 (for now) supress Scripted tests for JDK8

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java?rev=6201&r1=6200&r2=6201&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java Wed Jul  2 04:54:26 2014
@@ -41,6 +41,11 @@
 public class ScriptedTest extends BaseAttributeFilterParserTest {
 
     private Map<String, IdPAttribute> epaUid;
+    
+    private boolean isV8() {
+        final String ver = System.getProperty("java.version");
+        return ver.startsWith("1.8");
+    }
 
     @BeforeClass public void setupAttributes() throws ComponentInitializationException, ResolutionException {
 
@@ -48,6 +53,9 @@
     }
 
     @Test public void policy() throws ComponentInitializationException {
+        if (isV8()) {
+            return;
+        }
         final ScriptedPolicyRule rule = (ScriptedPolicyRule) getPolicyRule("scripted.xml");
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
@@ -56,10 +64,16 @@
     }
     
     @Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void policyNotFound() throws ComponentInitializationException {
+        if (isV8()) {
+            return;
+        }
         getPolicyRule("scriptedNotThere.xml");
     }
     
     @Test public void matcher()  throws ComponentInitializationException {
+        if (isV8()) {
+            return;
+        }
         final ScriptedMatcher matcher = (ScriptedMatcher) getMatcher("scripted.xml");
         
         AttributeFilterContext filterContext = new AttributeFilterContext();