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
Jalview-JS/JAL-3253-applet adds AlignFrameI empty interface to allow
[jalview.git]
/
test
/
jalview
/
gui
/
FeatureSettingsTest.java
diff --git
a/test/jalview/gui/FeatureSettingsTest.java
b/test/jalview/gui/FeatureSettingsTest.java
index
db37733
..
6d8a47e
100644
(file)
--- a/
test/jalview/gui/FeatureSettingsTest.java
+++ b/
test/jalview/gui/FeatureSettingsTest.java
@@
-61,8
+61,8
@@
public class FeatureSettingsTest
fr.setColour("type2", byLabel);
// type3: by score above threshold
fr.setColour("type2", byLabel);
// type3: by score above threshold
- FeatureColourI byScore = new FeatureColour(Color.BLACK, Color.BLUE, 1,
- 10);
+ FeatureColourI byScore = new FeatureColour(null, Color.BLACK,
+ Color.BLUE, null, 1, 10);
byScore.setAboveThreshold(true);
byScore.setThreshold(2f);
fr.setColour("type3", byScore);
byScore.setAboveThreshold(true);
byScore.setThreshold(2f);
fr.setColour("type3", byScore);
@@
-74,8
+74,8
@@
public class FeatureSettingsTest
fr.setColour("type4", byAF);
// type5: by attribute CSQ:PolyPhen below threshold
fr.setColour("type4", byAF);
// type5: by attribute CSQ:PolyPhen below threshold
- FeatureColourI byPolyPhen = new FeatureColour(Color.BLACK, Color.BLUE,
- 1, 10);
+ FeatureColourI byPolyPhen = new FeatureColour(null, Color.BLACK,
+ Color.BLUE, null, 1, 10);
byPolyPhen.setBelowThreshold(true);
byPolyPhen.setThreshold(3f);
byPolyPhen.setAttributeName("CSQ", "PolyPhen");
byPolyPhen.setBelowThreshold(true);
byPolyPhen.setThreshold(3f);
byPolyPhen.setAttributeName("CSQ", "PolyPhen");
@@
-197,33
+197,41
@@
public class FeatureSettingsTest
@Test(groups = "Functional")
public void testGetColorTooltip() throws IOException
{
@Test(groups = "Functional")
public void testGetColorTooltip() throws IOException
{
- assertNull(FeatureSettings.getColorTooltip(null));
+ assertNull(FeatureSettings.getColorTooltip(null, false));
/*
* simple colour
*/
FeatureColourI fc = new FeatureColour(Color.black);
String simpleTooltip = "Click to edit, right-click for menu";
/*
* simple colour
*/
FeatureColourI fc = new FeatureColour(Color.black);
String simpleTooltip = "Click to edit, right-click for menu";
- assertEquals(FeatureSettings.getColorTooltip(fc), simpleTooltip);
+ assertEquals(FeatureSettings.getColorTooltip(fc, true), simpleTooltip);
+ assertNull(FeatureSettings.getColorTooltip(fc, false));
/*
* graduated colour tooltip includes description of colour
*/
fc.setColourByLabel(true);
/*
* graduated colour tooltip includes description of colour
*/
fc.setColourByLabel(true);
- assertEquals(FeatureSettings.getColorTooltip(fc),
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "<html>By Label</html>");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
"<html>By Label<br>" + simpleTooltip + "</br></html>");
/*
* graduated colour with threshold is html-encoded
*/
"<html>By Label<br>" + simpleTooltip + "</br></html>");
/*
* graduated colour with threshold is html-encoded
*/
- fc = new FeatureColour(Color.red, Color.blue, 2f, 10f);
+ fc = new FeatureColour(null, Color.red, Color.blue, null, 2f, 10f);
fc.setBelowThreshold(true);
fc.setThreshold(4f);
fc.setBelowThreshold(true);
fc.setThreshold(4f);
- assertEquals(FeatureSettings.getColorTooltip(fc),
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "<html>By Score (< 4.0)</html>");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
"<html>By Score (< 4.0)<br>" + simpleTooltip
+ "</br></html>");
"<html>By Score (< 4.0)<br>" + simpleTooltip
+ "</br></html>");
+
fc.setAboveThreshold(true);
fc.setAboveThreshold(true);
- assertEquals(FeatureSettings.getColorTooltip(fc),
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "<html>By Score (> 4.0)</html>");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
"<html>By Score (> 4.0)<br>" + simpleTooltip
+ "</br></html>");
}
"<html>By Score (> 4.0)<br>" + simpleTooltip
+ "</br></html>");
}