Skip to content

Commit

Permalink
Check pixel values using the pixel proximity matcher (#5833)
Browse files Browse the repository at this point in the history
  • Loading branch information
jtagscherer authored and simonbrunel committed Nov 14, 2018
1 parent ae80e14 commit 56b30e1
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions test/specs/scale.logarithmic.tests.js
Expand Up @@ -822,8 +822,8 @@ describe('Logarithmic Scale tests', function() {
var start = chart.chartArea[chartStart];
var end = chart.chartArea[chartEnd];

expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);

expect(scale.getValueForPixel(start)).toBeCloseTo(firstTick, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand All @@ -835,8 +835,8 @@ describe('Logarithmic Scale tests', function() {
start = chart.chartArea[chartEnd];
end = chart.chartArea[chartStart];

expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);

expect(scale.getValueForPixel(start)).toBeCloseTo(firstTick, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand Down Expand Up @@ -964,9 +964,9 @@ describe('Logarithmic Scale tests', function() {
var start = chart.chartArea[axis.start];
var end = chart.chartArea[axis.end];

expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(0, 0, 0)).toBe(start); // 0 is invalid, put it at the start.
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);
expect(scale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(start); // 0 is invalid, put it at the start.

expect(scale.getValueForPixel(start)).toBeCloseTo(firstTick, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand All @@ -978,8 +978,8 @@ describe('Logarithmic Scale tests', function() {
start = chart.chartArea[axis.end];
end = chart.chartArea[axis.start];

expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);

expect(scale.getValueForPixel(start)).toBeCloseTo(firstTick, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand Down Expand Up @@ -1093,9 +1093,9 @@ describe('Logarithmic Scale tests', function() {
var end = chart.chartArea[axis.end];
var sign = scale.isHorizontal() ? 1 : -1;

expect(scale.getPixelForValue(0, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start + sign * fontSize);
expect(scale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start + sign * fontSize);

expect(scale.getValueForPixel(start)).toBeCloseTo(0, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand All @@ -1108,9 +1108,9 @@ describe('Logarithmic Scale tests', function() {
start = chart.chartArea[axis.end];
end = chart.chartArea[axis.start];

expect(scale.getPixelForValue(0, 0, 0)).toBe(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBe(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBe(start - sign * fontSize, 4);
expect(scale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(start);
expect(scale.getPixelForValue(lastTick, 0, 0)).toBeCloseToPixel(end);
expect(scale.getPixelForValue(firstTick, 0, 0)).toBeCloseToPixel(start - sign * fontSize, 4);

expect(scale.getValueForPixel(start)).toBeCloseTo(0, 4);
expect(scale.getValueForPixel(end)).toBeCloseTo(lastTick, 4);
Expand Down

0 comments on commit 56b30e1

Please sign in to comment.