X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fpathological_cases.js;h=326fefb7116d71e97d166b1c5011c6beea7eba0a;hb=9154f07d785b038e8af866da745a67f5ba531771;hp=985241f230df1e1ab2bda9bff4d9344581e83de6;hpb=745e9e52bf0c9fe1eec18ad64d76787419b033f4;p=dygraphs.git

diff --git a/auto_tests/tests/pathological_cases.js b/auto_tests/tests/pathological_cases.js
index 985241f..326fefb 100644
--- a/auto_tests/tests/pathological_cases.js
+++ b/auto_tests/tests/pathological_cases.js
@@ -4,27 +4,37 @@
  *
  * @author dan@dygraphs.com (Dan Vanderkam)
  */
-var pathologicalCasesTestCase = TestCase("pathological-cases");
 
-pathologicalCasesTestCase.prototype.setUp = function() {
-  document.body.innerHTML = "<div id='graph'></div>";
-};
+import Dygraph from '../../src/dygraph';
+import Util from './Util';
 
-pathologicalCasesTestCase.prototype.tearDown = function() {
-};
+describe("pathological-cases", function() {
 
-pathologicalCasesTestCase.prototype.testZeroPoint = function() {
+cleanupAfterEach();
+
+var restoreConsole;
+var logs = {};
+beforeEach(function() {
+  restoreConsole = Util.captureConsole(logs);
+});
+
+afterEach(function() {
+  restoreConsole();
+});
+
+var graph = document.getElementById("graph");
+
+it('testZeroPoint', function() {
   var opts = {
     width: 480,
     height: 320
   };
   var data = "X,Y\n";
 
-  var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
-};
+});
 
-pathologicalCasesTestCase.prototype.testOnePoint = function() {
+it('testOnePoint', function() {
   var opts = {
     width: 480,
     height: 320
@@ -32,11 +42,10 @@ pathologicalCasesTestCase.prototype.testOnePoint = function() {
   var data = "X,Y\n" +
              "1,2\n";
 
-  var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
-};
+});
 
-pathologicalCasesTestCase.prototype.testCombinations = function() {
+it('testCombinations', function() {
   var dataSets = {
     empty: [],
     onePoint: [[10, 2]],
@@ -61,10 +70,6 @@ pathologicalCasesTestCase.prototype.testCombinations = function() {
 
   var variantOpts = {
     none: {},
-    avoidMinZero: {
-      avoidMinZero: true,
-      includeZero: true
-    },
     padded: {
       includeZero: true,
       drawAxesAtZero: true,
@@ -81,7 +86,6 @@ pathologicalCasesTestCase.prototype.testCombinations = function() {
       var opts = {
         width: 300,
         height: 150,
-        labelsDivWidth: 100,
         pointSize: 10
       };
       for (var key in base) {
@@ -93,7 +97,7 @@ pathologicalCasesTestCase.prototype.testCombinations = function() {
 
       var h = document.createElement('h3');
       h.appendChild(document.createTextNode(baseName + ' ' + variantName));
-      document.body.appendChild(h);
+      graph.appendChild(h);
       for (var dataName in dataSets) {
         var data = dataSets[dataName];
 
@@ -105,18 +109,28 @@ pathologicalCasesTestCase.prototype.testCombinations = function() {
         var gdiv = document.createElement('div');
         gdiv.style.display = 'inline-block';
         box.appendChild(gdiv);
-        document.body.appendChild(box);
+        graph.appendChild(box);
 
         var cols = data && data[0] ? data[0].length : 0;
         opts.labels = ['X', 'A', 'B', 'C'].slice(0, cols);
 
         var g = new Dygraph(gdiv, data, opts);
+
+        if (dataName == 'empty') {
+          assert.deepEqual(logs, {
+            log: [], warn: [],
+            error: ["Can't plot empty data set"]
+          });
+          logs.error = [];  // reset
+        } else {
+          assert.deepEqual(logs, {log: [], warn: [], error: []});
+        }
       }
     }
   }
-};
+});
 
-pathologicalCasesTestCase.prototype.testNullLegend = function() {
+it('testNullLegend', function() {
   var opts = {
     width: 480,
     height: 320,
@@ -125,37 +139,52 @@ pathologicalCasesTestCase.prototype.testNullLegend = function() {
   var data = "X,Y\n" +
              "1,2\n";
 
-  var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
-};
+});
 
-pathologicalCasesTestCase.prototype.testDivAsString = function() {
+it('testDivAsString', function() {
   var data = "X,Y\n" +
              "1,2\n";
 
   var g = new Dygraph('graph', data, {});
-};
+});
 
 
-pathologicalCasesTestCase.prototype.testConstantSeriesNegative = function() {
+it('testConstantSeriesNegative', function() {
   var data = "X,Y\n" +
              "1,-1\n" +
              "2,-1\n";
 
-  g = new Dygraph('graph', data, {});
+  var g = new Dygraph('graph', data, {});
   // This check could be loosened to
   // g.yAxisRange()[0] < g.yAxisRange()[1] if it breaks in the future.
-  assertEquals([-1.1, -0.9], g.yAxisRange());
-};
+  assert.deepEqual([-1.1, -0.9], g.yAxisRange());
+});
 
 
-pathologicalCasesTestCase.prototype.testConstantSeriesNegativeIncludeZero = function() {
+it('testConstantSeriesNegativeIncludeZero', function() {
   var data = "X,Y\n" +
              "1,-1\n" +
              "2,-1\n";
 
-  g = new Dygraph('graph', data, {includeZero: true});
+  var g = new Dygraph('graph', data, {includeZero: true});
   // This check could be loosened to
   // g.yAxisRange()[0] < g.yAxisRange()[1] if it breaks in the future.
-  assertEquals([-1.1, 0], g.yAxisRange());
-};
+  assert.deepEqual([-1.1, 0], g.yAxisRange());
+});
+
+it('should throw with non-existent divs', function() {
+  var data = "X,Y\n" +
+             "1,-1\n" +
+             "2,1\n";
+
+  assert.throws(function() {
+    new Dygraph(null, data);
+  }, /non-existent div/);
+
+  assert.throws(function() {
+    new Dygraph('non-existent-div-id', data);
+  }, /non-existent div/);
+});
+
+});