JAL-2446 various get and find methods added with test coverage

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

diff --git a/test/jalview/datamodel/features/NCListTest.java b/test/jalview/datamodel/features/NCListTest.java
index 367e424..cb3a133 100644 (file)
--- a/test/jalview/datamodel/features/NCListTest.java
+++ b/test/jalview/datamodel/features/NCListTest.java
@@ -12,35 +12,6 @@ import org.testng.annotations.Test;
 
 public class NCListTest
 {
-  class Range implements ContiguousI
-  {
-    int start;
-
-    int end;
-
-    @Override
-    public int getBegin()
-    {
-      return start;
-    }
-
-    @Override
-    public int getEnd()
-    {
-      return end;
-    }
-
-    Range(int i, int j)
-    {
-      start = i;
-      end = j;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(start) + "-" + String.valueOf(end);
-    }
-  }
 
   /**
    * A basic sanity test of the constructor
@@ -202,4 +173,39 @@ public class NCListTest
       System.out.println(ncl.prettyPrint());
     }
   }
+
+  @Test(groups = "Functional")
+  public void testGetEntries()
+  {
+    List<Range> ranges = new ArrayList<Range>();
+    Range r1 = new Range(20, 20);
+    Range r2 = new Range(10, 20);
+    Range r3 = new Range(15, 30);
+    Range r4 = new Range(10, 30);
+    Range r5 = new Range(11, 19);
+    Range r6 = new Range(10, 20);
+    ranges.add(r1);
+    ranges.add(r2);
+    ranges.add(r3);
+    ranges.add(r4);
+    ranges.add(r5);
+    ranges.add(r6);
+  
+    NCList<Range> ncl = new NCList<Range>(ranges);
+    Range r7 = new Range(1, 100);
+    ncl.add(r7);
+
+    List<Range> contents = ncl.getEntries();
+    assertEquals(contents.size(), 7);
+    assertTrue(contents.contains(r1));
+    assertTrue(contents.contains(r2));
+    assertTrue(contents.contains(r3));
+    assertTrue(contents.contains(r4));
+    assertTrue(contents.contains(r5));
+    assertTrue(contents.contains(r6));
+    assertTrue(contents.contains(r7));
+
+    ncl = new NCList<Range>();
+    assertTrue(ncl.getEntries().isEmpty());
+  }
 }