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
Merge branch 'patch/Release_2_11_1_Branch_patch_JAL-3490' into releases/Release_2_11_...
[jalview.git]
/
test
/
jalview
/
controller
/
AlignViewControllerTest.java
diff --git
a/test/jalview/controller/AlignViewControllerTest.java
b/test/jalview/controller/AlignViewControllerTest.java
index
efee93b
..
fde4da1
100644
(file)
--- a/
test/jalview/controller/AlignViewControllerTest.java
+++ b/
test/jalview/controller/AlignViewControllerTest.java
@@
-26,6
+26,7
@@
import static org.testng.AssertJUnit.assertTrue;
import jalview.analysis.Finder;
import jalview.api.AlignViewControllerI;
import jalview.api.FeatureColourI;
import jalview.analysis.Finder;
import jalview.api.AlignViewControllerI;
import jalview.api.FeatureColourI;
+import jalview.api.FinderI;
import jalview.datamodel.Alignment;
import jalview.datamodel.SearchResults;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.Alignment;
import jalview.datamodel.SearchResults;
import jalview.datamodel.SearchResultsI;
@@
-147,7
+148,8
@@
public class AlignViewControllerTest
* seq1 feature in columns 4-6 is hidden
* seq2 feature in columns 6-7 is shown
*/
* seq1 feature in columns 4-6 is hidden
* seq2 feature in columns 6-7 is shown
*/
- FeatureColourI fc = new FeatureColour(Color.red, Color.blue, 0f, 10f);
+ FeatureColourI fc = new FeatureColour(null, Color.red, Color.blue, null,
+ 0f, 10f);
fc.setAboveThreshold(true);
fc.setThreshold(5f);
af.getFeatureRenderer().setColour("Metal", fc);
fc.setAboveThreshold(true);
fc.setThreshold(5f);
af.getFeatureRenderer().setColour("Metal", fc);
@@
-222,10
+224,8
@@
public class AlignViewControllerTest
/*
* test Match/Find works first
*/
/*
* test Match/Find works first
*/
- Finder f = new Finder(af.getViewport().getAlignment(), null);
- f.setFindAll(true);
- f.setCaseSensitive(true);
- f.find("M+");
+ FinderI f = new Finder(af.getViewport());
+ f.findAll("M+", true, false, false);
assertEquals(
"Finder found different set of results to manually created SearchResults",
sr, f.getSearchResults());
assertEquals(
"Finder found different set of results to manually created SearchResults",
sr, f.getSearchResults());