[java-identity-provider] 02/03: Checkstyle: More tests changed to use #test() not #apply()

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d792a7dbe4299d905aa9ed712902bf1eb3a1a5c0

commit d792a7dbe4299d905aa9ed712902bf1eb3a1a5c0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Feb 12 16:18:18 2019 +0000

    Checkstyle: More tests changed to use #test() not #apply()
---
 .../logic/impl/IsConsentRequiredPredicateTest.java | 26 +++++++++++-----------
 .../spring/logic/RelyingPartyIdPredicateTest.java  |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
index d62be18..005b15b 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
@@ -154,13 +154,13 @@ public class IsConsentRequiredPredicateTest {
     }
 
     @Test public void testNullInput() {
-        Assert.assertFalse(p.apply(null));
+        Assert.assertFalse(p.test(null));
     }
 
     @Test public void testNullConsentContext() {
         Assert.assertNull(prc.getSubcontext(ConsentContext.class));
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testNullConsentFlowDescriptor() {
@@ -171,7 +171,7 @@ public class IsConsentRequiredPredicateTest {
         Assert.assertNotNull(prc.getSubcontext(ProfileInterceptorContext.class));
         Assert.assertNull(prc.getSubcontext(ProfileInterceptorContext.class).getAttemptedFlow());
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testNoPreviousConsents() {
@@ -182,7 +182,7 @@ public class IsConsentRequiredPredicateTest {
         prc.getSubcontext(ConsentContext.class).getCurrentConsents().put("test", new Consent());
         setUpDescriptor(false);
 
-        Assert.assertTrue(p.apply(prc));
+        Assert.assertTrue(p.test(prc));
     }
 
     @Test public void testNoCurrentConsents() {
@@ -196,63 +196,63 @@ public class IsConsentRequiredPredicateTest {
 
         setUpDescriptor(false);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testMatchingPreviousAndCurrentConsents() {
         setUpMatchingPreviousAndCurrentConsents();
         setUpDescriptor(false);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testInPreviousButNotCurrentConsents() {
         setUpInPreviousButNotCurrentConsents();
         setUpDescriptor(false);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testInCurrentButNotPreviousConsents() {
         setUpInCurrentButNotPreviousConsents();
         setUpDescriptor(false);
 
-        Assert.assertTrue(p.apply(prc));
+        Assert.assertTrue(p.test(prc));
     }
 
     @Test public void testMatchingPreviousAndCurrentConsentsCompareValues() {
         setUpMatchingPreviousAndCurrentConsents();
         setUpDescriptor(true);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testInPreviousButNotCurrentConsentsCompareValues() {
         setUpInPreviousButNotCurrentConsents();
         setUpDescriptor(true);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testInCurrentButNotPreviousConsentsCompareValues() {
         setUpInCurrentButNotPreviousConsents();
         setUpDescriptor(true);
 
-        Assert.assertTrue(p.apply(prc));
+        Assert.assertTrue(p.test(prc));
     }
 
     @Test public void testInPreviousAndCurrentConsentsWithDifferentValue() {
         setUpInPreviousAndCurrentConsentsWithDifferentValue();
         setUpDescriptor(false);
 
-        Assert.assertFalse(p.apply(prc));
+        Assert.assertFalse(p.test(prc));
     }
 
     @Test public void testInPreviousAndCurrentConsentsWithDifferentValueCompareValues() {
         setUpInPreviousAndCurrentConsentsWithDifferentValue();
         setUpDescriptor(true);
 
-        Assert.assertTrue(p.apply(prc));
+        Assert.assertTrue(p.test(prc));
     }
 
 }
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
index e81eff4..0a2e457 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java
@@ -36,7 +36,7 @@ public class RelyingPartyIdPredicateTest {
         ProfileRequestContext prc = new ProfileRequestContext();
         RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class, true);
         rpc.setRelyingPartyId(rpId);
-        return rpIdPredicate.apply(prc);
+        return rpIdPredicate.test(prc);
     }
     
     

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