Color result = testee.shadeCalculation(ann, col);
assertEquals(result, expected, "for column " + col);
}
+
+ /*
+ * test for boundary case threshold == graphMax (JAL-3206)
+ */
+ float thresh = ann.threshold.value;
+ ann.threshold.value = ann.graphMax;
+ Color result = testee.shadeCalculation(ann, WIDTH - 1);
+ assertEquals(result, maxColour);
+ testee.setThresholdIsMinMax(false);
+ result = testee.shadeCalculation(ann, WIDTH - 1);
+ assertEquals(result, maxColour);
+ ann.threshold.value = thresh; // reset
}
/**
Color result = testee.shadeCalculation(ann, col);
assertEquals(result, expected, "for column " + col);
}
+
+ /*
+ * test for boundary case threshold == graphMin (JAL-3206)
+ */
+ float thresh = ann.threshold.value;
+ ann.threshold.value = ann.graphMin;
+ Color result = testee.shadeCalculation(ann, 0);
+ assertEquals(result, minColour);
+ testee.setThresholdIsMinMax(false);
+ result = testee.shadeCalculation(ann, 0);
+ assertEquals(result, minColour);
+ ann.threshold.value = thresh; // reset
}
/**
{
AnnotationColourGradient testee = new AnnotationColourGradient(ann,
minColour, maxColour, AnnotationColourGradient.ABOVE_THRESHOLD);
- testee = (AnnotationColourGradient) testee.getInstance(al, null);
+ testee = (AnnotationColourGradient) testee.getInstance(null, al);
for (int col = 0; col < WIDTH; col++)
{
Color result = testee.findColour('a', col, seq);
/*
- * expect white below threshold of 5
+ * expect white at or below threshold of 5
*/
- Color expected = col < 5 ? Color.white : new Color(50 + 10 * col,
+ Color expected = col <= 5 ? Color.white
+ : new Color(50 + 10 * col,
200 - 10 * col,
150 + 10 * col);
assertEquals(result, expected, "for column " + col);
for (int col = 0; col < WIDTH; col++)
{
/*
- * colours for values >= threshold are graduated
+ * colours for values > threshold are graduated
* range is 6-10 so steps of 100/5 = 20
*/
int factor = col - THRESHOLD_FIVE;
- Color expected = col < 5 ? Color.white : new Color(50 + 20 * factor,
+ Color expected = col <= 5 ? Color.white
+ : new Color(50 + 20 * factor,
200 - 20 * factor,
150 + 20 * factor);
Color result = testee.findColour('a', col, seq);
{
AnnotationColourGradient testee = new AnnotationColourGradient(ann,
minColour, maxColour, AnnotationColourGradient.BELOW_THRESHOLD);
- testee = (AnnotationColourGradient) testee.getInstance(al, null);
+ testee = (AnnotationColourGradient) testee.getInstance(null, al);
for (int col = 0; col < WIDTH; col++)
{
Color result = testee.findColour('a', col, seq);
- Color expected = col > 5 ? Color.white : new Color(50 + 10 * col,
+ Color expected = col >= 5 ? Color.white
+ : new Color(50 + 10 * col,
200 - 10 * col, 150 + 10 * col);
assertEquals(result, expected, "for column " + col);
}
for (int col = 0; col < WIDTH; col++)
{
/*
- * colours for values <= threshold are graduated
+ * colours for values < threshold are graduated
* range is 0-5 so steps of 100/5 = 20
*/
- Color expected = col > 5 ? Color.white : new Color(50 + 20 * col,
+ Color expected = col >= 5 ? Color.white
+ : new Color(50 + 20 * col,
200 - 20 * col, 150 + 20 * col);
Color result = testee.findColour('a', col, seq);
assertEquals(result, expected, "for column " + col);
{
AnnotationColourGradient testee = new AnnotationColourGradient(ann,
minColour, maxColour, AnnotationColourGradient.NO_THRESHOLD);
- testee = (AnnotationColourGradient) testee.getInstance(al, null);
+ testee = (AnnotationColourGradient) testee.getInstance(null, al);
for (int col = 0; col < WIDTH; col++)
{
{
AnnotationColourGradient testee = new AnnotationColourGradient(ann,
minColour, maxColour, AnnotationColourGradient.NO_THRESHOLD);
- testee = (AnnotationColourGradient) testee.getInstance(al, null);
+ testee = (AnnotationColourGradient) testee.getInstance(null, al);
/*
* flag corresponding to 'use original colours' checkbox