[java-metadata-aggregator] branch master updated: MDA-243 - Correct name of getter method

[Ian Young]

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

iay pushed a commit to branch master
in repository java-metadata-aggregator.

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

The following commit(s) were added to refs/heads/master by this push:
       new  f85eb2c   MDA-243 - Correct name of getter method
f85eb2c is described below

commit f85eb2c83697fa110e808bf1711a0eb628faaaba
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon May 25 17:02:43 2020 +0100

    MDA-243 - Correct name of getter method
    
    https://issues.shibboleth.net/jira/browse/MDA-243
---
 .../dom/saml/ContactPersonFilterStage.java         |  2 +-
 .../dom/saml/ContactPersonFilterStageTest.java     | 39 ++++++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
index 85fd833..e1da730 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
@@ -92,7 +92,7 @@ public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
      * @return list of designated person types
      */
     @Nonnull @NonnullElements @Unmodifiable
-    public Collection<String> getDesignateTypes() {
+    public Collection<String> getDesignatedTypes() {
         return designatedTypes;
     }
 
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
index 7f1f837..f2df428 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
@@ -56,29 +56,29 @@ public class ContactPersonFilterStageTest extends BaseDOMTest {
     @Test public void testDesignatedTypes() throws ComponentInitializationException {
         ContactPersonFilterStage stage = new ContactPersonFilterStage();
         stage.setId("foo");
-        Assert.assertEquals(stage.getDesignateTypes().size(), 5);
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.ADMINISTRATIVE));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.BILLING));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.OTHER));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.SUPPORT));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.TECHNICAL));
+        Assert.assertEquals(stage.getDesignatedTypes().size(), 5);
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.ADMINISTRATIVE));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.BILLING));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.OTHER));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.SUPPORT));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.TECHNICAL));
 
         stage.setDesignatedTypes(Set.of(ContactPersonFilterStage.ADMINISTRATIVE,
                 ContactPersonFilterStage.TECHNICAL, "", "foo", ContactPersonFilterStage.OTHER));
-        Assert.assertEquals(stage.getDesignateTypes().size(), 3);
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.ADMINISTRATIVE));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.OTHER));
-        Assert.assertTrue(stage.getDesignateTypes().contains(ContactPersonFilterStage.TECHNICAL));
+        Assert.assertEquals(stage.getDesignatedTypes().size(), 3);
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.ADMINISTRATIVE));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.OTHER));
+        Assert.assertTrue(stage.getDesignatedTypes().contains(ContactPersonFilterStage.TECHNICAL));
 
         stage.setDesignatedTypes(Collections.<String>emptyList());
-        Assert.assertEquals(stage.getDesignateTypes().size(), 0);
+        Assert.assertEquals(stage.getDesignatedTypes().size(), 0);
 
         stage.initialize();
         try {
             stage.setDesignatedTypes(Set.of(ContactPersonFilterStage.ADMINISTRATIVE));
             Assert.fail();
         } catch (UnmodifiableComponentException e) {
-            Assert.assertEquals(stage.getDesignateTypes().size(), 0);
+            Assert.assertEquals(stage.getDesignatedTypes().size(), 0);
         }
 
         stage = new ContactPersonFilterStage();
@@ -92,7 +92,7 @@ public class ContactPersonFilterStageTest extends BaseDOMTest {
 
         stage = new ContactPersonFilterStage();
         try {
-            stage.getDesignateTypes().add("foo");
+            stage.getDesignatedTypes().add("foo");
             Assert.fail();
         } catch (UnsupportedOperationException e) {
             // expected this
@@ -178,4 +178,17 @@ public class ContactPersonFilterStageTest extends BaseDOMTest {
         contactPersons = ElementSupport.getChildElements(wikiDescriptor, contactPersonQname);
         Assert.assertEquals(contactPersons.size(), 0);
     }
+    
+    @Test
+    public void mda243() throws Exception {
+        final var stage = new ContactPersonFilterStage();
+        stage.setId("test");
+        stage.setDesignatedTypes(Set.of(ContactPersonFilterStage.ADMINISTRATIVE, ContactPersonFilterStage.OTHER));
+        stage.initialize();
+        final var types = stage.getDesignatedTypes();
+        Assert.assertEquals(types.size(), 2);
+        Assert.assertTrue(types.contains(ContactPersonFilterStage.ADMINISTRATIVE));
+        Assert.assertFalse(types.contains(ContactPersonFilterStage.BILLING));
+    }
+
 }

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