[java-shib-attribute] 05/11: Fix more tests.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-5.1
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=f56cf05623a61b9ad62f93be5db67dbea7098a9c

commit f56cf05623a61b9ad62f93be5db67dbea7098a9c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 4 16:19:52 2024 -0400

    Fix more tests.
---
 .../java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java | 3 ++-
 .../idp/attribute/resolver/impl/AttributeResolutionContextTest.java   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
index 7d256883d..0d368ce66 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
@@ -23,6 +23,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
 import org.testng.annotations.Test;
 
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.attribute.resolver.logic.AttributeIssuerIdPredicate;
 import net.shibboleth.idp.attribute.resolver.logic.AttributePrincipalPredicate;
 import net.shibboleth.idp.attribute.resolver.logic.AttributeRecipientIdPredicate;
@@ -69,7 +70,7 @@ public class LogicTest {
     @Test public void correct() {
         final ProfileRequestContext pfc = new ProfileRequestContext();
         final AttributeResolutionContext arc = pfc.ensureSubcontext(AttributeResolutionContext.class);
-        assert arc != null;
+        arc.ensureSubcontext(AttributeResolverWorkContext.class);
         
         arc.setAttributeIssuerID("AII");
         arc.setPrincipal("Principal");
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
index 18db59906..cbe92bb6f 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
@@ -29,6 +29,7 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.attribute.resolver.context.navigate.AttributeIssuerIdLookupFunction;
 import net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction;
 import net.shibboleth.idp.attribute.resolver.context.navigate.AttributeRecipientIdLookupFunction;
@@ -101,7 +102,7 @@ public class AttributeResolutionContextTest {
     @Test public void lookupsParent() {
         final ProfileRequestContext profileCtx = new ProfileRequestContext();
         final AttributeResolutionContext context = profileCtx.ensureSubcontext(AttributeResolutionContext.class);
-        assert context != null;
+        context.ensureSubcontext(AttributeResolverWorkContext.class);
 
         context.setPrincipal(THE_PRINCIPAL);
         context.setAttributeIssuerID(THE_ISSUER);
@@ -122,6 +123,7 @@ public class AttributeResolutionContextTest {
         
     @Test public void lookupsChild() {
         final AttributeResolutionContext context = new AttributeResolutionContext();
+        context.ensureSubcontext(AttributeResolverWorkContext.class);
         final ProfileRequestContext profileCtx = context.ensureSubcontext(ProfileRequestContext.class);
         
         context.setPrincipal(THE_PRINCIPAL);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.