[java-identity-provider COMMIT] /trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/con...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep  9 09:27:42 2016
New Revision: 8380

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8380&view=rev
Log:
Fix tests now that we have removed the deprecated class.

Modified:
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java	(original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java	Fri Sep  9 09:27:42 2016
@@ -32,8 +32,8 @@
 
     /** Test that post-construction state is what is expected. */
     @Test public void testPostConstructionState() {
-        AttributeFilterContext context = new AttributeFilterContext();
-        AttributeFilterWorkContext child = context.getSubcontext(AttributeFilterWorkContext.class, true);
+        final AttributeFilterContext context = new AttributeFilterContext();
+        final AttributeFilterWorkContext child = context.getSubcontext(AttributeFilterWorkContext.class, true);
         Assert.assertNotNull(context.getFilteredIdPAttributes());
         Assert.assertTrue(context.getFilteredIdPAttributes().isEmpty());
         Assert.assertNull(context.getParent());
@@ -47,17 +47,17 @@
 
     /** Test methods related to prefiltered attributes. */
     @Test public void testPrefilteredAttributes() {
-        AttributeFilterContext context = new AttributeFilterContext();
+        final AttributeFilterContext context = new AttributeFilterContext();
 
-        IdPAttribute attribute1 = new IdPAttribute("attribute1");
+        final IdPAttribute attribute1 = new IdPAttribute("attribute1");
         context.getPrefilteredIdPAttributes().put(attribute1.getId(), attribute1);
         Assert.assertEquals(context.getPrefilteredIdPAttributes().size(), 1);
         Assert.assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
         Assert.assertEquals(context.getPrefilteredIdPAttributes().get("attribute1"), attribute1);
 
-        IdPAttribute attribute2 = new IdPAttribute("attribute2");
-        IdPAttribute attribute3 = new IdPAttribute("attribute3");
-        List<IdPAttribute> attributes = Arrays.asList(attribute2, attribute3);
+        final IdPAttribute attribute2 = new IdPAttribute("attribute2");
+        final IdPAttribute attribute3 = new IdPAttribute("attribute3");
+        final List<IdPAttribute> attributes = Arrays.asList(attribute2, attribute3);
         context.setPrefilteredIdPAttributes(attributes);
         Assert.assertEquals(context.getPrefilteredIdPAttributes().size(), 2);
         Assert.assertFalse(context.getPrefilteredIdPAttributes().containsKey("attribute1"));
@@ -83,17 +83,6 @@
         Assert.assertTrue(context.getPrefilteredIdPAttributes().containsKey("attribute3"));
         Assert.assertEquals(context.getPrefilteredIdPAttributes().get("attribute3"), attribute3);
 
-        try {
-            context.getPrefilteredIdPAttributes().put(null, new IdPAttribute("foo"));
-            Assert.fail("null attribute id not allowed");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            context.getPrefilteredIdPAttributes().put("foo", null);
-            Assert.fail("null attribute not allowed");
-        } catch (NullPointerException e) {
-        }
 
         context.getPrefilteredIdPAttributes().remove(null);
         Assert.assertEquals(context.getPrefilteredIdPAttributes().size(), 2);
@@ -109,17 +98,17 @@
 
     /** Test methods related to filtered attributes. */
     @Test public void testFilteredAttributes() {
-        AttributeFilterContext context = new AttributeFilterContext();
+        final AttributeFilterContext context = new AttributeFilterContext();
 
-        IdPAttribute attribute1 = new IdPAttribute("attribute1");
+        final IdPAttribute attribute1 = new IdPAttribute("attribute1");
         context.getFilteredIdPAttributes().put(attribute1.getId(), attribute1);
         Assert.assertEquals(context.getFilteredIdPAttributes().size(), 1);
         Assert.assertTrue(context.getFilteredIdPAttributes().containsKey("attribute1"));
         Assert.assertEquals(context.getFilteredIdPAttributes().get("attribute1"), attribute1);
 
-        IdPAttribute attribute2 = new IdPAttribute("attribute2");
-        IdPAttribute attribute3 = new IdPAttribute("attribute3");
-        List<IdPAttribute> attributes = Arrays.asList(attribute2, attribute3);
+        final IdPAttribute attribute2 = new IdPAttribute("attribute2");
+        final IdPAttribute attribute3 = new IdPAttribute("attribute3");

[... 42 lines stripped ...]