Move the WebGL lines speed test to the headless webgl test method.

Clean up after some tests.
OpenGeoscience · Dec 22, 2016 · 8bce80d · 8bce80d
1 parent 62d5b48
commit 8bce80d
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 106 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -208,9 +208,6 @@ if(SELENIUM_TESTS)
   set_property(TEST "selenium:glPointsSpeed" APPEND PROPERTY ENVIRONMENT "LOAD_SPEED_THRESHOLD=1000")
   set_property(TEST "selenium:glPointsSpeed" APPEND PROPERTY ENVIRONMENT "FRAMERATE_THRESHOLD=5")
 
-  set_property(TEST "selenium:glLinesSpeed" APPEND PROPERTY ENVIRONMENT "LOAD_SPEED_THRESHOLD=1000")
-  set_property(TEST "selenium:glLinesSpeed" APPEND PROPERTY ENVIRONMENT "FRAMERATE_THRESHOLD=2")
-
   add_custom_target(
     selenium_tests
     ALL

diff --git a/karma-base.js b/karma-base.js
@@ -171,10 +171,14 @@ module.exports = {
     test_case,
     {pattern: 'tests/data/**/*', included: false},
     {pattern: 'tests/cases/**/*.js', included: false, served: false, watched: true},
-    {pattern: 'tests/gl-cases/**/*.js', included: false, served: false, watched: true}
+    {pattern: 'tests/gl-cases/**/*.js', included: false, served: false, watched: true},
+    {pattern: 'dist/data/**/*', included: false},
+    {pattern: 'dist/examples/**/*', included: false}
   ],
   proxies: {
-    '/data/': '/base/tests/data/'
+    '/data/': '/base/tests/data/',
+    '/distdata/': '/base/dist/data/',
+    '/examples/': '/base/dist/examples/'
   },
   browsers: [
     'PhantomJS'

diff --git a/testing/test-cases/selenium-tests/glLinesSpeed/include.css b/testing/test-cases/selenium-tests/glLinesSpeed/include.css
diff --git a/testing/test-cases/selenium-tests/glLinesSpeed/include.html b/testing/test-cases/selenium-tests/glLinesSpeed/include.html
diff --git a/testing/test-cases/selenium-tests/glLinesSpeed/testGlLinesSpeed.py b/testing/test-cases/selenium-tests/glLinesSpeed/testGlLinesSpeed.py
diff --git a/tests/cases/camera.js b/tests/cases/camera.js
@@ -337,6 +337,11 @@ describe('geo.camera', function () {
     var idparent = 'geo-test-parent',
         idnode = 'geo-test-node';
 
+    afterAll(function () {
+      $('#' + idparent).remove();
+      $('#' + idnode).remove();
+    });
+
     /**
      * Generate a node on the current page with known transforms.
      */

diff --git a/tests/cases/tileLayer.js b/tests/cases/tileLayer.js
@@ -1333,6 +1333,10 @@ describe('geo.tileLayer', function () {
   });
 
   describe('HTML renderering', function () {
+    afterAll(function () {
+      $('.geo-test-container').remove();
+    });
+
     function layer_html(opts) {
       var node = $('<div class="geo-test-container" style="display: none"/>'), m, l;
       opts = opts || {};

diff --git a/...es/selenium-tests/glLinesSpeed/include.js → tests/gl-cases/glLinesSpeed.js b/...es/selenium-tests/glLinesSpeed/include.js → tests/gl-cases/glLinesSpeed.js
@@ -1,33 +1,47 @@
-window.startTest = function (done) {
-  'use strict';
+var $ = require('jquery');
 
-  var mapOptions = { center: { y: 40.0, x: -105.0 } };
+describe('glLinesSpeed', function () {
+  var imageTest = require('../image-test');
+  var common = require('../test-common');
 
-  var myMap = window.geoTests.createOsmMap(mapOptions);
+  var myMap;
 
-  var layer = myMap.createLayer('feature');
-  var feature = layer.createFeature('line', {
-    selectionAPI: false,
-    dynamicDraw: true
+  beforeEach(function () {
+    imageTest.prepareImageTest();
   });
 
-  window.geoTests.loadCitiesData(function (citieslatlon) {
+  afterEach(function () {
+    myMap.exit();
+  });
+
+  it('speed test', function (done) {
     var numLines = 100000,
         lines = [], i, j, times = [], starttime, stoptime, totaltime = 0,
-        frames = 0, animTimes = [];
+        frames = 0, animTimes = [], firsttime;
+
+    var mapOptions = {center: {x: -105.0, y: 40.0}};
+    myMap = common.createOsmMap(mapOptions, {}, true);
+
+    var layer = myMap.createLayer('feature');
+    var feature = layer.createFeature('line', {
+      selectionAPI: false,
+      dynamicDraw: true
+    });
 
     function postLoadTest() {
       times.sort(function (a, b) { return a - b; });
       if (times.length > 5) {
         times = times.slice(1, times.length - 1);
       }
+      totaltime = 0;
       for (i = 0; i < times.length; i += 1) {
         totaltime += times[i];
       }
       totaltime /= times.length;
       console.log('Load time ' + totaltime + ' ms (average across ' +
                   times.length + ' loads)');
       console.log(times);
+      expect(totaltime).toBeLessThan(1000);
       /* Test animation time. */
       starttime = new Date().getTime();
       animationFrame();
@@ -61,6 +75,7 @@ window.startTest = function (done) {
       fps = 1000.0 / frametime;
       console.log('Usable framerate ' + fps);
       console.log(animTimes);
+      expect(fps).toBeGreaterThan(1.5);
       $('#map').append($('<div style="display: none" id="framerateResults">')
         .attr('results', fps));
 
@@ -80,7 +95,7 @@ window.startTest = function (done) {
       myMap.draw();
       stoptime = new Date().getTime();
       times.push(stoptime - starttime);
-      if (times.length < 12 && stoptime - starttime < 10000) {
+      if (times.length < 12 && stoptime - firsttime < 10000) {
         window.setTimeout(loadTest, 1);
       } else {
         postLoadTest();
@@ -112,25 +127,27 @@ window.startTest = function (done) {
       }
     }
 
-    /* Connect various cities with lines */
-    for (j = 1; lines.length < numLines; j += 1) {
-      for (i = 0; i < citieslatlon.length - j && lines.length < numLines;
-           i += j + 1) {
-        lines.push([{
-          x: citieslatlon[i].lon,
-          y: citieslatlon[i].lat,
-          z: citieslatlon[i].elev,
-          strokeColor: {r: 0, g: 0, b: 1}
-        }, {
-          x: citieslatlon[i + j].lon,
-          y: citieslatlon[i + j].lat,
-          z: citieslatlon[i + j].elev,
-          strokeColor: {r: 1, g: 1, b: 0}
-        }]);
+    common.loadCitiesData(function (citieslatlon) {
+      /* Connect various cities with lines */
+      for (j = 1; lines.length < numLines; j += 1) {
+        for (i = 0; i < citieslatlon.length - j && lines.length < numLines;
+             i += j + 1) {
+          lines.push([{
+            x: citieslatlon[i].lon,
+            y: citieslatlon[i].lat,
+            z: citieslatlon[i].elev,
+            strokeColor: {r: 0, g: 0, b: 1}
+          }, {
+            x: citieslatlon[i + j].lon,
+            y: citieslatlon[i + j].lat,
+            z: citieslatlon[i + j].elev,
+            strokeColor: {r: 1, g: 1, b: 0}
+          }]);
+        }
       }
-    }
 
-    loadTest();
-
-  });
-};
+      firsttime = new Date().getTime();
+      loadTest();
+    });
+  }, 30000);
+});
diff --git a/tests/test-common.js b/tests/test-common.js
@@ -72,7 +72,7 @@ module.exports = {
     // Load at most n rows of the cities dataset.
     $.ajax({
       type: 'GET',
-      url: '/data/cities.csv',
+      url: '/distdata/cities.csv',
       dataType: 'text',
       success: function (data) {
         function processCSVData(csvdata) {