Bug 1306174 - Update tests. a=ritu
authorJeff Gilbert (:jgilbert) <jgilbert@mozilla.com>
Thu, 29 Sep 2016 14:31:38 -0700
changeset 350677 0b924dbd174b867f669e30b7493e115c0d00243a
parent 350676 63c697ca56e5d69fb83adab137d24662a5340186
child 350678 4d0f2d5b85a75093569a37120bf8ee47a156bc9e
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersritu
bugs1306174
milestone50.0
Bug 1306174 - Update tests. a=ritu MozReview-Commit-ID: DAPC09ElrRK
dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-atc.html
dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-pvrtc.html
dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-s3tc.html
--- a/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-atc.html
+++ b/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-atc.html
@@ -166,21 +166,17 @@ function runSupportedTest(extensionEnabl
     }
 }
 
 
 function runTestDisabled() {
     debug("Testing binding enum with extension disabled");
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats", "[]");
-    } else {
-        shouldBe("supportedFormats.length", "10");
-    }
+    shouldBe("supportedFormats", "[]");
 }
 
 function formatExists(format, supportedFormats) {
     for (var ii = 0; ii < supportedFormats.length; ++ii) {
         if (format == supportedFormats[ii]) {
             testPassed("supported format " + formatToString(format) + " is exists");
             return;
         }
@@ -203,22 +199,17 @@ function runTestExtension() {
     // check that all format enums exist.
     for (name in validFormats) {
         var expected = "0x" + validFormats[name].toString(16);
         var actual = "ext['" + name + "']";
         shouldBe(actual, expected);
     }
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    // There should be exactly 3 formats for WebGL 1.0 and 13 formats for WebGL 2.0.
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats.length", "3");
-    } else {
-        shouldBe("supportedFormats.length", "13");
-    }
+    shouldBe("supportedFormats.length", "3");
 
     // check that all 3 formats exist
     for (var name in validFormats.length) {
         formatExists(validFormats[name], supportedFormats);
     }
 
     // Test each format
     testATC_RGB();
--- a/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-pvrtc.html
+++ b/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-pvrtc.html
@@ -139,21 +139,17 @@ function runSupportedTest(extensionEnabl
     }
 }
 
 
 function runTestDisabled() {
     debug("Testing binding enum with extension disabled");
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats", "[]");
-    } else {
-        shouldBe("supportedFormats.length", "10");
-    }
+    shouldBe("supportedFormats", "[]");
 }
 
 function formatExists(format, supportedFormats) {
     for (var ii = 0; ii < supportedFormats.length; ++ii) {
         if (format == supportedFormats[ii]) {
             testPassed("supported format " + formatToString(format) + " is exists");
             return;
         }
@@ -176,22 +172,17 @@ function runTestExtension() {
     // check that all format enums exist.
     for (name in validFormats) {
         var expected = "0x" + validFormats[name].toString(16);
         var actual = "ext['" + name + "']";
         shouldBe(actual, expected);
     }
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    // There should be exactly 4 formats for WebGL 1.0 and 14 formats for WebGL 2.0.
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats.length", "4");
-    } else {
-        shouldBe("supportedFormats.length", "14");
-    }
+    shouldBe("supportedFormats.length", "4");
 
     // check that all 4 formats exist
     for (var name in validFormats.length) {
         formatExists(validFormats[name], supportedFormats);
     }
 
     // Test each format
     testPVRTC_RGBA_2BPP();
--- a/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-s3tc.html
+++ b/dom/canvas/test/webgl-conf/checkout/conformance/extensions/webgl-compressed-texture-s3tc.html
@@ -146,21 +146,17 @@ function runSupportedTest(extensionEnabl
     }
 }
 
 
 function runTestDisabled() {
     debug("Testing binding enum with extension disabled");
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats", "[]");
-    } else {
-        shouldBe("supportedFormats.length", "10");
-    }
+    shouldBe("supportedFormats", "[]");
 }
 
 function formatExists(format, supportedFormats) {
     for (var ii = 0; ii < supportedFormats.length; ++ii) {
         if (format == supportedFormats[ii]) {
             testPassed("supported format " + formatToString(format) + " is exists");
             return;
         }
@@ -183,22 +179,17 @@ function runTestExtension() {
     // check that all format enums exist.
     for (name in validFormats) {
         var expected = "0x" + validFormats[name].toString(16);
         var actual = "ext['" + name + "']";
         shouldBe(actual, expected);
     }
 
     supportedFormats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS);
-    // There should be exactly 4 formats for WebGL 1.0 and 14 formats for WebGL 2.0.
-    if (contextVersion < 2) {
-        shouldBe("supportedFormats.length", "4");
-    } else {
-        shouldBe("supportedFormats.length", "14");
-    }
+    shouldBe("supportedFormats.length", "4");
 
     // check that all 4 formats exist
     for (var name in validFormats.length) {
         formatExists(validFormats[name], supportedFormats);
     }
 
     // Test each format
     testDXT1_RGB();