Skip to content

Commit 485bae5

Browse files
etpinardetpinard
committed
flatten heatmap and contour test suite
1 parent c7bf990 commit 485bae5

File tree

2 files changed

+302
-305
lines changed

2 files changed

+302
-305
lines changed

‎test/jasmine/tests/contour_test.js‎

Lines changed: 122 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -3,133 +3,132 @@ var Contour = require('@src/traces/contour');
33
var makeColorMap = require('@src/traces/contour/make_color_map');
44
var colorScales = require('@src/components/colorscale/scales');
55

6+
describe('contour defaults', function() {
7+
'use strict';
8+
9+
var traceIn,
10+
traceOut;
11+
12+
var defaultColor = '#444',
13+
layout = {
14+
font: Plots.layoutAttributes.font
15+
};
16+
17+
var supplyDefaults = Contour.supplyDefaults;
18+
19+
beforeEach(function() {
20+
traceOut = {};
21+
});
622

7-
describe('Test contour', function() {
23+
it('should set autocontour to false when contours is supplied', function() {
24+
traceIn = {
25+
type: 'contour',
26+
z: [[10, 10.625, 12.5, 15.625],
27+
[5.625, 6.25, 8.125, 11.25],
28+
[2.5, 3.125, 5.0, 8.125],
29+
[0.625, 1.25, 3.125, 6.25]],
30+
contours: {
31+
start: 4,
32+
end: 14,
33+
size: 0.5
34+
}
35+
};
36+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
37+
expect(traceOut.autocontour).toBe(false);
38+
39+
traceIn = {
40+
type: 'contour',
41+
z: [[10, 10.625, 12.5, 15.625],
42+
[5.625, 6.25, 8.125, 11.25],
43+
[2.5, 3.125, 5.0, 8.125],
44+
[0.625, 1.25, 3.125, 6.25]]
45+
};
46+
supplyDefaults(traceIn, traceOut, defaultColor, layout);
47+
expect(traceOut.autocontour).toBe(true);
48+
});
49+
});
50+
51+
describe('contour makeColorMap', function() {
852
'use strict';
953

10-
describe('supplyDefaults', function() {
11-
var traceIn,
12-
traceOut;
13-
14-
var defaultColor = '#444',
15-
layout = {
16-
font: Plots.layoutAttributes.font
17-
};
18-
19-
var supplyDefaults = Contour.supplyDefaults;
20-
21-
beforeEach(function() {
22-
traceOut = {};
23-
});
24-
25-
it('should set autocontour to false when contours is supplied', function() {
26-
traceIn = {
27-
type: 'contour',
28-
z: [[10, 10.625, 12.5, 15.625],
29-
[5.625, 6.25, 8.125, 11.25],
30-
[2.5, 3.125, 5.0, 8.125],
31-
[0.625, 1.25, 3.125, 6.25]],
32-
contours: {
33-
start: 4,
34-
end: 14,
35-
size: 0.5
36-
}
37-
};
38-
supplyDefaults(traceIn, traceOut, defaultColor, layout);
39-
expect(traceOut.autocontour).toBe(false);
40-
41-
traceIn = {
42-
type: 'contour',
43-
z: [[10, 10.625, 12.5, 15.625],
44-
[5.625, 6.25, 8.125, 11.25],
45-
[2.5, 3.125, 5.0, 8.125],
46-
[0.625, 1.25, 3.125, 6.25]]
47-
};
48-
supplyDefaults(traceIn, traceOut, defaultColor, layout);
49-
expect(traceOut.autocontour).toBe(true);
50-
});
54+
it('should make correct color map function (\'fill\' coloring case)', function() {
55+
var trace = {
56+
contours: {
57+
coloring: 'fill',
58+
start: -1.5,
59+
size: 0.5,
60+
end: 2.005
61+
},
62+
colorscale: [[
63+
0, 'rgb(12,51,131)'
64+
], [
65+
0.25, 'rgb(10,136,186)'
66+
], [
67+
0.5, 'rgb(242,211,56)'
68+
], [
69+
0.75, 'rgb(242,143,56)'
70+
], [
71+
1, 'rgb(217,30,30)'
72+
]]
73+
};
74+
75+
var colorMap = makeColorMap(trace);
76+
77+
expect(colorMap.domain()).toEqual(
78+
[-1.75, -0.75, 0.25, 1.25, 2.25]
79+
);
80+
81+
expect(colorMap.range()).toEqual([
82+
'rgb(12,51,131)', 'rgb(10,136,186)', 'rgb(242,211,56)',
83+
'rgb(242,143,56)', 'rgb(217,30,30)'
84+
]);
85+
});
86+
87+
it('should make correct color map function (\'heatmap\' coloring case)', function() {
88+
var trace = {
89+
contours: {
90+
coloring: 'heatmap',
91+
start: 1.5,
92+
size: 0.5,
93+
end: 5.505
94+
},
95+
colorscale: colorScales.RdBu,
96+
zmin: 1,
97+
zmax: 6
98+
};
99+
100+
var colorMap = makeColorMap(trace);
101+
102+
expect(colorMap.domain()).toEqual(
103+
[1, 2.75, 3.5, 4, 4.5, 6]
104+
);
105+
106+
expect(colorMap.range()).toEqual([
107+
'rgb(5,10,172)', 'rgb(106,137,247)', 'rgb(190,190,190)',
108+
'rgb(220,170,132)', 'rgb(230,145,90)', 'rgb(178,10,28)'
109+
]);
51110
});
52111

53-
describe('makeColorMap', function() {
54-
it('should make correct color map function (\'fill\' coloring case)', function() {
55-
var trace = {
56-
contours: {
57-
coloring: 'fill',
58-
start: -1.5,
59-
size: 0.5,
60-
end: 2.005
61-
},
62-
colorscale: [[
63-
0, 'rgb(12,51,131)'
64-
], [
65-
0.25, 'rgb(10,136,186)'
66-
], [
67-
0.5, 'rgb(242,211,56)'
68-
], [
69-
0.75, 'rgb(242,143,56)'
70-
], [
71-
1, 'rgb(217,30,30)'
72-
]]
73-
};
74-
75-
var colorMap = makeColorMap(trace);
76-
77-
expect(colorMap.domain()).toEqual(
78-
[-1.75, -0.75, 0.25, 1.25, 2.25]
79-
);
80-
81-
expect(colorMap.range()).toEqual([
82-
'rgb(12,51,131)', 'rgb(10,136,186)', 'rgb(242,211,56)',
83-
'rgb(242,143,56)', 'rgb(217,30,30)'
84-
]);
85-
});
86-
87-
it('should make correct color map function (\'heatmap\' coloring case)', function() {
88-
var trace = {
89-
contours: {
90-
coloring: 'heatmap',
91-
start: 1.5,
92-
size: 0.5,
93-
end: 5.505
94-
},
95-
colorscale: colorScales.RdBu,
96-
zmin: 1,
97-
zmax: 6
98-
};
99-
100-
var colorMap = makeColorMap(trace);
101-
102-
expect(colorMap.domain()).toEqual(
103-
[1, 2.75, 3.5, 4, 4.5, 6]
104-
);
105-
106-
expect(colorMap.range()).toEqual([
107-
'rgb(5,10,172)', 'rgb(106,137,247)', 'rgb(190,190,190)',
108-
'rgb(220,170,132)', 'rgb(230,145,90)', 'rgb(178,10,28)'
109-
]);
110-
});
111-
112-
it('should make correct color map function (\'lines\' coloring case)', function() {
113-
var trace = {
114-
contours: {
115-
coloring: 'lines',
116-
start: 1.5,
117-
size: 0.5,
118-
end: 5.505
119-
},
120-
colorscale: colorScales.RdBu
121-
};
122-
123-
var colorMap = makeColorMap(trace);
124-
125-
expect(colorMap.domain()).toEqual(
126-
[1.5, 2.9, 3.5, 3.9, 4.3, 5.5]
127-
);
128-
129-
expect(colorMap.range()).toEqual([
130-
'rgb(5,10,172)', 'rgb(106,137,247)', 'rgb(190,190,190)',
131-
'rgb(220,170,132)', 'rgb(230,145,90)', 'rgb(178,10,28)'
132-
]);
133-
});
112+
it('should make correct color map function (\'lines\' coloring case)', function() {
113+
var trace = {
114+
contours: {
115+
coloring: 'lines',
116+
start: 1.5,
117+
size: 0.5,
118+
end: 5.505
119+
},
120+
colorscale: colorScales.RdBu
121+
};
122+
123+
var colorMap = makeColorMap(trace);
124+
125+
expect(colorMap.domain()).toEqual(
126+
[1.5, 2.9, 3.5, 3.9, 4.3, 5.5]
127+
);
128+
129+
expect(colorMap.range()).toEqual([
130+
'rgb(5,10,172)', 'rgb(106,137,247)', 'rgb(190,190,190)',
131+
'rgb(220,170,132)', 'rgb(230,145,90)', 'rgb(178,10,28)'
132+
]);
134133
});
135134
});

0 commit comments

Comments
 (0)