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-2506 relocate Uniprot binding classes, bind to UniprotFeature not
[jalview.git]
/
test
/
jalview
/
schemes
/
FeatureColourTest.java
diff --git
a/test/jalview/schemes/FeatureColourTest.java
b/test/jalview/schemes/FeatureColourTest.java
index
47613a1
..
822fcd4
100644
(file)
--- a/
test/jalview/schemes/FeatureColourTest.java
+++ b/
test/jalview/schemes/FeatureColourTest.java
@@
-27,6
+27,7
@@
import static org.testng.AssertJUnit.fail;
import jalview.datamodel.SequenceFeature;
import jalview.gui.JvOptionPane;
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;
@@
-86,7
+87,8
@@
public class FeatureColourTest
public void testIsColored_simpleColour()
{
FeatureColour fc = new FeatureColour(Color.RED);
public void testIsColored_simpleColour()
{
FeatureColour fc = new FeatureColour(Color.RED);
- assertTrue(fc.isColored(new SequenceFeature()));
+ assertTrue(fc
+ .isColored(new SequenceFeature("Cath", "", 1, 2, 0f, null)));
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-94,7
+96,8
@@
public class FeatureColourTest
{
FeatureColour fc = new FeatureColour();
fc.setColourByLabel(true);
{
FeatureColour fc = new FeatureColour();
fc.setColourByLabel(true);
- assertTrue(fc.isColored(new SequenceFeature()));
+ assertTrue(fc
+ .isColored(new SequenceFeature("Cath", "", 1, 2, 0f, null)));
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-136,7
+139,8
@@
public class FeatureColourTest
public void testGetColor_simpleColour()
{
FeatureColour fc = new FeatureColour(Color.RED);
public void testGetColor_simpleColour()
{
FeatureColour fc = new FeatureColour(Color.RED);
- assertEquals(Color.RED, fc.getColor(new SequenceFeature()));
+ assertEquals(Color.RED,
+ fc.getColor(new SequenceFeature("Cath", "", 1, 2, 0f, null)));
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-146,7
+150,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));
}