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-3847 Some attempts to fix a few eclipse import problems
[jalview.git]
/
test
/
jalview
/
analysis
/
AlignmentAnnotationUtilsTest.java
diff --git
a/test/jalview/analysis/AlignmentAnnotationUtilsTest.java
b/test/jalview/analysis/AlignmentAnnotationUtilsTest.java
index
c3191e8
..
cdb950e
100644
(file)
--- a/
test/jalview/analysis/AlignmentAnnotationUtilsTest.java
+++ b/
test/jalview/analysis/AlignmentAnnotationUtilsTest.java
@@
-28,7
+28,9
@@
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
+import jalview.gui.JvOptionPane;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
import java.io.IOException;
import java.util.ArrayList;
import java.io.IOException;
import java.util.ArrayList;
@@
-38,11
+40,20
@@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class AlignmentAnnotationUtilsTest
{
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class AlignmentAnnotationUtilsTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
// 4 sequences x 13 positions
final static String EOL = "\n";
// 4 sequences x 13 positions
final static String EOL = "\n";
@@
-142,7
+153,7
@@
public class AlignmentAnnotationUtilsTest
public void setUp() throws IOException
{
alignment = new jalview.io.FormatAdapter().readFile(TEST_DATA,
public void setUp() throws IOException
{
alignment = new jalview.io.FormatAdapter().readFile(TEST_DATA,
- AppletFormatAdapter.PASTE, "FASTA");
+ DataSourceType.PASTE, FileFormat.Fasta);
AlignmentAnnotation[] anns = new AlignmentAnnotation[SEQ_ANN_COUNT];
for (int i = 0; i < anns.length; i++)
AlignmentAnnotation[] anns = new AlignmentAnnotation[SEQ_ANN_COUNT];
for (int i = 0; i < anns.length; i++)
@@
-398,9
+409,8
@@
public class AlignmentAnnotationUtilsTest
anns[4].graphGroup = -1;
anns[4].visible = true;
anns[4].graphGroup = -1;
anns[4].visible = true;
- BitSet result = AlignmentAnnotationUtils
- .getVisibleLineGraphGroups(AlignmentAnnotationUtils
- .asList(anns));
+ BitSet result = AlignmentAnnotationUtils.getVisibleLineGraphGroups(
+ AlignmentAnnotationUtils.asList(anns));
assertTrue(result.get(5));
assertFalse(result.get(0));
assertFalse(result.get(1));
assertTrue(result.get(5));
assertFalse(result.get(0));
assertFalse(result.get(1));