Merge b05eb6b into d004a38

docs/api-reference/test-utils/snapshot-test-runner.md

@@ -126,6 +126,7 @@ The test renderer and each test case may choose to override the default image di
 * `tolerance`
 * `threshold`
 * `includeAA`
+* `includeEmpty`
 * `createDiffImage`
 * `saveOnFail`
 * `saveAs`

modules/aggregation-layers/src/utils/aggregation-operation-utils.js

@@ -63,7 +63,7 @@ export function getMin(pts, accessor) {
 
 // Function to convert from aggregation/accessor props (like colorAggregation and getColorWeight) to getValue prop (like getColorValue)
 export function getValueFunc(aggregation, accessor) {
-  const op = AGGREGATION_OPERATION[aggregation.toUpperCase()] || AGGREGATION_OPERATION.SUM;
+  const op = AGGREGATION_OPERATION[aggregation] || AGGREGATION_OPERATION.SUM;
   switch (op) {
     case AGGREGATION_OPERATION.MIN:
       return pts => getMin(pts, accessor);

modules/core/package.json

@@ -39,6 +39,6 @@
     "gl-matrix": "^3.0.0",
     "math.gl": "^3.1.2",
     "mjolnir.js": "^2.3.0",
-    "probe.gl": "^3.2.0"
+    "probe.gl": "^3.2.1"
   }
 }

modules/test-utils/package.json

@@ -27,7 +27,7 @@
     "@deck.gl/core": "^8.0.0",
     "@luma.gl/test-utils": "^8.0.1",
     "@luma.gl/webgl": "^8.0.1",
-    "@probe.gl/test-utils": "^3.2.0"
+    "@probe.gl/test-utils": "^3.2.1"
   },
   "scripts": {}
 }

package.json

@@ -45,8 +45,8 @@
     "@loaders.gl/polyfills": "^2.0.2",
     "@luma.gl/engine": "^8.0.1",
     "@luma.gl/test-utils": "^8.0.1",
-    "@probe.gl/bench": "^3.2.0",
-    "@probe.gl/test-utils": "^3.2.0",
+    "@probe.gl/bench": "^3.2.1",
+    "@probe.gl/test-utils": "^3.2.1",
     "babel-loader": "^8.0.0",
     "babel-plugin-inline-webgl-constants": "^1.0.2",
     "babel-plugin-remove-glsl-comments": "^0.1.0",

scripts/print-golden-image.js

@@ -0,0 +1,38 @@
+/*
+  Script to retrieve failed screenshot from CI
+    - In render test, enable `saveOnFail`
+    - node scripts/print-golden-image.js <image_name> <sx> <sy> <width> <height>
+    - Copy the printed base64 string
+    - Use `restore` function in this file to convert string back to image
+ */
+const {PNG} = require('pngjs');
+const fs = require('fs');
+const path = require('path');
+
+const INPUT_FILE = path.resolve('./test/render/golden-images', process.argv[2]);
+const OUTPUT_FILE = 'out.png';
+
+const SOURCE_X = Number(process.argv[3]) || 0;
+const SOURCE_Y = Number(process.argv[4]) || 0;
+const WIDTH = Number(process.argv[5]) || 800;
+const HEIGHT = Number(process.argv[6]) || 450;
+
+fs.createReadStream(INPUT_FILE)
+  .pipe(new PNG())
+  .on('parsed', function() {
+    const dst = new PNG({width: WIDTH, height: HEIGHT});
+    // copy to destination
+    this.bitblt(dst, SOURCE_X, SOURCE_Y, WIDTH, HEIGHT, 0, 0);
+
+    dst.pack().pipe(fs.createWriteStream('out.png'))
+      .on('close', function() {
+        const buffer = fs.readFileSync('out.png');
+        console.log(buffer.toString('base64'));
+      });
+  });
+
+// Call to convert base64 back to file
+function restore(base64, width, height) {
+  const buffer = Buffer.from(base64, 'base64');
+  fs.writeFileSync('out.png', buffer);
+}

test/modules/aggregation-layers/utils/aggregation-operation-utils.spec.js

@@ -28,19 +28,19 @@ const accessor = x => x;
 const TEST_CASES = [
   {
     name: 'Min Function',
-    op: 'min',
+    op: 'MIN',
     data,
     expected: -3
   },
   {
     name: 'Max Function',
-    op: 'Max',
+    op: 'MAX',
     data,
     expected: 16
   },
   {
     name: 'Sum Function',
-    op: 'sUM',
+    op: 'SUM',
     data,
     expected: 37.2
   },

test/render/index.js

@@ -17,7 +17,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 import test from 'tape';
 import {TEST_CASES, WIDTH, HEIGHT} from './test-cases';
 import {SnapshotTestRunner} from '@deck.gl/test-utils';
@@ -36,7 +35,8 @@ test('Render Test', t => {
       onTestFail: (testCase, result) => t.fail(result.error || `match: ${result.matchPercentage}`),
 
       imageDiffOptions: {
-        threshold: 0.99
+        threshold: 0.99,
+        includeEmpty: false
         // uncomment to save screenshot to disk
         // , saveOnFail: true
         // uncomment `saveAs` to overwrite current golden images