Merge branch 'develop' into merge/develop_bug/JAL-2154projectMappings

[jalview.git] / test / jalview / datamodel / AlignmentTest.java

diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java
index 58e024f..7ad9436 100644 (file)
--- a/test/jalview/datamodel/AlignmentTest.java
+++ b/test/jalview/datamodel/AlignmentTest.java
@@ -428,11 +428,26 @@ public class AlignmentTest
    * checks that the sequence data for an alignment's dataset is non-redundant.
    * Fails if there are sequences with same id, sequence, start, and.
    */
+
   public static void assertDatasetIsNormalised(AlignmentI al)
   {
+    assertDatasetIsNormalised(al, null);
+  }
+
+  /**
+   * checks that the sequence data for an alignment's dataset is non-redundant.
+   * Fails if there are sequences with same id, sequence, start, and.
+   * 
+   * @param al
+   *          - alignment to verify
+   * @param message
+   *          - null or message prepended to exception message.
+   */
+  public static void assertDatasetIsNormalised(AlignmentI al, String message)
+  {
     if (al.getDataset()!=null)
     {
-      assertDatasetIsNormalised(al.getDataset());
+      assertDatasetIsNormalised(al.getDataset(), message);
       return;
     }
     /*
@@ -461,7 +476,9 @@ public class AlignmentTest
         {
           continue;
         }
-        Assert.fail("Found similar sequences at position "+p+" and "+q+"\n"+pSeq.toString());
+        Assert.fail((message == null ? "" : message + " :")
+                + "Found similar sequences at position " + p + " and " + q
+                + "\n" + pSeq.toString());
       }
     }
   }
@@ -1024,4 +1041,5 @@ public class AlignmentTest
     assertEquals(1, startEnd[0]);
     assertEquals(23, startEnd[1]);
   }
+
 }