Skip to content

Commit 69324a4

Browse files
jasondaviesjasondavies
committed
Slightly more compact tests for nice scales.
The longer domains mess up the aligment but I'm sure Mike will figure something out!
1 parent aeb1212 commit 69324a4

6 files changed

Lines changed: 35 additions & 57 deletions

File tree

‎tests/test-scale-linear.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ console.log(" over -> ", x(11));
9999
console.log("");
100100

101101
var x = d3.scale.linear();
102+
console.log("nice():");
102103
[[1.1, 10.9], [10.9, 1.1], [.7, 11.001], [123.1, 6.7], [0, .49]].forEach(function(d) {
103-
console.log("domain([" + d.map(f) + " ]).nice():");
104-
console.log(" ", x.domain(d).nice().domain());
105-
console.log("");
104+
var s = " [" + d.map(f) + " ]";
105+
while (s.length < 21) s += " ";
106+
console.log(" ", s + " -> ", x.domain(d).nice().domain().map(f).join(","));
106107
});
108+
console.log("");

‎tests/test-scale-linear.out‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,10 @@ domain unclamping:
6969
under -> -1
7070
over -> 11
7171

72-
domain([ 1.100, 10.900 ]).nice():
73-
[ 1, 11 ]
74-
75-
domain([ 10.900, 1.100 ]).nice():
76-
[ 11, 1 ]
77-
78-
domain([ 0.700, 11.001 ]).nice():
79-
[ 0, 12 ]
80-
81-
domain([ 123.100, 6.700 ]).nice():
82-
[ 130, 0 ]
83-
84-
domain([ 0.000, 0.490 ]).nice():
85-
[ 0, 0.5 ]
72+
nice():
73+
[ 1.100, 10.900 ] -> 1.000, 11.000
74+
[ 10.900, 1.100 ] -> 11.000, 1.000
75+
[ 0.700, 11.001 ] -> 0.000, 12.000
76+
[ 123.100, 6.700 ] -> 130.000, 0.000
77+
[ 0.000, 0.490 ] -> 0.000, 0.500
8678

‎tests/test-scale-log.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,16 @@ console.log(" 10 -> ", x(10));
6969
console.log("");
7070

7171
var x = d3.scale.log();
72+
console.log("nice():");
7273
[
7374
[1.1, 10.9], [10.9, 1.1], [.7, 11.001], [123.1, 6.7], [0, .49],
7475
[.12, 1, 2.5, 3, 10.9]
7576
].forEach(function(d) {
76-
console.log("domain([" + d.map(f) + " ]).nice():");
77-
console.log("", x.domain(d).nice().domain().map(f).join(","));
78-
console.log("");
77+
var s = " [" + d.map(f) + " ]";
78+
while (s.length < 21) s += " ";
79+
console.log(" ", s + " -> ", x.domain(d).nice().domain().map(f).join(","));
7980
});
81+
console.log("");
8082

8183
var x = d3.scale.log(), f = x.tickFormat();
8284
console.log("ticks:");

‎tests/test-scale-log.out‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,13 @@ domain([.1, 10]).range(["red", "blue"]).interpolate(hsl):
4949
5 -> #009aff
5050
10 -> #0000ff
5151

52-
domain([ 1.100, 10.900 ]).nice():
53-
1.000, 100.000
54-
55-
domain([ 10.900, 1.100 ]).nice():
56-
100.000, 1.000
57-
58-
domain([ 0.700, 11.001 ]).nice():
59-
0.100, 100.000
60-
61-
domain([ 123.100, 6.700 ]).nice():
62-
1000.000, 1.000
63-
64-
domain([ 0.000, 0.490 ]).nice():
65-
0.000, 1.000
66-
67-
domain([ 0.120, 1.000, 2.500, 3.000, 10.900 ]).nice():
68-
0.100, 1.000, 2.500, 3.000, 100.000
52+
nice():
53+
[ 1.100, 10.900 ] -> 1.000, 100.000
54+
[ 10.900, 1.100 ] -> 100.000, 1.000
55+
[ 0.700, 11.001 ] -> 0.100, 100.000
56+
[ 123.100, 6.700 ] -> 1000.000, 1.000
57+
[ 0.000, 0.490 ] -> 0.000, 1.000
58+
[ 0.120, 1.000, 2.500, 3.000, 10.900 ] -> 0.100, 1.000, 2.500, 3.000, 100.000
6959

7060
ticks:
7161
[.1, 10] -> 1, 2, 3, 4, 5, 6, 7, 8, 9, 1e+1

‎tests/test-scale-pow.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ console.log(" over -> ", x(2));
5757
console.log("");
5858

5959
var x = d3.scale.pow().exponent(2);
60+
console.log("nice():");
6061
[
6162
[1.1, 10.9], [10.9, 1.1], [.7, 11.001], [123.1, 6.7], [0, .49],
6263
[.1, 1, 2.5, 3, 10.9]
6364
].forEach(function(d) {
64-
console.log("domain([" + d.map(f) + " ]).nice():");
65-
console.log(" ", x.domain(d).nice().domain());
66-
console.log("");
65+
var s = " [" + d.map(f) + " ]";
66+
while (s.length < 21) s += " ";
67+
console.log(" ", s + " -> ", x.domain(d).nice().domain().map(f).join(","));
6768
});
69+
console.log("");

‎tests/test-scale-pow.out‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,11 @@ domain clamping:
3939
under -> 0
4040
over -> 1
4141

42-
domain([ 1.100, 10.900 ]).nice():
43-
[ 1, 11 ]
44-
45-
domain([ 10.900, 1.100 ]).nice():
46-
[ 11, 1 ]
47-
48-
domain([ 0.700, 11.001 ]).nice():
49-
[ 0, 12 ]
50-
51-
domain([ 123.100, 6.700 ]).nice():
52-
[ 124, 6 ]
53-
54-
domain([ 0.000, 0.490 ]).nice():
55-
[ 0, 1 ]
56-
57-
domain([ 0.100, 1.000, 2.500, 3.000, 10.900 ]).nice():
58-
[ 0, 1, 2.5, 3, 11 ]
42+
nice():
43+
[ 1.100, 10.900 ] -> 1.000, 11.000
44+
[ 10.900, 1.100 ] -> 11.000, 1.000
45+
[ 0.700, 11.001 ] -> 0.000, 12.000
46+
[ 123.100, 6.700 ] -> 124.000, 6.000
47+
[ 0.000, 0.490 ] -> 0.000, 1.000
48+
[ 0.100, 1.000, 2.500, 3.000, 10.900 ] -> 0.000, 1.000, 2.500, 3.000, 11.000
5949

0 commit comments

Comments
 (0)