Fix further Sonar findings

cloudfoundry · Mar 6, 2024 · a951797 · a951797
1 parent 9c25691
commit a951797
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java b/model/src/test/java/org/cloudfoundry/identity/uaa/scim/ScimUserTests.java
@@ -32,6 +32,7 @@
 import java.util.Set;
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.*;
 
 /**
@@ -364,8 +365,6 @@ public void testGroupSettersGetters() {
         Group group2 = new Group("id", "display", Group.Type.DIRECT);
         assertEquals(group1, group2);
         assertEquals(group2, group1);
-        assertEquals(group1, group1);
-        assertEquals(group2, group2);
         assertNotEquals(null, group1);
         assertNotEquals(group1, new Object());
         group1.setValue(null);
@@ -452,14 +451,11 @@ public void testPhoneNumber() {
         assertEquals("type", p1.getType());
         ScimUser user = new ScimUser();
         user.setPhoneNumbers(Collections.singletonList(p1));
-        try {
+
+        assertThatIllegalArgumentException().isThrownBy(() -> {
             p1.setType(null);
             user.addPhoneNumber(p1.getValue());
-            fail();
-        }catch (IllegalArgumentException ignored) {
-
-        }
-
+        });
     }
 
     @Test
@@ -615,7 +611,7 @@ public void testPatchUserDropNameSubAttributes() {
     @Test
     public void testPatchUserRejectChangingOrigin() {
         patch.setOrigin("some-new-origin");
-        Assertions.assertThatIllegalArgumentException().isThrownBy(() -> user.patch(patch))
+        assertThatIllegalArgumentException().isThrownBy(() -> user.patch(patch))
                         .withMessage("Cannot change origin in patch of user.");
     }