X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fschemes%2FFeatureColourTest.java;h=8f7ac7cd5804819636e0eada5527ffb3c08eb100;hb=3c8a25936a2d805e7e3d7ab82f83b13135406d18;hp=6ccce85c0d2aa8ba625e019cdfe526f702d43a72;hpb=09d3b755d9b00f5c3acb44049aedd49361dc0690;p=jalview.git diff --git a/test/jalview/schemes/FeatureColourTest.java b/test/jalview/schemes/FeatureColourTest.java index 6ccce85..8f7ac7c 100644 --- a/test/jalview/schemes/FeatureColourTest.java +++ b/test/jalview/schemes/FeatureColourTest.java @@ -38,8 +38,6 @@ import java.awt.Color; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import junit.extensions.PA; - public class FeatureColourTest { @@ -51,6 +49,30 @@ public class FeatureColourTest } @Test(groups = { "Functional" }) + public void testConstructors() + { + FeatureColourI fc = new FeatureColour(); + assertNull(fc.getColour()); + assertTrue(fc.isSimpleColour()); + assertFalse(fc.isColourByLabel()); + assertFalse(fc.isGraduatedColour()); + assertFalse(fc.isColourByAttribute()); + assertEquals(Color.white, fc.getMinColour()); + assertEquals(Color.black, fc.getMaxColour()); + + fc = new FeatureColour(Color.RED); + assertEquals(Color.red, fc.getColour()); + assertTrue(fc.isSimpleColour()); + assertFalse(fc.isColourByLabel()); + assertFalse(fc.isGraduatedColour()); + assertFalse(fc.isColourByAttribute()); + assertEquals(ColorUtils.bleachColour(Color.RED, 0.9f), + fc.getMinColour()); + assertEquals(Color.RED, fc.getMaxColour()); + + } + + @Test(groups = { "Functional" }) public void testCopyConstructor() { /* @@ -67,7 +89,8 @@ public class FeatureColourTest /* * min-max colour */ - fc = new FeatureColour(Color.gray, Color.black, 10f, 20f); + fc = new FeatureColour(null, Color.gray, Color.black, Color.gray, 10f, + 20f); fc.setAboveThreshold(true); fc.setThreshold(12f); fc1 = new FeatureColour(fc); @@ -86,12 +109,14 @@ public class FeatureColourTest /* * min-max-noValue colour */ - fc = new FeatureColour(Color.gray, Color.black, Color.green, 10f, 20f); + fc = new FeatureColour(Color.red, Color.gray, Color.black, Color.green, + 10f, 20f); fc.setAboveThreshold(true); fc.setThreshold(12f); fc1 = new FeatureColour(fc); assertTrue(fc1.isGraduatedColour()); assertFalse(fc1.isColourByLabel()); + assertFalse(fc1.isSimpleColour()); assertFalse(fc1.isColourByAttribute()); assertNull(fc1.getAttributeName()); assertTrue(fc1.isAboveThreshold()); @@ -99,6 +124,7 @@ public class FeatureColourTest assertEquals(Color.gray, fc1.getMinColour()); assertEquals(Color.black, fc1.getMaxColour()); assertEquals(Color.green, fc1.getNoColour()); + assertEquals(Color.red, fc1.getColour()); assertEquals(10f, fc1.getMin()); assertEquals(20f, fc1.getMax()); @@ -128,7 +154,8 @@ public class FeatureColourTest /* * colour by attribute (value) */ - fc = new FeatureColour(Color.gray, Color.black, Color.green, 10f, 20f); + fc = new FeatureColour(Color.yellow, Color.gray, Color.black, + Color.green, 10f, 20f); fc.setAboveThreshold(true); fc.setThreshold(12f); fc.setAttributeName("AF"); @@ -136,104 +163,19 @@ public class FeatureColourTest assertTrue(fc1.isGraduatedColour()); assertFalse(fc1.isColourByLabel()); assertTrue(fc1.isColourByAttribute()); + assertFalse(fc1.isSimpleColour()); assertArrayEquals(new String[] { "AF" }, fc1.getAttributeName()); assertTrue(fc1.isAboveThreshold()); assertEquals(12f, fc1.getThreshold()); assertEquals(Color.gray, fc1.getMinColour()); assertEquals(Color.black, fc1.getMaxColour()); assertEquals(Color.green, fc1.getNoColour()); + assertEquals(Color.yellow, fc1.getColour()); assertEquals(10f, fc1.getMin()); assertEquals(20f, fc1.getMax()); } @Test(groups = { "Functional" }) - public void testCopyConstructor_minMax() - { - /* - * graduated colour - */ - FeatureColour fc = new FeatureColour(Color.BLUE, Color.RED, 1f, 5f); - assertTrue(fc.isGraduatedColour()); - assertFalse(fc.isColourByLabel()); - assertFalse(fc.isColourByAttribute()); - assertNull(fc.getAttributeName()); - assertEquals(1f, fc.getMin()); - assertEquals(5f, fc.getMax()); - - /* - * update min-max bounds - */ - FeatureColour fc1 = new FeatureColour(fc, 2f, 6f); - assertTrue(fc1.isGraduatedColour()); - assertFalse(fc1.isColourByLabel()); - assertFalse(fc1.isColourByAttribute()); - assertNull(fc1.getAttributeName()); - assertEquals(2f, fc1.getMin()); - assertEquals(6f, fc1.getMax()); - assertFalse((boolean) PA.getValue(fc1, "isHighToLow")); - - /* - * update min-max bounds - high to low - */ - fc1 = new FeatureColour(fc, 23f, 16f); - assertTrue(fc1.isGraduatedColour()); - assertFalse(fc1.isColourByLabel()); - assertFalse(fc1.isColourByAttribute()); - assertNull(fc1.getAttributeName()); - assertEquals(23f, fc1.getMin()); - assertEquals(16f, fc1.getMax()); - assertTrue((boolean) PA.getValue(fc1, "isHighToLow")); - - /* - * graduated colour by attribute - */ - fc1.setAttributeName("AF"); - fc1 = new FeatureColour(fc1, 13f, 36f); - assertTrue(fc1.isGraduatedColour()); - assertFalse(fc1.isColourByLabel()); - assertTrue(fc1.isColourByAttribute()); - assertArrayEquals(new String[] { "AF" }, fc1.getAttributeName()); - assertEquals(13f, fc1.getMin()); - assertEquals(36f, fc1.getMax()); - assertFalse((boolean) PA.getValue(fc1, "isHighToLow")); - - /* - * colour by label - */ - fc = new FeatureColour(Color.BLUE, Color.RED, 1f, 5f); - fc.setColourByLabel(true); - assertFalse(fc.isGraduatedColour()); - assertTrue(fc.isColourByLabel()); - assertFalse(fc.isColourByAttribute()); - assertNull(fc.getAttributeName()); - assertEquals(1f, fc.getMin()); - assertEquals(5f, fc.getMax()); - - /* - * update min-max bounds - */ - fc1 = new FeatureColour(fc, 2f, 6f); - assertFalse(fc1.isGraduatedColour()); - assertTrue(fc1.isColourByLabel()); - assertFalse(fc1.isColourByAttribute()); - assertNull(fc1.getAttributeName()); - assertEquals(2f, fc1.getMin()); - assertEquals(6f, fc1.getMax()); - - /* - * colour by attribute text - */ - fc1.setAttributeName("AC"); - fc1 = new FeatureColour(fc1, 13f, 36f); - assertFalse(fc1.isGraduatedColour()); - assertTrue(fc1.isColourByLabel()); - assertTrue(fc1.isColourByAttribute()); - assertArrayEquals(new String[] { "AC" }, fc1.getAttributeName()); - assertEquals(13f, fc1.getMin()); - assertEquals(36f, fc1.getMax()); - } - - @Test(groups = { "Functional" }) public void testGetColor_simpleColour() { FeatureColour fc = new FeatureColour(Color.RED); @@ -260,7 +202,8 @@ public class FeatureColourTest * score 0 to 100 * gray(128, 128, 128) to red(255, 0, 0) */ - FeatureColour fc = new FeatureColour(Color.GRAY, Color.RED, 0f, 100f); + FeatureColour fc = new FeatureColour(null, Color.GRAY, Color.RED, null, + 0f, 100f); // feature score is 75 which is 3/4 of the way from GRAY to RED SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 75f, null); @@ -276,8 +219,8 @@ public class FeatureColourTest public void testGetColor_aboveBelowThreshold() { // gradient from [50, 150] from WHITE(255, 255, 255) to BLACK(0, 0, 0) - FeatureColour fc = new FeatureColour(Color.WHITE, Color.BLACK, 50f, - 150f); + FeatureColour fc = new FeatureColour(null, Color.WHITE, Color.BLACK, + Color.white, 50f, 150f); SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 70f, null); @@ -371,7 +314,8 @@ public class FeatureColourTest * graduated colour by score, no threshold * - default constructor sets noValueColor = minColor */ - fc = new FeatureColour(Color.GREEN, Color.RED, 12f, 25f); + fc = new FeatureColour(null, Color.GREEN, Color.RED, Color.GREEN, 12f, + 25f); String greenHex = Format.getHexString(Color.GREEN); String expected = String.format( "domain\tscore|%s|%s|noValueMin|abso|12.0|25.0|none", greenHex, @@ -381,7 +325,8 @@ public class FeatureColourTest /* * graduated colour by score, no threshold, no value gets min colour */ - fc = new FeatureColour(Color.GREEN, Color.RED, Color.GREEN, 12f, 25f); + fc = new FeatureColour(Color.RED, Color.GREEN, Color.RED, Color.GREEN, + 12f, 25f); expected = String.format( "domain\tscore|%s|%s|noValueMin|abso|12.0|25.0|none", greenHex, redHex); @@ -390,7 +335,8 @@ public class FeatureColourTest /* * graduated colour by score, no threshold, no value gets max colour */ - fc = new FeatureColour(Color.GREEN, Color.RED, Color.RED, 12f, 25f); + fc = new FeatureColour(Color.RED, Color.GREEN, Color.RED, Color.RED, + 12f, 25f); expected = String.format( "domain\tscore|%s|%s|noValueMax|abso|12.0|25.0|none", greenHex, redHex); @@ -687,8 +633,9 @@ public class FeatureColourTest * graduated colour based on attribute value for AF * given a min-max range of 0-100 */ - FeatureColour fc = new FeatureColour(new Color(50, 100, 150), - new Color(150, 200, 250), Color.yellow, 0f, 100f); + FeatureColour fc = new FeatureColour(Color.white, + new Color(50, 100, 150), new Color(150, 200, 250), Color.yellow, + 0f, 100f); String attName = "AF"; fc.setAttributeName(attName); @@ -721,7 +668,8 @@ public class FeatureColourTest assertFalse(fc.isOutwithThreshold(null)); assertFalse(fc.isOutwithThreshold(sf)); - fc = new FeatureColour(Color.white, Color.black, Color.green, 0f, 10f); + fc = new FeatureColour(null, Color.white, Color.black, Color.green, 0f, + 10f); assertFalse(fc.isOutwithThreshold(sf)); // no threshold fc.setAboveThreshold(true);