JAL-3978 clean up unnecessary local variables for JALVIEW_VERSION_UNDERSCORES

[jalview.git] / test / jalview / structure / AtomSpecModelTest.java

diff --git a/test/jalview/structure/AtomSpecModelTest.java b/test/jalview/structure/AtomSpecModelTest.java
index 8c6ead7..f46fdcf 100644 (file)
--- a/test/jalview/structure/AtomSpecModelTest.java
+++ b/test/jalview/structure/AtomSpecModelTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.structure;
 
 import static org.testng.Assert.assertEquals;
@@ -10,18 +30,18 @@ import org.testng.annotations.Test;
 
 public class AtomSpecModelTest
 {
-  @Test(groups="Functional")
+  @Test(groups = "Functional")
   public void testGetRanges()
   {
     AtomSpecModel model = new AtomSpecModel();
     assertFalse(model.getModels().iterator().hasNext());
-    List<int[]> ranges = model.getRanges(1, "A");
+    List<int[]> ranges = model.getRanges("1", "A");
     assertTrue(ranges.isEmpty());
 
-    model.addRange(1, 12, 14, "A");
-    assertTrue(model.getRanges(1, "B").isEmpty());
-    assertTrue(model.getRanges(2, "A").isEmpty());
-    ranges = model.getRanges(1, "A");
+    model.addRange("1", 12, 14, "A");
+    assertTrue(model.getRanges("1", "B").isEmpty());
+    assertTrue(model.getRanges("2", "A").isEmpty());
+    ranges = model.getRanges("1", "A");
     assertEquals(ranges.size(), 1);
     int[] range = ranges.get(0);
     assertEquals(range[0], 12);
@@ -31,12 +51,12 @@ public class AtomSpecModelTest
      * add some ranges; they should be coalesced and
      * ordered when retrieved
      */
-    model.addRange(1, 25, 25, "A");
-    model.addRange(1, 20, 24, "A");
-    model.addRange(1, 6, 8, "A");
-    model.addRange(1, 13, 18, "A");
-    model.addRange(1, 5, 6, "A");
-    ranges = model.getRanges(1, "A");
+    model.addRange("1", 25, 25, "A");
+    model.addRange("1", 20, 24, "A");
+    model.addRange("1", 6, 8, "A");
+    model.addRange("1", 13, 18, "A");
+    model.addRange("1", 5, 6, "A");
+    ranges = model.getRanges("1", "A");
     assertEquals(ranges.size(), 3);
     range = ranges.get(0);
     assertEquals(range[0], 5);