JAL-3878 update branch from 2.12 merge from 2.11.2

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

diff --git a/test/jalview/analysis/SeqsetUtilsTest.java b/test/jalview/analysis/SeqsetUtilsTest.java
index 9839ba0..71e5bfd 100644 (file)
--- a/test/jalview/analysis/SeqsetUtilsTest.java
+++ b/test/jalview/analysis/SeqsetUtilsTest.java
@@ -28,6 +28,7 @@ import jalview.datamodel.SequenceI;
 import jalview.gui.JvOptionPane;
 
 import java.util.Hashtable;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -47,7 +48,6 @@ public class SeqsetUtilsTest
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
-
   /**
    * test for JAL-2046 bug - duplication of sequence features on reconstructed
    * alignment
@@ -55,8 +55,7 @@ public class SeqsetUtilsTest
   @Test(groups = { "Functional" })
   public void testSeqFeatureAddition()
   {
-    SequenceI[] sqset = new SequenceI[] {
-        new Sequence("Aseq1", "AREALSEQ"),
+    SequenceI[] sqset = new SequenceI[] { new Sequence("Aseq1", "AREALSEQ"),
         new Sequence("Aseq2", "AREALSEQ") };
 
     AlignmentI al = new Alignment(sqset);
@@ -65,7 +64,7 @@ public class SeqsetUtilsTest
     SequenceFeature sf1 = new SequenceFeature("f1", "foo", 2, 3, "far");
     SequenceFeature sf2 = new SequenceFeature("f2", "foo", 2, 3, "far");
     ds.getSequenceAt(0).addSequenceFeature(sf1);
-    Hashtable unq = SeqsetUtils.uniquify(sqset, true);
+    Map<String, SeqsetUtils.SequenceInfo> unq = SeqsetUtils.uniquify(sqset, true);
     SequenceI[] sqset2 = new SequenceI[] {
         new Sequence(sqset[0].getName(), sqset[0].getSequenceAsString()),
         new Sequence(sqset[1].getName(), sqset[1].getSequenceAsString()) };
@@ -78,9 +77,9 @@ public class SeqsetUtilsTest
     // are on the shared dataset sequence
     Assert.assertEquals(sqset[0].getSequenceFeatures().size(), 2);
     Assert.assertEquals(sqset2[0].getSequenceFeatures().size(), 2);
-    Assert.assertSame(sqset[0].getSequenceFeatures().get(0), sqset2[0]
-            .getSequenceFeatures().get(0));
-    Assert.assertSame(sqset[0].getSequenceFeatures().get(1), sqset2[0]
-            .getSequenceFeatures().get(1));
+    Assert.assertSame(sqset[0].getSequenceFeatures().get(0),
+            sqset2[0].getSequenceFeatures().get(0));
+    Assert.assertSame(sqset[0].getSequenceFeatures().get(1),
+            sqset2[0].getSequenceFeatures().get(1));
   }
 }