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-4061 JAL-4062 Find can now search features
[jalview.git]
/
test
/
jalview
/
controller
/
AlignViewControllerTest.java
diff --git
a/test/jalview/controller/AlignViewControllerTest.java
b/test/jalview/controller/AlignViewControllerTest.java
index
ca3b55c
..
e8e0bb1
100644
(file)
--- a/
test/jalview/controller/AlignViewControllerTest.java
+++ b/
test/jalview/controller/AlignViewControllerTest.java
@@
-23,6
+23,13
@@
package jalview.controller;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
+import java.awt.Color;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
import jalview.analysis.Finder;
import jalview.api.AlignViewControllerI;
import jalview.api.FeatureColourI;
import jalview.analysis.Finder;
import jalview.api.AlignViewControllerI;
import jalview.api.FeatureColourI;
@@
-40,13
+47,6
@@
import jalview.io.DataSourceType;
import jalview.io.FileLoader;
import jalview.schemes.FeatureColour;
import jalview.io.FileLoader;
import jalview.schemes.FeatureColour;
-import java.awt.Color;
-import java.util.Arrays;
-import java.util.BitSet;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
public class AlignViewControllerTest
{
public class AlignViewControllerTest
{
@@
-226,7
+226,7
@@
public class AlignViewControllerTest
* test Match/Find works first
*/
FinderI f = new Finder(af.getViewport());
* test Match/Find works first
*/
FinderI f = new Finder(af.getViewport());
- f.findAll("M+", true, false, false);
+ f.findAll("M+", true, false, 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());