X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreMatrixTest.java;h=ae5ad5d81d51ba5c4bd4087a65fa933ec05527e8;hb=86f56c7a53d72066544ff74c893188d304598bec;hp=002084d38fdb5b125755de94a87c59b5ad7f7db4;hpb=73a369b0c2d5991400985d533107b70450b3d613;p=jalview.git

diff --git a/test/jalview/analysis/scoremodels/ScoreMatrixTest.java b/test/jalview/analysis/scoremodels/ScoreMatrixTest.java
index 002084d..ae5ad5d 100644
--- a/test/jalview/analysis/scoremodels/ScoreMatrixTest.java
+++ b/test/jalview/analysis/scoremodels/ScoreMatrixTest.java
@@ -2,6 +2,7 @@ package jalview.analysis.scoremodels;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertTrue;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
 
@@ -12,6 +13,7 @@ import jalview.math.MatrixI;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.Arrays;
 
 import org.testng.annotations.Test;
 
@@ -121,6 +123,19 @@ public class ScoreMatrixTest
   }
 
   @Test(groups = "Functional")
+  public void testGetMatrix()
+  {
+    ScoreMatrix sm = ScoreModels.getInstance().getBlosum62();
+    float[][] m = sm.getMatrix();
+    assertEquals(m.length, sm.getSize());
+    assertEquals(m[2][4], -3f);
+    // verify a defensive copy is returned
+    float[][] m2 = sm.getMatrix();
+    assertNotSame(m, m2);
+    assertTrue(Arrays.deepEquals(m, m2));
+  }
+
+  @Test(groups = "Functional")
   public void testGetMatrixIndex()
   {
     ScoreMatrix sm = ScoreModels.getInstance().getBlosum62();
@@ -219,4 +234,14 @@ public class ScoreMatrixTest
     assertNotNull(sm2);
     assertTrue(sm2.equals(sm));
   }
+
+  @Test(groups = "Functional")
+  public void testEauals()
+  {
+    ScoreMatrix sm = ScoreModels.getInstance().getBlosum62();
+    ScoreMatrix sm2 = new ScoreMatrix(sm.getName(), sm.getSymbols()
+            .toCharArray(), sm.getMatrix());
+    assertTrue(sm.equals(sm2));
+    assertEquals(sm.hashCode(), sm2.hashCode());
+  }
 }