X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FFeatureColourTest.java;h=42b898db0fd8bd8a57138cde4b519a6a63b616bf;hb=0788111a588187a04dd0d254d70b055274cf2c9d;hp=dae70f7b15b7084cea8b48fa9eff479274253bd5;hpb=065aabb4c7dc81aed595099ae64e00be4055e89e;p=jalview.git

diff --git a/test/jalview/schemes/FeatureColourTest.java b/test/jalview/schemes/FeatureColourTest.java
index dae70f7..42b898d 100644
--- a/test/jalview/schemes/FeatureColourTest.java
+++ b/test/jalview/schemes/FeatureColourTest.java
@@ -281,8 +281,9 @@ public class FeatureColourTest
     fc = new FeatureColour();
     fc.setColourByLabel(true);
     fc.setAttributeName("CLIN_SIG");
-    assertEquals("domain\tattribute|CLIN_SIG", fc.toJalviewFormat("domain"));
-    
+    assertEquals("domain\tattribute|CLIN_SIG",
+            fc.toJalviewFormat("domain"));
+
     /*
      * colour by label (autoscaled) (an odd state you can reach by selecting
      * 'above threshold', then deselecting 'threshold is min/max' then 'colour
@@ -348,7 +349,7 @@ public class FeatureColourTest
             "domain\tscore|%s|%s|noValueMax|abso|12.0|25.0|none", greenHex,
             redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));
-    
+
     /*
      * colour ranges over the actual score ranges (not min/max)
      */
@@ -364,8 +365,8 @@ public class FeatureColourTest
     fc.setThreshold(12.5f);
     fc.setBelowThreshold(true);
     expected = String.format(
-            "domain\tscore|%s|%s|noValueMax|12.0|25.0|below|12.5",
-            greenHex, redHex);
+            "domain\tscore|%s|%s|noValueMax|12.0|25.0|below|12.5", greenHex,
+            redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));
 
     /*
@@ -407,8 +408,8 @@ public class FeatureColourTest
     /*
      * simple colour by hex code
      */
-    fc = FeatureColour.parseJalviewFeatureColour(Format
-            .getHexString(Color.RED));
+    fc = FeatureColour
+            .parseJalviewFeatureColour(Format.getHexString(Color.RED));
     assertTrue(fc.isSimpleColour());
     assertEquals(Color.RED, fc.getColour());
 
@@ -671,7 +672,8 @@ public class FeatureColourTest
   public void testIsOutwithThreshold()
   {
     FeatureColourI fc = new FeatureColour(Color.red);
-    SequenceFeature sf = new SequenceFeature("METAL", "desc", 10, 12, 1.2f, "grp");
+    SequenceFeature sf = new SequenceFeature("METAL", "desc", 10, 12, 1.2f,
+            "grp");
     assertFalse(fc.isOutwithThreshold(null));
     assertFalse(fc.isOutwithThreshold(sf));
 
@@ -722,14 +724,14 @@ public class FeatureColourTest
             String.format("r=%d,g=%d,b=%d", Color.RED.getRed(),
                     Color.red.getGreen(), Color.red.getBlue()),
             fc.getDescription());
-  
+
     /*
      * colour by label (no threshold)
      */
     fc = new FeatureColour();
     fc.setColourByLabel(true);
     assertEquals("By Label", fc.getDescription());
-  
+
     /*
      * colour by attribute text (no threshold)
      */
@@ -737,7 +739,7 @@ public class FeatureColourTest
     fc.setColourByLabel(true);
     fc.setAttributeName("CLIN_SIG");
     assertEquals("By CLIN_SIG", fc.getDescription());
-  
+
     /*
      * colour by label (above score threshold) 
      */
@@ -746,47 +748,41 @@ public class FeatureColourTest
     fc.setAutoScaled(false);
     fc.setThreshold(12.5f);
     fc.setAboveThreshold(true);
-    assertEquals("By Label (Score > 12.5)",
-            fc.getDescription());
-  
+    assertEquals("By Label (Score > 12.5)", fc.getDescription());
+
     /*
      * colour by label (below score threshold)
      */
     fc.setBelowThreshold(true);
-    assertEquals("By Label (Score < 12.5)",
-            fc.getDescription());
-  
+    assertEquals("By Label (Score < 12.5)", fc.getDescription());
+
     /*
      * colour by attributes text (below score threshold)
      */
     fc.setBelowThreshold(true);
     fc.setAttributeName("CSQ", "Consequence");
-    assertEquals(
-            "By CSQ:Consequence (Score < 12.5)",
-            fc.getDescription());
-  
+    assertEquals("By CSQ:Consequence (Score < 12.5)", fc.getDescription());
+
     /*
      * graduated colour by score, no threshold
      */
     fc = new FeatureColour(null, Color.GREEN, Color.RED, null, 12f, 25f);
     assertEquals("By Score", fc.getDescription());
-  
+
     /*
      * graduated colour by score, below threshold
      */
     fc.setThreshold(12.5f);
     fc.setBelowThreshold(true);
-    assertEquals("By Score (< 12.5)",
-            fc.getDescription());
-  
+    assertEquals("By Score (< 12.5)", fc.getDescription());
+
     /*
      * graduated colour by score, above threshold
      */
     fc.setThreshold(12.5f);
     fc.setAboveThreshold(true);
     fc.setAutoScaled(false);
-    assertEquals("By Score (> 12.5)",
-            fc.getDescription());
+    assertEquals("By Score (> 12.5)", fc.getDescription());
 
     /*
      * graduated colour by attribute, no threshold
@@ -795,13 +791,12 @@ public class FeatureColourTest
     fc.setAboveThreshold(false);
     fc.setAutoScaled(false);
     assertEquals("By CSQ:AF", fc.getDescription());
-  
+
     /*
      * graduated colour by attribute, above threshold
      */
     fc.setAboveThreshold(true);
     fc.setAutoScaled(false);
-    assertEquals("By CSQ:AF (> 12.5)",
-            fc.getDescription());
+    assertEquals("By CSQ:AF (> 12.5)", fc.getDescription());
   }
 }