plotly · etpinard · Nov 17, 2015 · Nov 13, 2015 · Nov 13, 2015 · Nov 13, 2015
diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,23 @@
+general:
+  artifacts:
+      - "build/test_images/" # relative to the build directory
+      - "build/test_images_diff/" # relative to the build directory
+
+machine:
+  node:
+    version: 4.2.1 
+  services:
+    - docker
+
+
+dependencies:
+  pre: 
+    - docker pull plotly/imageserver:0.2.1
+  post:
+    - npm run cibuild
+    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:0.2.1; sleep 20
+
+test:
+  override:
+    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' myimageserver)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
+    - npm run citest-jasmine
diff --git a/devtools/image_viewer/index.html b/devtools/image_viewer/index.html
@@ -2,7 +2,7 @@
 <head>
 </head>
 <body>
-    <div id="plot-list"></div>
+    <div id="plot-list" style="overflow:auto; height:100px;"></div>
     <div id="plot-images"></div>
     <div id="plot-mock"></div>
 

diff --git a/devtools/image_viewer/server.js b/devtools/image_viewer/server.js
@@ -4,6 +4,7 @@ var path = require('path');
 var exec = require('child_process').exec;
 
 var browserify = require('browserify');
+var brfs = require('brfs');
 var ecstatic = require('ecstatic');
 var _open = require('open');
 
@@ -15,23 +16,31 @@ var PORT = '9090';
 
 console.log('Listening on :' + PORT + '\n');
 
-var listName = 'list-of-incorrect-images.txt';
+var listPath = constants.pathToTestImagesDiffList;
+var listCMD = [
+    'ls',
+    constants.pathToTestImagesDiff,
+    '>',
+    listPath
+].join(' ');
 
 // build image viewer bundle
 fs.unlink(constants.pathToImageViewerBundle, function() {
-    exec('ls ../test-images-diffs/ > ' + listName, function() {
-        var b = browserify(path.join(__dirname, './viewer.js'), { debug: true });
+    exec(listCMD, function() {
+        var b = browserify(path.join(__dirname, './viewer.js'), {
+            debug: true,
+            transform: [brfs]
+        });
 
-        b.transform('brfs');
         b.bundle(function(err) {
             if(err) throw err;
 
             _open('http://localhost:' + PORT + '/devtools/image_viewer');
         })
         .pipe(fs.createWriteStream(constants.pathToImageViewerBundle));
 
-        fs.readFile(listName, 'utf8', function(err, data) {
-            console.log('In ' + listName + ':\n' + data);
+        fs.readFile(listPath, 'utf8', function(err, data) {
+            console.log('In ' + listPath + ':\n' + data);
         });
     });
 });

diff --git a/devtools/image_viewer/viewer.js b/devtools/image_viewer/viewer.js
@@ -1,17 +1,23 @@
 var fs = require('fs');
+
 var d3 = require('d3');
 
+var constants = require('../../tasks/util/constants');
+
+
 var $plotlist = document.getElementById('plot-list'),
     $images = document.getElementById('plot-images'),
     $mock = document.getElementById('plot-mock');
 
-var dirBaseline = '../test-images-baseline/',
-    dirTest = '../test-images/',
-    dirDiff = '../test-images-diffs/',
-    dirMocks = '../mocks/';
+var dirBaseline = constants.pathToTestImageBaselines,
+    dirTest = constants.pathToTestImages,
+    dirDiff = constants.pathToTestImagesDiff,
+    dirMocks = constants.pathToTestImageMocks;
 
+// N.B. brfs only understand hard-coded paths
 var imageNames = fs.readFileSync(
-        __dirname + '/list-of-incorrect-images.txt', 'utf8'
+       __dirname + '/../../build/list_of_incorrect_images.txt',
+        'utf8'
     )
     .split('\n')
     .filter(function(x) { return x; })

diff --git a/devtools/test_dashboard/buttons.js b/devtools/test_dashboard/buttons.js
@@ -109,7 +109,7 @@ function plotButtons(plots, figDir) {
     plotlist.appendChild(pummelButton);
 
     var i = 0;
-    var mock = require('./testplots-3d/marker-color.json');
+    var mock = require('@mocks/gl3d_marker-color.json');
     var statusDiv = document.getElementById('status-info');
 
     pummelButton.addEventListener('click', function () {

diff --git a/devtools/test_dashboard/server.js b/devtools/test_dashboard/server.js
@@ -17,13 +17,13 @@ var PORT = '8080';
 var testFile;
 switch(process.argv[2]) {
     case 'geo':
-        testFile = './test-geo';
+        testFile = 'test_geo';
     break;
-    case '2d':
-        testFile = './test-2d';
+    case 'gl3d':
+        testFile = 'test_gl3d';
     break;
     default:
-        testFile = './test-3d';
+        testFile = 'test_gl2d';
 }
 
 console.log('Using ' + testFile);

diff --git a/devtools/test_dashboard/test-2d.js b/devtools/test_dashboard/test-2d.js
diff --git a/devtools/test_dashboard/test-3d.js b/devtools/test_dashboard/test-3d.js
diff --git a/devtools/test_dashboard/test-geo.js → devtools/test_dashboard/test_geo.js b/devtools/test_dashboard/test-geo.js → devtools/test_dashboard/test_geo.js
diff --git a/devtools/test_dashboard/test_gl2d.js b/devtools/test_dashboard/test_gl2d.js
@@ -0,0 +1,46 @@
+var plotButtons = require('./buttons');
+
+var figDir = '../../test/image/baselines/gl2d_';
+
+var plots = {};
+
+plots['10'] = require('@mocks/gl2d_10.json');
+plots['14'] = require('@mocks/gl2d_14.json');
+plots['12'] = require('@mocks/gl2d_12.json');
+plots['17'] = require('@mocks/gl2d_17.json');
+plots['22'] = require('@mocks/gl2d_22.json');
+plots['24'] = require('@mocks/gl2d_24.json');
+plots['28'] = require('@mocks/gl2d_28.json');
+plots['30'] = require('@mocks/gl2d_30.json');
+plots['32'] = require('@mocks/gl2d_32.json');
+plots['axes_booleans'] = require('@mocks/gl2d_axes_booleans.json');
+plots['axes_labels'] = require('@mocks/gl2d_axes_labels.json');
+plots['axes_lines'] = require('@mocks/gl2d_axes_lines.json');
+plots['axes_range_manual'] = require('@mocks/gl2d_axes_range_manual.json');
+plots['axes_range_type'] = require('@mocks/gl2d_axes_range_type.json');
+plots['axes_range_mode'] = require('@mocks/gl2d_axes_range_mode.json');
+plots['basic_error_bar'] = require('@mocks/gl2d_basic_error_bar.json');
+plots['bubble_markersize0'] = require('@mocks/gl2d_bubble_markersize0.json');
+plots['bubble_nonnumeric-sizes'] = require('@mocks/gl2d_bubble_nonnumeric-sizes.json');
+plots['date_axes'] = require('@mocks/gl2d_date_axes.json');
+plots['error_bar_asymmetric_array'] = require('@mocks/gl2d_error_bar_asymmetric_array.json');
+plots['error_bar_asymmetric_constant'] = require('@mocks/gl2d_error_bar_asymmetric_constant.json');
+plots['error_bar_horizontal'] = require('@mocks/gl2d_error_bar_horizontal.json');
+plots['error_bar_style'] = require('@mocks/gl2d_error_bar_style.json');
+plots['fonts'] = require('@mocks/gl2d_fonts.json');
+plots['global_font'] = require('@mocks/gl2d_global_font.json');
+plots['legend_inside'] = require('@mocks/gl2d_legend_inside.json');
+plots['legend_labels'] = require('@mocks/gl2d_legend_labels.json');
+plots['legend_outside'] = require('@mocks/gl2d_legend_outside.json');
+plots['legend_style'] = require('@mocks/gl2d_legend_style.json');
+plots['line_style'] = require('@mocks/gl2d_line_style.json');
+plots['multiple_subplots'] = require('@mocks/gl2d_multiple_subplots.json');
+plots['scatter-colorscale-colorbar'] = require('@mocks/gl2d_scatter-colorscale-colorbar.json');
+plots['scatter-marker-line-colorscales'] = require('@mocks/gl2d_scatter-marker-line-colorscales.json');
+plots['show_legend'] = require('@mocks/gl2d_show_legend.json');
+plots['simple_inset'] = require('@mocks/gl2d_simple_inset.json');
+plots['size_margins'] = require('@mocks/gl2d_size_margins.json');
+plots['stacked_coupled_subplots'] = require('@mocks/gl2d_stacked_coupled_subplots.json');
+plots['stacked_subplots'] = require('@mocks/gl2d_stacked_subplots.json');
+
+plotButtons(plots, figDir);
diff --git a/devtools/test_dashboard/test_gl3d.js b/devtools/test_dashboard/test_gl3d.js
@@ -0,0 +1,37 @@
+var plotButtons = require('./buttons');
+
+var figDir = '../../test/image/baselines/gl3d_';
+
+var plots = {};
+
+plots['bunny-hull'] = require('@mocks/gl3d_bunny-hull.json');
+plots['ibm-plot'] = require('@mocks/gl3d_ibm-plot.json');
+plots['marker-color'] = require('@mocks/gl3d_marker-color.json');
+plots['log-axis-big'] = require('@mocks/gl3d_log-axis-big.json');
+plots['delaunay'] = require('@mocks/gl3d_delaunay.json');
+plots['log-axis'] = require('@mocks/gl3d_log-axis.json');
+plots['multi-scene'] = require('@mocks/gl3d_multi-scene.json');
+plots['surface-lighting'] = require('@mocks/gl3d_surface-lighting.json');
+plots['z-range'] = require('@mocks/gl3d_z-range.json');
+plots['mirror-ticks'] = require('@mocks/gl3d_mirror-ticks.json');
+plots['autorange-zero'] = require('@mocks/gl3d_autorange-zero.json');
+plots['contour-lines'] = require('@mocks/gl3d_contour-lines.json');
+plots['xy-defined-ticks'] = require('@mocks/gl3d_xy-defined-ticks.json');
+plots['opacity-surface'] = require('@mocks/gl3d_opacity-surface.json');
+plots['projection-traces'] = require('@mocks/gl3d_projection-traces.json');
+plots['opacity-scaling-spikes'] = require('@mocks/gl3d_opacity-scaling-spikes.json');
+plots['text-weirdness'] = require('@mocks/gl3d_text-weirdness.json');
+plots['wire-surface'] = require('@mocks/gl3d_wire-surface.json');
+plots['triangle-mesh3d'] = require('@mocks/gl3d_triangle.json');
+plots['snowden'] = require('@mocks/gl3d_snowden.json');
+plots['bunny'] = require('@mocks/gl3d_bunny.json');
+plots['ribbons'] = require('@mocks/gl3d_ribbons.json');
+plots['date-time'] = require('@mocks/gl3d_scatter-date.json');
+plots['cufflinks'] = require('@mocks/gl3d_cufflinks.json');
+plots['chrisp-nan-1'] = require('@mocks/gl3d_chrisp-nan-1.json');
+plots['marker-arrays'] = require('@mocks/gl3d_marker-arrays.json');
+plots['scatter3d-colorscale'] = require('@mocks/gl3d_scatter3d-colorscale.json');
+plots['autocolorscale'] = require('@mocks/gl3d_autocolorscale.json');
+plots['nan-holes'] = require('@mocks/gl3d_nan-holes.json');
+
+plotButtons(plots, figDir);