[java-shib-attribute] branch main updated: Fix some red in tests from earlier changes.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new 553394f0e Fix some red in tests from earlier changes.
553394f0e is described below

commit 553394f0e86c63c9dd5c54f633132041b8559285
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 2 10:31:46 2023 -0400

    Fix some red in tests from earlier changes.
---
 .../idp/attribute/filter/spring/AttributeFilterFailFastTest.java   | 7 +++----
 .../resolver/spring/failfast/AttributeResolverFailFastTest.java    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterFailFastTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterFailFastTest.java
index 68f5c065e..9fd6f7247 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterFailFastTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterFailFastTest.java
@@ -27,7 +27,6 @@ import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
-import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.service.ReloadableService;
 import net.shibboleth.shared.service.ServiceException;
 import net.shibboleth.shared.service.ServiceableComponent;
@@ -48,9 +47,9 @@ public class AttributeFilterFailFastTest extends AbstractFailFastTest {
         
         final Object bean = getBean(propertySource("ServiceConfiguration", makePath("attributeFilterGood.xml")), "filterBeansDefaultFF.xml");
         final ReloadableService<AttributeFilter> service = (ReloadableService<AttributeFilter>) bean;
-        assertNotNull(service);
+        assert service != null;
         try (ServiceableComponent<AttributeFilter> servicableComponent = service.getServiceableComponent()) {
-            assert servicableComponent!=null;
+            assert servicableComponent != null;
             final AttributeFilter filter = servicableComponent.getComponent();
             assertNotNull(filter);
         }
@@ -70,7 +69,7 @@ public class AttributeFilterFailFastTest extends AbstractFailFastTest {
             assertNull(service);
             return;
         }
-        assertNotNull(service);
+        assert service != null;
         try {
             service.getServiceableComponent();
             fail("Should have failed");
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
index 741f1a2e4..4962390c3 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
@@ -90,7 +90,7 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
     public void workingAttributeResolver(final String file, final MockPropertySource props) throws IOException {
        final Object bean = getBean(props, "attributeResolverBeansDefaultFF.xml");
        final ReloadableService<AttributeResolver > service = (ReloadableService<AttributeResolver>) bean;
-       assertNotNull(service);
+       assert service != null;
        try (final ServiceableComponent<AttributeResolver> component = service.getServiceableComponent()) {
            final AttributeResolver resolver = component.getComponent();
            assertNotNull(resolver);
@@ -125,7 +125,7 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
             assertNull(service);
             return;
         }
-        assertNotNull(service);
+        assert service != null;
         
         try {
             service.getServiceableComponent();

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