mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-21 13:15:35 +00:00
bug5924: fixed ColorMapperTest after adjusting max hue
This commit is contained in:
@@ -9,6 +9,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: org.mockito.mockito-core;bundle-version="1.9.5",
|
||||
org.hamcrest;bundle-version="2.2.0",
|
||||
org.objenesis;bundle-version="1.3.0",
|
||||
org.junit;bundle-version="4.8.2"
|
||||
org.junit;bundle-version="4.8.2",
|
||||
net.bytebuddy.byte-buddy;bundle-version="1.14.12",
|
||||
net.bytebuddy.byte-buddy-agent;bundle-version="1.14.12"
|
||||
Export-Package: com.sap.sse.common.test
|
||||
Automatic-Module-Name: com.sap.sse.common.test
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.sap.sse.common.test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
@@ -45,7 +46,7 @@ public class ColorMapperTest {
|
||||
}
|
||||
|
||||
public void fillColorSet() {
|
||||
for (int i = 0; i <= 240; i++) {
|
||||
for (int i = 0; i <= ColorMapper.MAX_HUE; i++) {
|
||||
colorSet.add("hsl(" + i + ", 100%, 50%)");
|
||||
}
|
||||
}
|
||||
@@ -55,21 +56,21 @@ public class ColorMapperTest {
|
||||
// MinLeft = -5 && MaxRight = 5
|
||||
colorMapper.setGrey(false);
|
||||
// Below lower bound
|
||||
assertTrue(colorMapper.getColor(-6).equals("hsl(240, 100%, 50%)"));
|
||||
assertEquals("hsl("+ColorMapper.MAX_HUE+", 100%, 50%)", colorMapper.getColor(-6));
|
||||
// At lower bound
|
||||
assertTrue(colorMapper.getColor(-5).equals("hsl(240, 100%, 50%)"));
|
||||
assertEquals("hsl("+ColorMapper.MAX_HUE+", 100%, 50%)", colorMapper.getColor(-5));
|
||||
// Mid range
|
||||
assertTrue(colorMapper.getColor(0).equals("hsl(120, 100%, 50%)"));
|
||||
assertEquals("hsl("+Math.round((double) ColorMapper.MAX_HUE/2.0)+", 100%, 50%)", colorMapper.getColor(0));
|
||||
// At upper bound
|
||||
assertTrue(colorMapper.getColor(5).equals("hsl(0, 100%, 50%)"));
|
||||
assertEquals("hsl(0, 100%, 50%)", colorMapper.getColor(5));
|
||||
// Above upper bound
|
||||
assertTrue(colorMapper.getColor(6).equals("hsl(0, 100%, 50%)"));
|
||||
assertEquals("hsl(0, 100%, 50%)", colorMapper.getColor(6));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testForValueOutOfBoundaries() {
|
||||
assertTrue(colorMapper.getColor(valueRange.getMinLeft() - EPSILON) == "hsl(240, 100%, 50%)");
|
||||
assertTrue(colorMapper.getColor(valueRange.getMaxRight() + EPSILON) == "hsl(0, 100%, 50%)");
|
||||
assertEquals("hsl("+ColorMapper.MAX_HUE+", 100%, 50%)", colorMapper.getColor(valueRange.getMinLeft() - EPSILON));
|
||||
assertEquals("hsl(0, 100%, 50%)", colorMapper.getColor(valueRange.getMaxRight() + EPSILON));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -13,6 +13,7 @@ import java.util.Set;
|
||||
*
|
||||
*/
|
||||
public class ColorMapper implements ValueRangeFlexibleBoundariesChangedListener {
|
||||
public static final int MAX_HUE = 315;
|
||||
private final ValueRangeFlexibleBoundaries valueRange;
|
||||
private double minValue;
|
||||
private double maxValue;
|
||||
@@ -59,7 +60,6 @@ public class ColorMapper implements ValueRangeFlexibleBoundariesChangedListener
|
||||
*/
|
||||
public String getColor(double value) {
|
||||
final String result;
|
||||
final int MAX_HUE = 315;
|
||||
if (isGrey) {
|
||||
if (value < minValue) {
|
||||
result = "rgba(255,255,255,0.0)";
|
||||
|
||||
Reference in New Issue
Block a user