[java-support] branch master updated: Fix some tests which were still using junit

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  cf89614   Fix some tests which were still using junit
cf89614 is described below

commit cf896140fd68212b0b012d6cd8bfc1513f5dfa49
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 8 16:31:14 2017 +0100

    Fix some tests which were still using junit
---
 .../resolver/CriterionPredicateRegistryTest.java       | 18 +++++++++---------
 .../java/support/resolver/ResolverSupportTest.java     | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
index ffa2414..f19c4f1 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistryTest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.junit.Assert;
+import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -41,7 +41,7 @@ public class CriterionPredicateRegistryTest {
     
     @Test
     public void testExplictRegisterDeregister() throws ResolverException {
-        CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
+        final CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
         Predicate<Foo> predicate;
         
         Assert.assertNull(registry.getPredicate(fooCriterion));
@@ -65,43 +65,43 @@ public class CriterionPredicateRegistryTest {
     
     @Test
     public void testRelativeClassPathResourceLoad() throws ResolverException {
-        CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
+        final CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
         
         Assert.assertNull(registry.getPredicate(fooCriterion));
         
         registry.loadMappings("test-criterion-predicate-mappings.properties");
         
-        Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
+        final Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
         Assert.assertNotNull(predicate);
         Assert.assertTrue(fooPredicateClass.isInstance(predicate));
     }
     
     @Test
     public void testAbsoluteClassPathResourceLoad() throws ResolverException {
-        CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
+        final CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
         
         Assert.assertNull(registry.getPredicate(fooCriterion));
         
         registry.loadMappings("/net/shibboleth/utilities/java/support/resolver/test-criterion-predicate-mappings.properties");
         
-        Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
+        final Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
         Assert.assertNotNull(predicate);
         Assert.assertTrue(fooPredicateClass.isInstance(predicate));
     }
     
     @Test
     public void testPropertiesLoad() throws ResolverException, IOException {
-        CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
+        final CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
         
         Assert.assertNull(registry.getPredicate(fooCriterion));
         
-        Properties properties = new Properties();
+        final Properties properties = new Properties();
         try (InputStream is = this.getClass().getResourceAsStream("test-criterion-predicate-mappings.properties")) {
             properties.load(is);;
         }
         registry.loadMappings(properties);
         
-        Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
+        final Predicate<Foo> predicate = registry.getPredicate(fooCriterion);
         Assert.assertNotNull(predicate);
         Assert.assertTrue(fooPredicateClass.isInstance(predicate));
     }
diff --git a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
index 717200c..6a2b18a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/resolver/ResolverSupportTest.java
@@ -19,7 +19,7 @@ package net.shibboleth.utilities.java.support.resolver;
 
 import java.util.Set;
 
-import org.junit.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
@@ -29,10 +29,10 @@ public class ResolverSupportTest {
     
     @Test
     public void testGetPredicates() throws ResolverException {
-        CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
+        final CriterionPredicateRegistry<Foo> registry = new CriterionPredicateRegistry<>();
         registry.register(TestCriterion.class, FooPredicate.class);
         
-        EvaluableTestFooCriterion evaluableCriterion = new EvaluableTestFooCriterion();
+        final EvaluableTestFooCriterion evaluableCriterion = new EvaluableTestFooCriterion();
         
         Set<Predicate<Foo>> predicates;
         
@@ -41,7 +41,7 @@ public class ResolverSupportTest {
         Assert.assertNotNull(predicates);
         Assert.assertEquals(predicates.size(), 0);
         
-        CriteriaSet criteria = new CriteriaSet();
+        final CriteriaSet criteria = new CriteriaSet();
         
         predicates = ResolverSupport.getPredicates(criteria, EvaluableFooCriterion.class, registry);
         Assert.assertNotNull(predicates);
@@ -65,8 +65,8 @@ public class ResolverSupportTest {
     
     @Test
     public void testGetFilteredIterable() {
-        Foo foo1 = new Foo();
-        Foo foo2 = new Foo();
+        final Foo foo1 = new Foo();
+        final Foo foo2 = new Foo();
         
         Iterable<Foo> result;
         Set<Foo> resultSet;

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