X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fmath%2FMatrixTest.java;h=7dc3b9e018f4e274e5bf660f77b9933c094e10fe;hb=187269da0130408d24901c88acb10c217f6284f9;hp=fa446e42af97e2b6cf2ccd49f312d86b21f775e0;hpb=47f194aa2e9d43169ee06d61a697e1355d292b87;p=jalview.git

diff --git a/test/jalview/math/MatrixTest.java b/test/jalview/math/MatrixTest.java
index fa446e4..7dc3b9e 100644
--- a/test/jalview/math/MatrixTest.java
+++ b/test/jalview/math/MatrixTest.java
@@ -2,7 +2,6 @@ package jalview.math;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
@@ -551,37 +550,28 @@ public class MatrixTest
   }
 
   @Test(groups = "Functional")
-  public void testEquals_hashCode()
+  public void testEquals()
   {
     double[][] values = new double[][] { { 1, 2, 3 }, { 4, 5, 6 } };
     Matrix m1 = new Matrix(values);
     double[][] values2 = new double[][] { { 1, 2, 3 }, { 4, 5, 6 } };
     Matrix m2 = new Matrix(values2);
 
-    assertTrue(m1.equals(m1));
-    assertTrue(m1.equals(m2));
-    assertTrue(m2.equals(m1));
-    // equal objects should have same hashCode
-    assertEquals(m1.hashCode(), m2.hashCode());
+    double delta = 0.0001d;
+    assertTrue(m1.equals(m1, delta));
+    assertTrue(m1.equals(m2, delta));
+    assertTrue(m2.equals(m1, delta));
 
     double[][] values3 = new double[][] { { 1, 2, 3 }, { 4, 5, 7 } };
     m2 = new Matrix(values3);
-    assertFalse(m1.equals(m2));
-    assertFalse(m2.equals(m1));
-    assertNotEquals(m1.hashCode(), m2.hashCode());
-
-    // same hashCode doesn't always mean equal
-    values2 = new double[][] { { 1, 2, 3 }, { 4, 6, 5 } };
-    m2 = new Matrix(values2);
-    assertFalse(m2.equals(m1));
-    assertEquals(m1.hashCode(), m2.hashCode());
+    assertFalse(m1.equals(m2, delta));
+    assertFalse(m2.equals(m1, delta));
 
     // must be same shape
     values2 = new double[][] { { 1, 2, 3 } };
     m2 = new Matrix(values2);
-    assertFalse(m2.equals(m1));
+    assertFalse(m2.equals(m1, delta));
 
-    assertFalse(m1.equals(null));
-    assertFalse(m1.equals("foo"));
+    assertFalse(m1.equals(null, delta));
   }
 }