X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FFeatureSettingsTest.java;h=321adf6d238b26ca13d2f1710a91ce0e8f9a53d1;hb=4c132b37c867a60959dae032addd78892d996345;hp=db37733c18f31c1a1a42fc102ed95b4e25f3f7f9;hpb=c184de2a81afe5ba6f8b7b68dde221c256e70195;p=jalview.git

diff --git a/test/jalview/gui/FeatureSettingsTest.java b/test/jalview/gui/FeatureSettingsTest.java
index db37733..321adf6 100644
--- a/test/jalview/gui/FeatureSettingsTest.java
+++ b/test/jalview/gui/FeatureSettingsTest.java
@@ -197,20 +197,23 @@ public class FeatureSettingsTest
   @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";
-    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);
-    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>");
 
     /*
@@ -219,11 +222,16 @@ public class FeatureSettingsTest
     fc = new FeatureColour(Color.red, Color.blue, 2f, 10f);
     fc.setBelowThreshold(true);
     fc.setThreshold(4f);
-    assertEquals(FeatureSettings.getColorTooltip(fc),
+    assertEquals(FeatureSettings.getColorTooltip(fc, false),
+            "<html>By Score (&lt; 4.0)</html>");
+    assertEquals(FeatureSettings.getColorTooltip(fc, true),
             "<html>By Score (&lt; 4.0)<br>" + simpleTooltip
                     + "</br></html>");
+
     fc.setAboveThreshold(true);
-    assertEquals(FeatureSettings.getColorTooltip(fc),
+    assertEquals(FeatureSettings.getColorTooltip(fc, false),
+            "<html>By Score (&gt; 4.0)</html>");
+    assertEquals(FeatureSettings.getColorTooltip(fc, true),
             "<html>By Score (&gt; 4.0)<br>" + simpleTooltip
                     + "</br></html>");
   }
