add unit test for setSubjects, add @SInCE tag

Signed-off-by: Johannes Schneider <johannes.schneider@bosch.io>
eclipse-ditto · Jun 22, 2021 · 528b0a0 · 528b0a0
1 parent fca35d2
commit 528b0a0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutableSubjects.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutableSubjects.java
@@ -126,7 +126,7 @@ public Subjects setSubject(final Subject subject) {
     @Override
     public Subjects setSubjects(final Subjects subjects) {
         Subjects result = this;
-        for (Subject subject : subjects) {
+        for (final Subject subject : subjects) {
             result = result.setSubject(subject);
         }
         return result;

diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/Subjects.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/Subjects.java
@@ -112,6 +112,7 @@ default Optional<Subject> getSubject(final SubjectIssuer issuer, final CharSeque
      * @param subjects the Subjects to be set.
      * @return a copy of this Subjects with {@code subject} set.
      * @throws NullPointerException if {@code subject} is {@code null}.
+     * @since 2.1.0
      */
     Subjects setSubjects(Subjects subjects);
 

diff --git a/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectsTest.java b/policies/model/src/test/java/org/eclipse/ditto/policies/model/ImmutableSubjectsTest.java
@@ -35,8 +35,13 @@ public final class ImmutableSubjectsTest {
 
     private static final SubjectId KNOWN_SUBJECT_ID_1 = SubjectId.newInstance(SubjectIssuer.GOOGLE, "myself1");
     private static final SubjectId KNOWN_SUBJECT_ID_2 = SubjectId.newInstance(SubjectIssuer.GOOGLE, "myself2");
+    private static final SubjectId KNOWN_SUBJECT_ID_3 = SubjectId.newInstance(SubjectIssuer.GOOGLE, "myself3");
     private static final Subject SUBJECT_1 = ImmutableSubject.of(KNOWN_SUBJECT_ID_1);
     private static final Subject SUBJECT_2 = ImmutableSubject.of(KNOWN_SUBJECT_ID_2);
+    private static final Subject SUBJECT_3_FOO =
+            ImmutableSubject.of(KNOWN_SUBJECT_ID_3, SubjectType.newInstance("foo"));
+    private static final Subject SUBJECT_3_BAR =
+            ImmutableSubject.of(KNOWN_SUBJECT_ID_3, SubjectType.newInstance("bar"));
 
     private static final String KNOWN_SUBJECT_TYPE = "custom";
     private static final Instant KNOWN_SUBJECT_EXPIRY = Instant.now();
@@ -108,6 +113,28 @@ public void setSubjectReturnsNewExtendedObject() {
         assertThat(subjects).containsOnly(SUBJECT_1, SUBJECT_2);
     }
 
+    @Test
+    public void setSubjectsReturnsNewExtendedObject() {
+        final Collection<Subject> subjectList = Collections.singleton(SUBJECT_1);
+        final Subjects underTest = ImmutableSubjects.of(subjectList);
+
+        final Subjects subjects = underTest.setSubjects(Subjects.newInstance(SUBJECT_2, SUBJECT_3_FOO));
+
+        assertThat(underTest).containsOnly(SUBJECT_1);
+        assertThat(subjects).containsOnly(SUBJECT_1, SUBJECT_2, SUBJECT_3_FOO);
+    }
+
+    @Test
+    public void setSubjectsWithDifferentTypeOverridesExisting() {
+        final Collection<Subject> subjectList = Collections.singleton(SUBJECT_3_FOO);
+        final Subjects underTest = ImmutableSubjects.of(subjectList);
+
+        final Subjects subjects = underTest.setSubjects(Subjects.newInstance(SUBJECT_3_BAR));
+
+        assertThat(underTest).containsOnly(SUBJECT_3_FOO);
+        assertThat(subjects).containsOnly(SUBJECT_3_BAR);
+    }
+
     @Test
     public void removeSubjectReturnsNewReducedObject() {
         final Collection<Subject> subjectList = Arrays.asList(SUBJECT_1, SUBJECT_2);