Merge pull request #7104 from AnalyticalGraphicsInc/ie-tests

Fix some IE tests
CesiumGS · Oct 18, 2018 · 919ce81 · 919ce81
2 parents 420250e + 2ff95d3
commit 919ce81
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/Specs/Scene/ExpressionSpec.js b/Specs/Scene/ExpressionSpec.js
@@ -2016,7 +2016,7 @@ defineSuite([
         expect(expression.evaluate(undefined)).toEqual(new Cartesian3(0.0, 1.0, 2.0));
 
         expression = new Expression('log2(vec4(1.0, 2.0, 4.0, 8.0))');
-        expect(expression.evaluate(undefined)).toEqual(new Cartesian4(0.0, 1.0, 2.0, 3.0));
+        expect(expression.evaluate(undefined)).toEqualEpsilon(new Cartesian4(0.0, 1.0, 2.0, 3.0), CesiumMath.EPSILON10);
     });
 
     it('throws if log2 function takes an invalid number of arguments', function() {

diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js
@@ -1,6 +1,7 @@
 defineSuite([
         'Scene/GroundPrimitive',
         'Core/ApproximateTerrainHeights',
+        'Core/arraySlice',
         'Core/Color',
         'Core/ColorGeometryInstanceAttribute',
         'Core/destroyObject',
@@ -26,6 +27,7 @@ defineSuite([
     ], function(
         GroundPrimitive,
         ApproximateTerrainHeights,
+        arraySlice,
         Color,
         ColorGeometryInstanceAttribute,
         destroyObject,
@@ -499,13 +501,13 @@ defineSuite([
 
             largeScene.groundPrimitives.add(largeSceneDepthPrimitive);
             expect(largeScene).toRenderAndCall(function(rgba) {
-                expect(rgba.slice(0, 4)).not.toEqual([0, 0, 0, 255]);
+                expect(arraySlice(rgba, 0, 4)).not.toEqual([0, 0, 0, 255]);
                 expect(rgba[0]).toEqual(0);
             });
 
             largeScene.groundPrimitives.add(groundPrimitive);
             expect(largeScene).toRenderAndCall(function(rgba) {
-                expect(rgba.slice(0, 4)).toEqual(expectedColor);
+                expect(arraySlice(rgba, 0, 4)).toEqual(expectedColor);
             });
         }
 

diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js
@@ -722,7 +722,9 @@ defineSuite([
 
             tileset.style.color = new Expression('color("blue", 0.5)');
             tileset.makeStyleDirty();
-            expect(scene).toRender([0, 0, 255, 255]);
+            expect(scene).toRenderAndCall(function(rgba) {
+                expect(rgba).toEqualEpsilon([0, 0, 255, 255], 5);
+            });
 
             var i;
             var commands = scene.frameState.commandList;

diff --git a/Specs/addDefaultMatchers.js b/Specs/addDefaultMatchers.js
@@ -4,6 +4,7 @@ define([
         'Core/defaultValue',
         'Core/defined',
         'Core/DeveloperError',
+        'Core/FeatureDetection',
         'Core/Math',
         'Core/PrimitiveType',
         'Core/RuntimeError',
@@ -19,6 +20,7 @@ define([
         defaultValue,
         defined,
         DeveloperError,
+        FeatureDetection,
         CesiumMath,
         PrimitiveType,
         RuntimeError,
@@ -599,6 +601,19 @@ define([
         return scene.context.readPixels();
     }
 
+    function isTypedArray(o) {
+        return FeatureDetection.typedArrayTypes.some(function(type) {
+            return o instanceof type;
+        });
+    }
+
+    function typedArrayToArray(array) {
+        if (isTypedArray(array)) {
+            return Array.prototype.slice.call(array, 0);
+        }
+        return array;
+    }
+
     function renderEquals(util, customEqualityTesters, actual, expected, expectEqual) {
         var actualRgba = renderAndReadPixels(actual);
 
@@ -617,7 +632,7 @@ define([
 
         var message;
         if (!pass) {
-            message = 'Expected ' + (expectEqual ? '' : 'not ')  + 'to render [' + expected + '], but actually rendered [' + actualRgba + '].';
+            message = 'Expected ' + (expectEqual ? '' : 'not ')  + 'to render [' + typedArrayToArray(expected) + '], but actually rendered [' + typedArrayToArray(actualRgba) + '].';
         }
 
         return {