Skip to content

Commit bd09d37

Browse files
mbostockmbostock
committed
Refactor time tests for minimal load.
1 parent 68be0ac commit bd09d37

25 files changed

Lines changed: 606 additions & 630 deletions

‎src/time/day.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import "interval";
2+
import "time";
3+
import "year";
4+
15
d3.time.day = d3_time_interval(function(date) {
26
var day = new d3_time(1970, 0);
37
day.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());

‎src/time/format-iso.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import "format";
2+
import "format-utc";
23
import "time";
34

45
var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");

‎src/time/format.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import "../arrays/map";
22
import "../format/requote";
3-
import "time";
3+
import "day";
44
import "format-localized";
5+
import "time";
6+
import "week";
57

68
d3.time.format = function(template) {
79
var n = template.length;

‎src/time/scale-utc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import "../core/true";
22
import "../scale/linear";
33
import "format";
4+
import "format-utc";
45
import "scale";
56

67
var d3_time_scaleUTCMethods = d3_time_scaleLocalMethods.map(function(m) {

‎src/time/scale.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import "../core/rebind";
33
import "../core/true";
44
import "../scale/linear";
55
import "../scale/nice";
6+
import "day";
67
import "format";
7-
import "second";
8-
import "minute";
98
import "hour";
10-
import "day";
11-
import "week";
9+
import "minute";
1210
import "month";
11+
import "second";
12+
import "time";
13+
import "week";
1314
import "year";
1415

1516
function d3_time_scale(linear, methods, format) {

‎test/load.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,7 @@ module.exports = function() {
4343

4444
return topic;
4545
};
46+
47+
process.on("uncaughtException", function(e) {
48+
console.trace(e.stack);
49+
});

‎test/time/day-test.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
require("../env");
2-
31
var vows = require("vows"),
2+
load = require("../load"),
43
assert = require("../assert"),
54
time = require("./time"),
65
local = time.local,
@@ -10,9 +9,7 @@ var suite = vows.describe("d3.time.day");
109

1110
suite.addBatch({
1211
"day": {
13-
topic: function() {
14-
return d3.time.day;
15-
},
12+
topic: load("time/day").expression("d3.time.day"),
1613
"defaults to floor": function(interval) {
1714
assert.strictEqual(interval, interval.floor);
1815
},

‎test/time/dayOfYear-test.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
require("../env");
2-
31
var vows = require("vows"),
4-
assert = require("../assert"),
5-
time = require("./time"),
6-
local = time.local,
7-
utc = time.utc;
2+
load = require("../load"),
3+
assert = require("../assert");
84

95
var suite = vows.describe("d3.time.dayOfYear");
106

117
suite.addBatch({
128
"dayOfYear": {
13-
topic: function() {
14-
return d3.time.dayOfYear;
15-
},
9+
topic: load("time/day").expression("d3.time.dayOfYear"),
1610
"no floating-point rounding error": function(dayOfYear) {
1711
assert.equal(dayOfYear(new Date(2011, 4, 9)), 128);
1812
}

‎test/time/days-test.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
require("../env");
2-
31
var vows = require("vows"),
2+
load = require("../load"),
43
assert = require("../assert"),
54
time = require("./time"),
65
local = time.local,
@@ -10,9 +9,7 @@ var suite = vows.describe("d3.time.days");
109

1110
suite.addBatch({
1211
"days": {
13-
topic: function() {
14-
return d3.time.days;
15-
},
12+
topic: load("time/day").expression("d3.time.days"),
1613
"returns midnights": function(range) {
1714
assert.deepEqual(range(local(2010, 11, 31, 12), local(2011, 0, 3, 12)), [
1815
local(2011, 0, 1),

‎test/time/format-iso-test.js‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
var vows = require("vows"),
2+
load = require("../load"),
3+
assert = require("../assert"),
4+
time = require("./time"),
5+
utc = time.utc;
6+
7+
var suite = vows.describe("d3.time.format");
8+
9+
suite.addBatch({
10+
"format.iso": {
11+
topic: load("time/format-iso").expression("d3.time.format.iso"),
12+
13+
"toString is %Y-%m-%dT%H:%M:%S.%LZ": function(format) {
14+
assert.equal(format + "", "%Y-%m-%dT%H:%M:%S.%LZ");
15+
},
16+
17+
"formats as ISO 8601": function(format) {
18+
assert.equal(format(utc(1990, 0, 1, 0, 0, 0)), "1990-01-01T00:00:00.000Z");
19+
assert.equal(format(utc(2011, 11, 31, 23, 59, 59)), "2011-12-31T23:59:59.000Z");
20+
},
21+
22+
"parse": {
23+
"parses as ISO 8601": function(format) {
24+
var p = format.parse;
25+
assert.deepEqual(p("1990-01-01T00:00:00.000Z"), utc(1990, 0, 1, 0, 0, 0));
26+
assert.deepEqual(p("2011-12-31T23:59:59.000Z"), utc(2011, 11, 31, 23, 59, 59));
27+
assert.isNull(p("1990-01-01T00:00:00.000X"));
28+
}
29+
}
30+
}
31+
});
32+
33+
suite.export(module);

0 commit comments

Comments
 (0)