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-2629 hmmalign can now be run from the sequence pop-up menu
[jalview.git]
/
test
/
jalview
/
schemes
/
FeatureColourTest.java
diff --git
a/test/jalview/schemes/FeatureColourTest.java
b/test/jalview/schemes/FeatureColourTest.java
index
fd49971
..
c16d541
100644
(file)
--- a/
test/jalview/schemes/FeatureColourTest.java
+++ b/
test/jalview/schemes/FeatureColourTest.java
@@
-26,14
+26,25
@@
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.fail;
import jalview.datamodel.SequenceFeature;
import static org.testng.AssertJUnit.fail;
import jalview.datamodel.SequenceFeature;
+import jalview.gui.JvOptionPane;
+import jalview.util.ColorUtils;
import jalview.util.Format;
import java.awt.Color;
import jalview.util.Format;
import java.awt.Color;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class FeatureColourTest
{
import org.testng.annotations.Test;
public class FeatureColourTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testCopyConstructor()
{
@Test(groups = { "Functional" })
public void testCopyConstructor()
{
@@
-136,7
+147,7
@@
public class FeatureColourTest
fc.setColourByLabel(true);
SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 1f,
null);
fc.setColourByLabel(true);
SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 1f,
null);
- Color expected = UserColourScheme.createColourFromName("desc");
+ Color expected = ColorUtils.createColourFromName("desc");
assertEquals(expected, fc.getColor(sf));
}
assertEquals(expected, fc.getColor(sf));
}