JAL-3035 more das bits removed

[jalview.git] / test / jalview / datamodel / features / RangeComparatorTest.java

diff --git a/test/jalview/datamodel/features/RangeComparatorTest.java b/test/jalview/datamodel/features/RangeComparatorTest.java
index 6f22add..4849b38 100644 (file)
--- a/test/jalview/datamodel/features/RangeComparatorTest.java
+++ b/test/jalview/datamodel/features/RangeComparatorTest.java
@@ -2,34 +2,15 @@ package jalview.datamodel.features;
 
 import static org.testng.Assert.assertEquals;
 
+import jalview.datamodel.ContiguousI;
+import jalview.datamodel.Range;
+
+import java.util.Comparator;
+
 import org.testng.annotations.Test;
 
 public class RangeComparatorTest
 {
-  class Range implements ContiguousI
-  {
-    int begin;
-
-    int end;
-
-    @Override
-    public int getBegin()
-    {
-      return begin;
-    }
-
-    @Override
-    public int getEnd()
-    {
-      return end;
-    }
-
-    Range(int i, int j)
-    {
-      begin = i;
-      end = j;
-    }
-  }
 
   @Test(groups = "Functional")
   public void testCompare()
@@ -51,7 +32,7 @@ public class RangeComparatorTest
   @Test(groups = "Functional")
   public void testCompare_byStart()
   {
-    RangeComparator comp = new RangeComparator(true);
+    Comparator<ContiguousI> comp = RangeComparator.BY_START_POSITION;
 
     // same start position, same length
     assertEquals(comp.compare(new Range(10, 20), new Range(10, 20)), 0);
@@ -68,7 +49,7 @@ public class RangeComparatorTest
   @Test(groups = "Functional")
   public void testCompare_byEnd()
   {
-    RangeComparator comp = new RangeComparator(false);
+    Comparator<ContiguousI> comp = RangeComparator.BY_END_POSITION;
 
     // same end position, same length
     assertEquals(comp.compare(new Range(10, 20), new Range(10, 20)), 0);