[Misc] Use assertEquals/assertNotEquals instead of boolean assertions in model-api tests (SonarCloud java:S5785)

Mechanical, behaviour-preserving cleanup of SonarCloud rule java:S5785 in the
xwiki-platform-model-api module (27 issues across 2 test files). Using a
dedicated equality assertion reports the actual and expected values on failure
instead of just "expected: <true> but was: <false>".

For RegexEntityReference the equals() override is asymmetric (a regex reference
matches a concrete one, not vice-versa), so the original receiver is kept as the
first argument to preserve the tested direction.

Co-Authored-By: Vincent Massol <vincent@massol.net>

Author: vmassol

xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java

@@ -36,6 +36,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -179,19 +180,19 @@ void validateEquals()
         EntityReference reference10 = new EntityReference(PAGE_NAME, EntityType.DOCUMENT,
             new EntityReference(SPACE_NAME, EntityType.SPACE, new EntityReference(WIKI_NAME, EntityType.WIKI, null, map)));
 
-        assertTrue(reference1.equals(reference1));
-        assertTrue(reference1.equals(reference2));
-        assertFalse(reference1.equals(reference3));
-        assertFalse(reference1.equals(reference4));
-        assertFalse(reference1.equals(reference5));
-        assertFalse(reference1.equals(reference6));
+        assertEquals(reference1, reference1);
+        assertEquals(reference2, reference1);
+        assertNotEquals(reference3, reference1);
+        assertNotEquals(reference4, reference1);
+        assertNotEquals(reference5, reference1);
+        assertNotEquals(reference6, reference1);
         assertEquals(reference6, new EntityReference(PAGE_NAME, EntityType.DOCUMENT));
-        assertFalse(reference1.equals(reference7));
-        assertTrue(reference7.equals(reference8));
-        assertFalse(reference1.equals(reference9));
-        assertFalse(reference7.equals(reference9));
-        assertFalse(reference1.equals(reference10));
-        assertFalse(reference7.equals(reference10));
+        assertNotEquals(reference7, reference1);
+        assertEquals(reference8, reference7);
+        assertNotEquals(reference9, reference1);
+        assertNotEquals(reference9, reference7);
+        assertNotEquals(reference10, reference1);
+        assertNotEquals(reference10, reference7);
     }
 
     @Test
@@ -276,17 +277,17 @@ void validateHashCode()
 
         assertEquals(reference1.hashCode(), reference1.hashCode());
         assertEquals(reference1.hashCode(), reference2.hashCode());
-        assertFalse(reference1.hashCode() == reference3.hashCode());
-        assertFalse(reference1.hashCode() == reference4.hashCode());
-        assertFalse(reference1.hashCode() == reference5.hashCode());
-        assertFalse(reference1.hashCode() == reference6.hashCode());
+        assertNotEquals(reference1.hashCode(), reference3.hashCode());
+        assertNotEquals(reference1.hashCode(), reference4.hashCode());
+        assertNotEquals(reference1.hashCode(), reference5.hashCode());
+        assertNotEquals(reference1.hashCode(), reference6.hashCode());
         assertEquals(reference6.hashCode(), new EntityReference(PAGE_NAME, EntityType.DOCUMENT).hashCode());
-        assertFalse(reference1.hashCode() == reference7.hashCode());
+        assertNotEquals(reference1.hashCode(), reference7.hashCode());
         assertEquals(reference7.hashCode(), reference8.hashCode());
-        assertFalse(reference1.hashCode() == reference9.hashCode());
-        assertFalse(reference7.hashCode() == reference9.hashCode());
-        assertFalse(reference1.hashCode() == reference10.hashCode());
-        assertFalse(reference7.hashCode() == reference10.hashCode());
+        assertNotEquals(reference1.hashCode(), reference9.hashCode());
+        assertNotEquals(reference7.hashCode(), reference9.hashCode());
+        assertNotEquals(reference1.hashCode(), reference10.hashCode());
+        assertNotEquals(reference7.hashCode(), reference10.hashCode());
     }
 
     @Test

xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/RegexEntityReferenceTest.java

@@ -24,8 +24,8 @@
 import org.junit.jupiter.api.Test;
 import org.xwiki.model.EntityType;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
  * Validate {@link RegexEntityReference} class.
@@ -49,7 +49,7 @@ void equalsWhenExact()
             new RegexEntityReference(Pattern.compile(REFERENCETOMATCH.getName(), Pattern.LITERAL), EntityType.DOCUMENT,
                 spaceReference);
 
-        assertTrue(reference.equals(REFERENCETOMATCH));
+        assertEquals(reference, REFERENCETOMATCH);
     }
 
     @Test
@@ -58,7 +58,7 @@ void equalsWithOnlyPage()
         EntityReference reference =
             new RegexEntityReference(Pattern.compile(REFERENCETOMATCH.getName(), Pattern.LITERAL), EntityType.DOCUMENT);
 
-        assertTrue(reference.equals(REFERENCETOMATCH));
+        assertEquals(reference, REFERENCETOMATCH);
     }
 
     @Test
@@ -68,23 +68,23 @@ void equalsWithOnlyWiki()
             new RegexEntityReference(Pattern.compile(REFERENCETOMATCH.getWikiReference().getName(), Pattern.LITERAL),
                 EntityType.WIKI);
 
-        assertTrue(reference.equals(REFERENCETOMATCH));
+        assertEquals(reference, REFERENCETOMATCH);
     }
 
     @Test
     void equalsWithPattern()
     {
         EntityReference reference = new RegexEntityReference(Pattern.compile("p.*"), EntityType.DOCUMENT);
 
-        assertTrue(reference.equals(REFERENCETOMATCH));
+        assertEquals(reference, REFERENCETOMATCH);
     }
 
     @Test
     void equalsWhenPatternNotMatching()
     {
         EntityReference reference = new RegexEntityReference(Pattern.compile("space"), EntityType.DOCUMENT);
 
-        assertFalse(reference.equals(REFERENCETOMATCH));
+        assertNotEquals(reference, REFERENCETOMATCH);
     }
 
     @Test
@@ -94,6 +94,6 @@ void equalsWhenNonRegexParent()
             new RegexEntityReference(Pattern.compile("space"), EntityType.SPACE, new EntityReference("wiki",
                 EntityType.WIKI));
 
-        assertTrue(reference.equals(REFERENCETOMATCH));
+        assertEquals(reference, REFERENCETOMATCH);
     }
 }