git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3253-applet JAL-3397
[jalview.git]
/
test
/
intervalstore
/
nonc
/
IntervalStoreTest.java
diff --git
a/test/intervalstore/nonc/IntervalStoreTest.java
b/test/intervalstore/nonc/IntervalStoreTest.java
index
e21976a
..
581f5f4
100644
(file)
--- a/
test/intervalstore/nonc/IntervalStoreTest.java
+++ b/
test/intervalstore/nonc/IntervalStoreTest.java
@@
-60,7
+60,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_nonNested()
{
@Test(groups = "Functional")
public void testFindOverlaps_nonNested()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 20);
// same range different description
SimpleFeature sf2 = new SimpleFeature(10, 20, "desc");
SimpleFeature sf1 = add(store, 10, 20);
// same range different description
SimpleFeature sf2 = new SimpleFeature(10, 20, "desc");
@@
-100,7
+100,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_nested()
{
@Test(groups = "Functional")
public void testFindOverlaps_nested()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 10, 40);
SimpleFeature sf3 = add(store, 20, 30);
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 10, 40);
SimpleFeature sf3 = add(store, 20, 30);
@@
-138,7
+138,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_mixed()
{
@Test(groups = "Functional")
public void testFindOverlaps_mixed()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 1, 15);
SimpleFeature sf3 = add(store, 20, 30);
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 1, 15);
SimpleFeature sf3 = add(store, 20, 30);
@@
-195,7
+195,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testRemove()
{
@Test(groups = "Functional")
public void testRemove()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 20);
assertTrue(store.contains(sf1));
SimpleFeature sf1 = add(store, 10, 20);
assertTrue(store.contains(sf1));
@@
-285,7
+285,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testAdd()
{
@Test(groups = "Functional")
public void testAdd()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
assertFalse(store.add(null));
assertFalse(store.add(null));
@@
-315,7
+315,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testAdd_noDuplicates()
{
@Test(groups = "Functional")
public void testAdd_noDuplicates()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = new SimpleFeature(10, 20, "Cath");
SimpleFeature sf2 = new SimpleFeature(10, 20, "Cath");
SimpleFeature sf1 = new SimpleFeature(10, 20, "Cath");
SimpleFeature sf2 = new SimpleFeature(10, 20, "Cath");
@@
-331,7
+331,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testIsEmpty()
{
@Test(groups = "Functional")
public void testIsEmpty()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
assertTrue(store.isEmpty());
assertEquals(store.size(), 0);
assertTrue(store.isEmpty());
assertEquals(store.size(), 0);
@@
-384,7
+384,7
@@
public class IntervalStoreTest
/*
* add a feature and a nested feature
*/
/*
* add a feature and a nested feature
*/
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 20);
// sf2 is nested in sf1 so will be stored in nestedFeatures
SimpleFeature sf2 = add(store, 12, 14);
SimpleFeature sf1 = add(store, 10, 20);
// sf2 is nested in sf1 so will be stored in nestedFeatures
SimpleFeature sf2 = add(store, 12, 14);
@@
-410,7
+410,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testContains()
{
@Test(groups = "Functional")
public void testContains()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = new SimpleFeature(10, 20, "Cath");
SimpleFeature sf2 = new SimpleFeature(10, 20, "Pfam");
SimpleFeature sf1 = new SimpleFeature(10, 20, "Cath");
SimpleFeature sf2 = new SimpleFeature(10, 20, "Pfam");
@@
-447,7
+447,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_mixed()
{
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_mixed()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 1, 15);
SimpleFeature sf3 = add(store, 20, 30);
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 1, 15);
SimpleFeature sf3 = add(store, 20, 30);
@@
-510,7
+510,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_nested()
{
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_nested()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 10, 40);
SimpleFeature sf3 = add(store, 20, 30);
SimpleFeature sf1 = add(store, 10, 50);
SimpleFeature sf2 = add(store, 10, 40);
SimpleFeature sf3 = add(store, 20, 30);
@@
-552,7
+552,7
@@
public class IntervalStoreTest
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_nonNested()
{
@Test(groups = "Functional")
public void testFindOverlaps_resultsArg_nonNested()
{
- IntervalStore<SimpleFeature> store = new IntervalStore<>();
+ IntervalStore<SimpleFeature> store = new IntervalStoreImpl();
SimpleFeature sf1 = add(store, 10, 20);
// same range different description
SimpleFeature sf2 = new SimpleFeature(10, 20, "desc");
SimpleFeature sf1 = add(store, 10, 20);
// same range different description
SimpleFeature sf2 = new SimpleFeature(10, 20, "desc");