Add test for scale.ordinal.

test/scale/ordinal-test.js

@@ -0,0 +1,76 @@
+require("../env");
+require("../../d3");
+
+var vows = require("vows"),
+    assert = require("assert");
+
+var suite = vows.describe("d3.scale.ordinal");
+
+suite.addBatch({
+  "ordinal": {
+    topic: function() {
+      return d3.scale.ordinal;
+    },
+    "has an empty domain by default": function(ordinal) {
+      assert.isEmpty(ordinal().domain());
+    },
+    "has an empty range by default": function(ordinal) {
+      assert.isEmpty(ordinal().range());
+    },
+    "maps distinct domain values to discrete range values": function(ordinal) {
+      var x = ordinal().range(["a", "b", "c"]);
+      assert.equal(x(0), "a");
+      assert.equal(x("0"), "a");
+      assert.equal(x([0]), "a");
+      assert.equal(x(1), "b");
+      assert.equal(x(2.0), "c");
+      assert.equal(x(new Number(2)), "c");
+    },
+    "recycles range values when exhausted": function(ordinal) {
+      var x = ordinal().range(["a", "b", "c"]);
+      assert.equal(x(0), "a");
+      assert.equal(x(1), "b");
+      assert.equal(x(2), "c");
+      assert.equal(x(3), "a");
+      assert.equal(x(4), "b");
+      assert.equal(x(5), "c");
+      assert.equal(x(2), "c");
+      assert.equal(x(1), "b");
+      assert.equal(x(0), "a");
+    },
+    "computes discrete points in a continuous range": function(ordinal) {
+      var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120]);
+      assert.deepEqual(x.range(), [0, 60, 120]);
+      assert.equal(x.rangeBand(), 0);
+      var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120], 1);
+      assert.deepEqual(x.range(), [20, 60, 100]);
+      assert.equal(x.rangeBand(), 0);
+    },
+    "computes discrete bands in a continuous range": function(ordinal) {
+      var x = ordinal().domain(["a", "b", "c"]).rangeBands([0, 120]);
+      assert.deepEqual(x.range(), [0, 40, 80]);
+      assert.equal(x.rangeBand(), 40);
+      var x = ordinal().domain(["a", "b", "c"]).rangeBands([0, 120], .2);
+      assert.deepEqual(x.range(), [7.5, 45, 82.5]);
+      assert.equal(x.rangeBand(), 30);
+    },
+    "computes discrete rounded bands in a continuous range": function(ordinal) {
+      var x = ordinal().domain(["a", "b", "c"]).rangeRoundBands([0, 100]);
+      assert.deepEqual(x.range(), [1, 34, 67]);
+      assert.equal(x.rangeBand(), 33);
+      var x = ordinal().domain(["a", "b", "c"]).rangeRoundBands([0, 100], .2);
+      assert.deepEqual(x.range(), [7, 38, 69]);
+      assert.equal(x.rangeBand(), 25);
+    },
+    "setting domain recomputes range bands": function(ordinal) {
+      var x = ordinal().rangeRoundBands([0, 100]).domain(["a", "b", "c"]);
+      assert.deepEqual(x.range(), [1, 34, 67]);
+      assert.equal(x.rangeBand(), 33);
+      x.domain(["a", "b", "c", "d"]);
+      assert.deepEqual(x.range(), [0, 25, 50, 75]);
+      assert.equal(x.rangeBand(), 25);
+    }
+  }
+});
+
+suite.export(module);

test/scale/test-ordinal.js

@@ -1,79 +0,0 @@
-require("./../../lib/env-js/envjs/node");
-require("./../../d3");
-
-var x = d3.scale.ordinal().range(["a", "b", "c"]);
-console.log("range([a, b, c]):");
-console.log("  0 -> " + x(0));
-console.log("  1 -> " + x(1));
-console.log("  2 -> " + x(2));
-console.log("  3 -> " + x(3));
-console.log("  4 -> " + x(4));
-console.log("  5 -> " + x(5));
-console.log("  6 -> " + x(6));
-console.log("  0 -> " + x(0));
-console.log("  1 -> " + x(1));
-console.log("  2 -> " + x(2));
-console.log("  3 -> " + x(3));
-console.log("");
-
-x.domain([]);
-console.log("domain([]).range([a, b, c]):");
-console.log("  1 -> " + x(1));
-console.log("  2 -> " + x(2));
-console.log("  3 -> " + x(3));
-console.log("  0 -> " + x(0));
-console.log("  1 -> " + x(1));
-console.log("  2 -> " + x(2));
-console.log("");
-
-var x = d3.scale.ordinal().domain(["a", "b", "c"]).rangePoints([0, 120]);
-console.log("domain([a, b, c]).rangePoints([0, 120]):");
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");
-
-var x = d3.scale.ordinal().rangePoints([0, 120]).domain(["a", "b", "c"]);
-console.log("rangePoints([0, 120]).domain([a, b, c]):");
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");
-
-var x = d3.scale.ordinal().domain(["a", "b", "c"]).rangeBands([0, 120]);
-console.log("domain([a, b, c]).rangeBands([0, 120]):");
-console.log("  rangeBand: " + x.rangeBand());
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");
-
-var x = d3.scale.ordinal().rangeBands([0, 120]).domain(["a", "b", "c"]);
-console.log("rangeBands([0, 120]).domain([a, b, c]):");
-console.log("  rangeBand: " + x.rangeBand());
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");
-
-var x = d3.scale.ordinal().domain(["a", "b", "c"]).rangeRoundBands([0, 119]);
-console.log("domain([a, b, c]).rangeRoundBands([0, 119]):");
-console.log("  rangeBand: " + x.rangeBand());
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");
-
-var x = d3.scale.ordinal().rangeRoundBands([0, 119]).domain(["a", "b", "c"]);
-console.log("rangeRoundBands([0, 119]).domain([a, b, c]):");
-console.log("  rangeBand: " + x.rangeBand());
-console.log("  a -> " + x("a"));
-console.log("  b -> " + x("b"));
-console.log("  c -> " + x("c"));
-console.log("  d -> " + x("d"));
-console.log("");

test/scale/test-ordinal.out

@@ -1,61 +0,0 @@
-range([a, b, c]):
-  0 -> a
-  1 -> b
-  2 -> c
-  3 -> a
-  4 -> b
-  5 -> c
-  6 -> a
-  0 -> a
-  1 -> b
-  2 -> c
-  3 -> a
-
-domain([]).range([a, b, c]):
-  1 -> a
-  2 -> b
-  3 -> c
-  0 -> a
-  1 -> a
-  2 -> b
-
-domain([a, b, c]).rangePoints([0, 120]):
-  a -> 0
-  b -> 60
-  c -> 120
-  d -> 0
-
-rangePoints([0, 120]).domain([a, b, c]):
-  a -> 0
-  b -> 60
-  c -> 120
-  d -> 0
-
-domain([a, b, c]).rangeBands([0, 120]):
-  rangeBand: 40
-  a -> 0
-  b -> 40
-  c -> 80
-  d -> 0
-
-rangeBands([0, 120]).domain([a, b, c]):
-  rangeBand: 40
-  a -> 0
-  b -> 40
-  c -> 80
-  d -> 0
-
-domain([a, b, c]).rangeRoundBands([0, 119]):
-  rangeBand: 39
-  a -> 1
-  b -> 40
-  c -> 79
-  d -> 118
-
-rangeRoundBands([0, 119]).domain([a, b, c]):
-  rangeBand: 39
-  a -> 1
-  b -> 40
-  c -> 79
-  d -> 118
-