JAL-1270 JUnit to TestNG refactoring

[jalview.git] / test / jalview / analysis / AlignmentUtilsTests.java

diff --git a/test/jalview/analysis/AlignmentUtilsTests.java b/test/jalview/analysis/AlignmentUtilsTests.java
index 6c06955..d32181f 100644 (file)
--- a/test/jalview/analysis/AlignmentUtilsTests.java
+++ b/test/jalview/analysis/AlignmentUtilsTests.java
@@ -20,12 +20,12 @@
  */
 package jalview.analysis;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.assertNull;
+import org.testng.annotations.Test;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,8 +37,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Test;
-
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
@@ -195,9 +193,7 @@ public class AlignmentUtilsTests
      * Expand the subsequence to the full sequence abcDEFghi
      */
     AlignmentI expanded = AlignmentUtils.expandContext(al, -1);
-    // FIXME expandContext adds an unnecessary gap; need tests to cover all
-    // cases for which 'maxOffset' is computed
-    assertEquals("-abcDEFghi", expanded.getSequenceAt(0)
+    assertEquals("abcDEFghi", expanded.getSequenceAt(0)
             .getSequenceAsString());
 
     /*
@@ -215,13 +211,12 @@ public class AlignmentUtilsTests
     assertNull(ann.annotations[0]);
     assertNull(ann.annotations[1]);
     assertNull(ann.annotations[2]);
-    assertNull(ann.annotations[3]);
-    assertEquals(4, ann.annotations[4].value, 0.001);
-    assertEquals(5, ann.annotations[5].value, 0.001);
-    assertEquals(6, ann.annotations[6].value, 0.001);
+    assertEquals(4, ann.annotations[3].value, 0.001);
+    assertEquals(5, ann.annotations[4].value, 0.001);
+    assertEquals(6, ann.annotations[5].value, 0.001);
+    assertNull(ann.annotations[6]);
     assertNull(ann.annotations[7]);
     assertNull(ann.annotations[8]);
-    assertNull(ann.annotations[9]);
 
     /*
      * sequence position mappings should be unchanged