replaced all occurence of comparison operator with equals methods for…

… non primitive data types
testng-team · Jan 21, 2021 · 94644a5 · 94644a5
1 parent 6d5a7ba
commit 94644a5
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/main/java/org/testng/Assert.java b/src/main/java/org/testng/Assert.java
@@ -5,7 +5,6 @@
 import static org.testng.internal.EclipseInterface.ASSERT_MIDDLE;
 import static org.testng.internal.EclipseInterface.ASSERT_RIGHT;
 import static org.testng.internal.EclipseInterface.ASSERT_UNEQUAL_LEFT;
-
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.Collection;
@@ -166,7 +165,7 @@ private static boolean areEqualImpl(Object actual, Object expected) {
    * returns not equal reason or null if equal
    **/
   private static String getArrayNotEqualReason(Object actual, Object expected) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return null;
     }
     if (null == expected) {
@@ -976,7 +975,7 @@ public static void assertNull(Object object, String message) {
    * @param message  the assertion error message
    */
   public static void assertSame(Object actual, Object expected, String message) {
-    if (expected == actual) {
+    if (Objects.equals(actual, expected)) {
       return;
     }
     failNotSame(actual, expected, message);
@@ -1002,7 +1001,7 @@ public static void assertSame(Object actual, Object expected) {
    * @param message  the assertion error message
    */
   public static void assertNotSame(Object actual, Object expected, String message) {
-    if (expected == actual) {
+    if (Objects.equals(actual, expected)) {
       failSame(actual, expected, message);
     }
   }
@@ -1127,7 +1126,7 @@ public static void assertEquals(Iterator<?> actual, Iterator<?> expected) {
    * @param message  the assertion error message
    */
   public static void assertEquals(Iterator<?> actual, Iterator<?> expected, String message) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return;
     }
     if (actual == null || expected == null) {
@@ -1184,7 +1183,7 @@ public static void assertEquals(Iterable<?> actual, Iterable<?> expected) {
    * @param message  the assertion error message
    */
   public static void assertEquals(Iterable<?> actual, Iterable<?> expected, String message) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return;
     }
 
@@ -1211,7 +1210,7 @@ public static void assertEquals(Iterable<?> actual, Iterable<?> expected, String
    * @param message  the assertion error message
    */
   public static void assertEquals(Object[] actual, Object[] expected, String message) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return;
     }
 
@@ -1257,7 +1256,7 @@ public static void assertEquals(Object[] actual, Object[] expected, String messa
    * @param message  the assertion error message
    */
   public static void assertEqualsNoOrder(Object[] actual, Object[] expected, String message) {
-    if (actual == expected) {
+    if (Arrays.equals(actual, expected)) {
       return;
     }
 
@@ -1328,7 +1327,7 @@ public static void assertEquals(Set<?> actual, Set<?> expected) {
    * returns not equal reason or null if equal
    **/
   private static String getNotEqualReason(Set<?> actual, Set<?> expected) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return null;
     }
 
@@ -1337,7 +1336,7 @@ private static String getNotEqualReason(Set<?> actual, Set<?> expected) {
       return "Sets not equal: expected: " + expected + " and actual: " + actual;
     }
 
-    if (!actual.equals(expected)) {
+    if (!Objects.equals(actual, expected)) {
       return "Sets differ: expected " + expected + " but got " + actual;
     }
     return null;
@@ -1366,7 +1365,7 @@ public static void assertEquals(Set<?> actual, Set<?> expected, String message)
    * returns not equal deep reason or null if equal
    **/
   private static String getNotEqualDeepReason(Set<?> actual, Set<?> expected) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return null;
     }
 
@@ -1414,7 +1413,7 @@ public static void assertEquals(Map<?, ?> actual, Map<?, ?> expected) {
   }
 
   private static String getNotEqualReason(Map<?, ?> actual, Map<?, ?> expected) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return null;
     }
 
@@ -1471,7 +1470,7 @@ public static void assertEqualsDeep(Map<?, ?> actual, Map<?, ?> expected) {
    * returns not equal deep reason or null if equal
    **/
   private static String getNotEqualDeepReason(Map<?, ?> actual, Map<?, ?> expected) {
-    if (actual == expected) {
+    if (Objects.equals(actual, expected)) {
       return null;
     }