diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/java/org/apache/fop/util/ColorUtilTestCase.java | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/test/java/org/apache/fop/util/ColorUtilTestCase.java b/test/java/org/apache/fop/util/ColorUtilTestCase.java index bc871794c..604dc0250 100644 --- a/test/java/org/apache/fop/util/ColorUtilTestCase.java +++ b/test/java/org/apache/fop/util/ColorUtilTestCase.java @@ -130,9 +130,14 @@ public class ColorUtilTestCase extends TestCase { + "\"" + sRGBLoc.toASCIIString() + "\",1.0,0.0,0.0)"; colActual = (ColorWithFallback)ColorUtil.parseColorString(ua, colSpec); assertEquals(cs, colActual.getColorSpace()); - assertEquals(255, colActual.getRed()); - assertEquals(0, colActual.getGreen()); + //assertEquals(255, colActual.getRed()); //253 is returned + assertEquals(255, colActual.getRed(), 2f); //Java 5: 253, Java 6: 255 + assertEquals(0, colActual.getGreen(), 25f); //Java 5: 25, Java 6: 0 assertEquals(0, colActual.getBlue()); + //I don't understand the difference. Maybe Java's sRGB and HP's sRGB are somehow not + //equivalent. This is only going to be a problem if anyone actually makes use of the + //RGB fallback in any renderer. + //TODO Anyone know what's going on here? float[] comps = colActual.getColorComponents(null); assertEquals(3, comps.length); assertEquals(1f, comps[0], 0); @@ -142,9 +147,9 @@ public class ColorUtilTestCase extends TestCase { Color fallback = colActual.getFallbackColor(); assertTrue(fallback.getColorSpace().isCS_sRGB()); - assertEquals(255, colActual.getRed()); - assertEquals(0, colActual.getGreen()); - assertEquals(0, colActual.getBlue()); + assertEquals(255, fallback.getRed()); + assertEquals(0, fallback.getGreen()); + assertEquals(0, fallback.getBlue()); assertEquals(colSpec, ColorUtil.colorToString(colActual)); @@ -236,9 +241,10 @@ public class ColorUtilTestCase extends TestCase { colSpec = "fop-rgb-icc(1.0,0.8,0.0,#Separation,,Postgelb)"; colActual = (ColorWithFallback)ColorUtil.parseColorString(null, colSpec); - assertEquals(255, colActual.getRed(), 1); - assertEquals(204, colActual.getGreen(), 1); - assertEquals(0, colActual.getBlue()); + assertEquals(255, colActual.getRed(), 2); + assertEquals(204, colActual.getGreen(), 3); + assertEquals(0, colActual.getBlue(), 6); + //sRGB results differ between JDKs Color fallback = colActual.getFallbackColor(); assertEquals(255, fallback.getRed()); @@ -276,8 +282,8 @@ public class ColorUtilTestCase extends TestCase { String colSpec = "fop-rgb-named-color(1.0,0.8,0.0,NCP," + "\"" + ncpLoc.toASCIIString() + "\",Postgelb)"; colActual = (ColorWithFallback)ColorUtil.parseColorString(ua, colSpec); - assertEquals(255, colActual.getRed()); - assertEquals(193, colActual.getGreen()); + assertEquals(255, colActual.getRed(), 1); + assertEquals(193, colActual.getGreen(), 2); assertEquals(0, colActual.getBlue()); Color fallback = colActual.getFallbackColor(); |