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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jan 19 08:59:47 2014
New Revision: 5213

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5213&view=rev
Log:
SAML testing has no need of the IdP EntityID now, so remove it from the helper which creates the filter context.

Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterInEntityGroupPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/BaseMetadataTests.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/RegistrationAuthorityTest.java

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRuleTest.java?rev=5213&r1=5212&r2=5213&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRuleTest.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRuleTest.java Sun Jan 19 08:59:47 2014
@@ -1,9 +1,9 @@
 /*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
  * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License.  You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
@@ -47,9 +47,9 @@
     @Test public void testValue() throws ComponentInitializationException {
 
         AttributeRequesterEntityAttributeExactPolicyRule matcher = getMatcher();
-        Assert.assertEquals(matcher.matches(metadataContext(null, idpEntity, "Principal")), Tristate.TRUE);
+        Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
 
-        Assert.assertEquals(matcher.matches(metadataContext(null, jiraEntity, "Principal")), Tristate.FALSE);
+        Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
 
     }
 
@@ -58,33 +58,33 @@
         AttributeRequesterEntityAttributeExactPolicyRule matcher =
                 getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", null);
         Assert.assertEquals(matcher.getValue(), "urn:example.org:entitlements:1234");
-        Assert.assertEquals(matcher.matches(metadataContext(null, idpEntity, "Principal")), Tristate.TRUE);
+        Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.TRUE);
 
-        Assert.assertEquals(matcher.matches(metadataContext(null, wikiEntity, "Principal")), Tristate.FALSE);
+        Assert.assertEquals(matcher.matches(metadataContext(wikiEntity, "Principal")), Tristate.FALSE);
 
         matcher = getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", "foo");
-        Assert.assertEquals(matcher.matches(metadataContext(null, idpEntity, "Principal")), Tristate.FALSE);
+        Assert.assertEquals(matcher.matches(metadataContext(idpEntity, "Principal")), Tristate.FALSE);
 
-        Assert.assertEquals(matcher.matches(metadataContext(null, jiraEntity, "Principal")), Tristate.FALSE);
+        Assert.assertEquals(matcher.matches(metadataContext(jiraEntity, "Principal")), Tristate.FALSE);
 
         matcher =
                 getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234",
                         "urn:oasis:names:tc:SAML:2.0:attrname-format:uri");

[... 253 lines stripped ...]