X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FFeatureSettingsTest.java;h=f09c7c799081e8cd61f57ce8ffdbaf6b02226a58;hb=f9e0571f0dd29ed64726e4e62d4e7c093be688c5;hp=29c3e56c461c48b39f2c1488489d715f7b32331f;hpb=e42eed3a0089a8a064560df4cf17a5021fd1e16a;p=jalview.git
diff --git a/test/jalview/gui/FeatureSettingsTest.java b/test/jalview/gui/FeatureSettingsTest.java
index 29c3e56..f09c7c7 100644
--- a/test/jalview/gui/FeatureSettingsTest.java
+++ b/test/jalview/gui/FeatureSettingsTest.java
@@ -4,6 +4,13 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import java.awt.Color;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.testng.annotations.Test;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
@@ -13,14 +20,9 @@ import jalview.datamodel.features.FeatureMatcherSetI;
import jalview.io.DataSourceType;
import jalview.io.FileLoader;
import jalview.schemes.FeatureColour;
+import jalview.schemes.FeatureColourTest;
import jalview.util.matcher.Condition;
-
-import java.awt.Color;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.testng.annotations.Test;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
public class FeatureSettingsTest
{
@@ -49,7 +51,7 @@ public class FeatureSettingsTest
/*
* set colour schemes for features
*/
- FeatureRenderer fr = af.getFeatureRenderer();
+ FeatureRendererModel fr = af.getFeatureRenderer();
// type1: red
fr.setColour("type1", new FeatureColour(Color.red));
@@ -158,7 +160,7 @@ public class FeatureSettingsTest
assertEquals(fr.getFeatureFilter("type2").toStableString(),
"(Score LE 2.4) AND (Score GT 1.1)");
assertEquals(fr.getFeatureFilter("type3").toStableString(),
- "(AF Contains X) OR (CSQ:PolyPhen NE 0.0)");
+ "(AF Contains X) OR (CSQ:PolyPhen NE 0)");
}
/**
@@ -188,4 +190,50 @@ public class FeatureSettingsTest
});
seq.addSequenceFeature(sf);
}
+
+ /**
+ * @see FeatureColourTest#testGetDescription()
+ * @throws IOException
+ */
+ @Test(groups = "Functional")
+ public void testGetColorTooltip() throws IOException
+ {
+ assertNull(FeatureSettings.getColorTooltip(null, false));
+
+ /*
+ * simple colour
+ */
+ FeatureColourI fc = new FeatureColour(Color.black);
+ String simpleTooltip = "Click to edit, right-click for menu";
+ assertEquals(FeatureSettings.getColorTooltip(fc, true), simpleTooltip);
+ assertNull(FeatureSettings.getColorTooltip(fc, false));
+
+ /*
+ * graduated colour tooltip includes description of colour
+ */
+ fc.setColourByLabel(true);
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "By Label");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
+ "By Label
" + simpleTooltip + "");
+
+ /*
+ * graduated colour with threshold is html-encoded
+ */
+ fc = new FeatureColour(null, Color.red, Color.blue, null, 2f, 10f);
+ fc.setBelowThreshold(true);
+ fc.setThreshold(4f);
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "By Score (< 4.0)");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
+ "By Score (< 4.0)
" + simpleTooltip
+ + "");
+
+ fc.setAboveThreshold(true);
+ assertEquals(FeatureSettings.getColorTooltip(fc, false),
+ "By Score (> 4.0)");
+ assertEquals(FeatureSettings.getColorTooltip(fc, true),
+ "By Score (> 4.0)
" + simpleTooltip
+ + "");
+ }
}