JAL-1645 source formatting and organise imports

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

diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java
index 2eaae94..722fdd3 100644 (file)
--- a/test/jalview/datamodel/AlignmentTest.java
+++ b/test/jalview/datamodel/AlignmentTest.java
@@ -79,7 +79,7 @@ public class AlignmentTest
    * Read in Stockholm format test data including secondary structure
    * annotations.
    */
- @BeforeMethod(alwaysRun = true)
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws IOException
   {
     al = loadAlignment(TEST_DATA, "STH");
@@ -94,7 +94,7 @@ public class AlignmentTest
   /**
    * Test method that returns annotations that match on calcId.
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testFindAnnotation_byCalcId()
   {
     Iterable<AlignmentAnnotation> anns = al
@@ -106,7 +106,7 @@ public class AlignmentTest
     assertFalse(iter.hasNext());
   }
 
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testDeleteAllAnnotations_includingAutocalculated()
   {
     AlignmentAnnotation aa = new AlignmentAnnotation("Consensus",
@@ -120,7 +120,7 @@ public class AlignmentTest
     assertEquals("Not all deleted", 0, al.getAlignmentAnnotation().length);
   }
 
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testDeleteAllAnnotations_excludingAutocalculated()
   {
     AlignmentAnnotation aa = new AlignmentAnnotation("Consensus",
@@ -144,7 +144,7 @@ public class AlignmentTest
    * 
    * @throws IOException
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testAlignAs_dnaAsDna() throws IOException
   {
     // aligned cDNA:
@@ -157,9 +157,7 @@ public class AlignmentTest
      * of what would normally be protein here.
      */
     AlignedCodonFrame acf = new AlignedCodonFrame();
-    MapList ml = new MapList(new int[]
-    { 1, 12 }, new int[]
-    { 1, 12 }, 1, 1);
+    MapList ml = new MapList(new int[] { 1, 12 }, new int[] { 1, 12 }, 1, 1);
     acf.addMap(al2.getSequenceAt(0), al1.getSequenceAt(0), ml);
     acf.addMap(al2.getSequenceAt(1), al1.getSequenceAt(1), ml);
     al1.addCodonFrame(acf);
@@ -176,16 +174,14 @@ public class AlignmentTest
    * 
    * @throws IOException
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testAlignAs_proteinAsCdna() throws IOException
   {
     // see also AlignmentUtilsTests
     AlignmentI al1 = loadAlignment(CDNA_SEQS_1, "FASTA");
     AlignmentI al2 = loadAlignment(AA_SEQS_1, "FASTA");
     AlignedCodonFrame acf = new AlignedCodonFrame();
-    MapList ml = new MapList(new int[]
-    { 1, 12 }, new int[]
-    { 1, 4 }, 3, 1);
+    MapList ml = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3, 1);
     acf.addMap(al1.getSequenceAt(0), al2.getSequenceAt(0), ml);
     acf.addMap(al1.getSequenceAt(1), al2.getSequenceAt(1), ml);
     al2.addCodonFrame(acf);
@@ -200,7 +196,7 @@ public class AlignmentTest
    * 
    * @throws IOException
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testAlignAs_cdnaAsProtein() throws IOException
   {
     /*
@@ -209,9 +205,7 @@ public class AlignmentTest
     AlignmentI al1 = loadAlignment(CDNA_SEQS_1, "FASTA");
     AlignmentI al2 = loadAlignment(AA_SEQS_1, "FASTA");
     AlignedCodonFrame acf = new AlignedCodonFrame();
-    MapList ml = new MapList(new int[]
-    { 1, 12 }, new int[]
-    { 1, 4 }, 3, 1);
+    MapList ml = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3, 1);
     acf.addMap(al1.getSequenceAt(0), al2.getSequenceAt(0), ml);
     acf.addMap(al1.getSequenceAt(1), al2.getSequenceAt(1), ml);
     al2.addCodonFrame(acf);
@@ -232,7 +226,7 @@ public class AlignmentTest
    * 
    * @throws IOException
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testAlignAs_dnaAsProtein_withIntrons() throws IOException
   {
     /*
@@ -247,13 +241,11 @@ public class AlignmentTest
     AlignedCodonFrame acf = new AlignedCodonFrame();
     // Seq1 has intron at dna positions 3,4,9 so splice is AAG GCC TTT
     // Seq2 has intron at dna positions 1,5,6 so splice is CCG TTT AAA
-    MapList ml1 = new MapList(new int[]
-    { 1, 2, 5, 8, 10, 12 }, new int[]
-    { 1, 3 }, 3, 1);
+    MapList ml1 = new MapList(new int[] { 1, 2, 5, 8, 10, 12 }, new int[] {
+        1, 3 }, 3, 1);
     acf.addMap(al1.getSequenceAt(0), al2.getSequenceAt(0), ml1);
-    MapList ml2 = new MapList(new int[]
-    { 2, 4, 7, 12 }, new int[]
-    { 1, 3 }, 3, 1);
+    MapList ml2 = new MapList(new int[] { 2, 4, 7, 12 },
+            new int[] { 1, 3 }, 3, 1);
     acf.addMap(al1.getSequenceAt(1), al2.getSequenceAt(1), ml2);
     al2.addCodonFrame(acf);