X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fparser.js;h=6634cd5262a10f493df3fda92d14ac99b88106b9;hb=bedc5cd39283fe07b9e4125c4e397b14571fed15;hp=55df84176c099bf03e480e77cf1a861372772e17;hpb=89fdcedbda6906d90e15d84285c4f6c0b8d96d28;p=dygraphs.git

diff --git a/auto_tests/tests/parser.js b/auto_tests/tests/parser.js
index 55df841..6634cd5 100644
--- a/auto_tests/tests/parser.js
+++ b/auto_tests/tests/parser.js
@@ -3,14 +3,13 @@
  *
  * @author danvk@google.com (Dan Vanderkam)
  */
-describe("parser", function() {
 
-beforeEach(function() {
-  document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
 
-afterEach(function() {
-});
+describe("parser", function() {
+
+cleanupAfterEach();
 
 it('testDetectLineDelimiter', function() {
   var data = "X,Y\r" +
@@ -19,7 +18,7 @@ it('testDetectLineDelimiter', function() {
       "2,1\r" +
       "3,0\r"
   ;
-  assert.equal("\r", Dygraph.detectLineDelimiter(data));
+  assert.equal("\r", utils.detectLineDelimiter(data));
 
   data = "X,Y\n" +
       "0,-1\n" +
@@ -27,7 +26,7 @@ it('testDetectLineDelimiter', function() {
       "2,1\n" +
       "3,0\n"
   ;
-  assert.equal("\n", Dygraph.detectLineDelimiter(data));
+  assert.equal("\n", utils.detectLineDelimiter(data));
 
   data = "X,Y\n\r" +
       "0,-1\n\r" +
@@ -35,7 +34,7 @@ it('testDetectLineDelimiter', function() {
       "2,1\n\r" +
       "3,0\n\r"
   ;
-  assert.equal("\n\r", Dygraph.detectLineDelimiter(data));
+  assert.equal("\n\r", utils.detectLineDelimiter(data));
 });
 
 it('testParseDosNewlines', function() {
@@ -50,9 +49,22 @@ it('testParseDosNewlines', function() {
       "3,0\r"
   ;
 
-  var graph = document.getElementById("graph");
-  var g = new Dygraph(graph, data, opts);
+  var g = new Dygraph('graph', data, opts);
+  assert.equal(0, g.getValue(0, 0));
+  assert.equal(-1, g.getValue(0, 1));
+  assert.equal(1, g.getValue(1, 0));
+  assert.equal(0, g.getValue(1, 1));
+  assert.deepEqual(['X', 'Y'], g.getLabels());
+});
+
+it('should parse tab-delimited data', function() {
+  var data = "X\tY\n" +
+      "0\t-1\n" +
+      "1\t0\n" +
+      "2\t1\n" +
+      "3\t0\n";
 
+  var g = new Dygraph('graph', data);
   assert.equal(0, g.getValue(0, 0));
   assert.equal(-1, g.getValue(0, 1));
   assert.equal(1, g.getValue(1, 0));
@@ -60,5 +72,60 @@ it('testParseDosNewlines', function() {
   assert.deepEqual(['X', 'Y'], g.getLabels());
 });
 
+it('should parse fractions', function() {
+  var data = "X,Y\n" +
+      "0,1/4\n" +
+      "1,2/4\n" +
+      "2,3/4\n" +
+      "3,4/4\n";
+  var g = new Dygraph('graph', data, {fractions:true});
+
+  assert.equal(0, g.getValue(0, 0));
+  assert.deepEqual([1, 4], g.getValue(0, 1));
+  assert.equal(1, g.getValue(1, 0));
+  assert.deepEqual([2, 4], g.getValue(1, 1));
+  assert.deepEqual(['X', 'Y'], g.getLabels());
+});
+
+it('should parse error bars', function() {
+  var data = "X,Y\n" +
+      "0,1,4\n" +
+      "1,2,4\n" +
+      "2,3,4\n" +
+      "3,4,4\n";
+  var g = new Dygraph('graph', data, {errorBars:true});
+
+  assert.equal(0, g.getValue(0, 0));
+  assert.deepEqual([1, 4], g.getValue(0, 1));
+  assert.equal(1, g.getValue(1, 0));
+  assert.deepEqual([2, 4], g.getValue(1, 1));
+  assert.deepEqual(['X', 'Y'], g.getLabels());
+});
+
+it('should parse custom bars', function() {
+  var data = "X,Y1,Y2\n" +
+             "1,10;20;30,20;5;25\n" +
+             "2,10;25;35,20;10;25\n";
+  var g = new Dygraph('graph', data, {customBars:true});
+
+  assert.equal(1, g.getValue(0, 0));
+  assert.deepEqual([10, 20, 30], g.getValue(0, 1));
+  assert.deepEqual([20, 5, 25], g.getValue(0, 2));
+  assert.equal(2, g.getValue(1, 0));
+  assert.deepEqual([10, 25, 35], g.getValue(1, 1));
+  assert.deepEqual([20, 10, 25], g.getValue(1, 2));
+  assert.deepEqual(['X', 'Y1', 'Y2'], g.getLabels());
+});
+
+/*
+it('should warn on unsorted input', function() {
+});
+
+it('should warn on different length columns', function() {
+});
+
+it('should detect double-labeled data', function() {
+});
+*/
 
 });