X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSequenceTest.java;h=c65ba28cf2bce9ea0ac8661261586570c80fe668;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=2b44261cd4d7b0155fbf68ffc37cd904ebfecfae;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/test/jalview/datamodel/SequenceTest.java b/test/jalview/datamodel/SequenceTest.java index 2b44261..c65ba28 100644 --- a/test/jalview/datamodel/SequenceTest.java +++ b/test/jalview/datamodel/SequenceTest.java @@ -30,14 +30,6 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; -import jalview.analysis.AlignmentGenerator; -import jalview.commands.EditCommand; -import jalview.commands.EditCommand.Action; -import jalview.datamodel.PDBEntry.Type; -import jalview.gui.JvOptionPane; -import jalview.util.MapList; -import jalview.ws.params.InvalidArgumentException; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -51,6 +43,13 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import jalview.analysis.AlignmentGenerator; +import jalview.commands.EditCommand; +import jalview.commands.EditCommand.Action; +import jalview.datamodel.PDBEntry.Type; +import jalview.gui.JvOptionPane; +import jalview.util.MapList; + import junit.extensions.PA; public class SequenceTest @@ -347,8 +346,6 @@ public class SequenceTest * invalid inputs */ assertNull(sq.findPositions(6, 5)); - assertNull(sq.findPositions(0, 5)); - assertNull(sq.findPositions(-1, 5)); /* * all gapped ranges @@ -391,6 +388,16 @@ public class SequenceTest assertEquals(new Range(11, 12), sq.findPositions(5, 10)); // DE assertEquals(new Range(8, 13), sq.findPositions(1, 13)); // the lot assertEquals(new Range(8, 13), sq.findPositions(1, 99)); + + /** + * now try on a sequence with no gaps + */ + sq.createDatasetSequence(); + assertEquals(new Range(8, 13), + sq.getDatasetSequence().findPositions(1, 99)); + assertEquals(new Range(8, 13), + sq.getDatasetSequence().findPositions(0, 99)); + } /**