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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov  4 14:40:40 2016
New Revision: 8557

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8557&view=rev
Log:
Add check of result cache key to unit tests.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java?rev=8557&r1=8556&r2=8557&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java	Fri Nov  4 14:40:40 2016
@@ -233,6 +233,7 @@
         dependsAttributes.put("affiliation", attributeValues);
         final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
         Assert.assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+        Assert.assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
     }
 
     @Test public void resolveWithMultiValueDepends() throws ComponentInitializationException, ResolutionException {
@@ -252,6 +253,9 @@
         Assert.assertEquals(
                 filter.getSearchFilter().format(),
                 "(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
+        Assert.assertEquals(
+                filter.getResultCacheKey(),
+                "(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
     }
 
     @Test public void escape() throws ComponentInitializationException, ResolutionException {
@@ -263,6 +267,7 @@
                         TestSources.SP_ENTITY_ID);
         final ExecutableSearchFilter filter = builder.build(context, null);
         Assert.assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
+        Assert.assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
     }
 
     @Test public void resolveTemplate() throws ComponentInitializationException, ResolutionException {
@@ -296,6 +301,7 @@
         dependsAttributes.put("affiliation", attributeValues);
         final ExecutableSearchFilter filter = builder.build(context, dependsAttributes);
         Assert.assertEquals(filter.getSearchFilter().format(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
+        Assert.assertEquals(filter.getResultCacheKey(), "(&(cn=PETER_THE_PRINCIPAL)(eduPersonAffiliation=student))");
     }
 
     @Test public void resolveTemplateWithMultiValueDepends() throws ComponentInitializationException, ResolutionException {
@@ -316,6 +322,9 @@
         Assert.assertEquals(
                 filter.getSearchFilter().format(),
                 "(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
+        Assert.assertEquals(
+                filter.getResultCacheKey(),
+                "(&(cn=PETER_THE_PRINCIPAL)(eduPersonEntitlement=entitlement1)(eduPersonEntitlement=entitlement\\2a))");
     }
 
     @Test public void escapeTemplate() throws ComponentInitializationException, ResolutionException {
@@ -328,6 +337,7 @@
                         TestSources.SP_ENTITY_ID);
         final ExecutableSearchFilter filter = builder.build(context, null);
         Assert.assertEquals(filter.getSearchFilter().format(), "(cn=domain\\5cuser\\2a)");
+        Assert.assertEquals(filter.getResultCacheKey(), "(cn=domain\\5cuser\\2a)");
     }
 
     protected void resolve(final ExecutableSearchBuilder builder) throws ComponentInitializationException,