X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fcontroller%2FAlignViewControllerTest.java;h=ca3b55c07cd33784147d173e2e41cd5705bdfa18;hb=8879d902c46cd33cfe201fcbd96e87d33b89259f;hp=fde4da174b25d2298f1568382637d353b15a664f;hpb=6b13a606027284408286d1cd2833470d1f9b9bfe;p=jalview.git diff --git a/test/jalview/controller/AlignViewControllerTest.java b/test/jalview/controller/AlignViewControllerTest.java index fde4da1..ca3b55c 100644 --- a/test/jalview/controller/AlignViewControllerTest.java +++ b/test/jalview/controller/AlignViewControllerTest.java @@ -68,18 +68,17 @@ public class AlignViewControllerTest /* * features start/end are base 1 */ - seq1.addSequenceFeature(new SequenceFeature("Metal", "desc", 2, 4, 0f, - null)); - seq1.addSequenceFeature(new SequenceFeature("Helix", "desc", 1, 15, 0f, - null)); - seq2.addSequenceFeature(new SequenceFeature("Metal", "desc", 4, 10, - 10f, - null)); - seq3.addSequenceFeature(new SequenceFeature("Metal", "desc", 11, 15, - 10f, null)); + seq1.addSequenceFeature( + new SequenceFeature("Metal", "desc", 2, 4, 0f, null)); + seq1.addSequenceFeature( + new SequenceFeature("Helix", "desc", 1, 15, 0f, null)); + seq2.addSequenceFeature( + new SequenceFeature("Metal", "desc", 4, 10, 10f, null)); + seq3.addSequenceFeature( + new SequenceFeature("Metal", "desc", 11, 15, 10f, null)); // disulfide bond is a 'contact feature' - only select its 'start' and 'end' - seq3.addSequenceFeature(new SequenceFeature("disulfide bond", "desc", - 8, 12, 0f, null)); + seq3.addSequenceFeature( + new SequenceFeature("disulfide bond", "desc", 8, 12, 0f, null)); /* * select the first five columns --> Metal in seq1 cols 4-5 @@ -95,8 +94,9 @@ public class AlignViewControllerTest /* * set features visible on a viewport as only visible features are selected */ - AlignFrame af = new AlignFrame(new Alignment(new SequenceI[] { seq1, - seq2, seq3, seq4 }), 100, 100); + AlignFrame af = new AlignFrame( + new Alignment(new SequenceI[] + { seq1, seq2, seq3, seq4 }), 100, 100); af.getFeatureRenderer().findAllFeatures(true); AlignViewController avc = new AlignViewController(af, af.getViewport(), @@ -205,7 +205,8 @@ public class AlignViewControllerTest AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "seq1 aMMMaaaaaaaaaaaaaaaa\n" + "seq2 aaaMMMMMMMaaaaaaaaaa\n" + "seq3 aaaaaaaaaaMMMMMaaaaa\n" - + "seq4 aaaaaaaaaaaaaaaaaaaa\n", DataSourceType.PASTE); + + "seq4 aaaaaaaaaaaaaaaaaaaa\n", + DataSourceType.PASTE); SearchResultsI sr = new SearchResults(); SequenceI[] sqs = af.getViewport().getAlignment().getSequencesArray(); @@ -237,8 +238,9 @@ public class AlignViewControllerTest AlignViewControllerI avc = af.avc; avc.markHighlightedColumns(false, false, false); - assertTrue("Didn't select highlighted columns", Arrays.deepEquals(af - .getViewport().getColumnSelection().getSelectedRanges() - .toArray(), new int[][] { { 1, 14 } })); + assertTrue("Didn't select highlighted columns", + Arrays.deepEquals(af.getViewport().getColumnSelection() + .getSelectedRanges().toArray(), new int[][] + { { 1, 14 } })); } }