Fix an incorrect check in 2d.missingargs.html.

https://bugs.webkit.org/show_bug.cgi?id=174854

Patch by Ms2ger <Ms2ger@igalia.com> on 2017-07-26
Reviewed by Carlos Garcia Campos.

The check was introduced without explanation in r168302. This change reverts
it to the previous, correct check.

* canvas/philip/tests/2d.missingargs-expected.txt:
* canvas/philip/tests/2d.missingargs.html:
* platform/gtk/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac/canvas/philip/tests/2d.missingargs-expected.txt: Removed.
* platform/wpe/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 506147f8dfe4bc2d32c5f8a92e5edbbe27122c0e..c6a6e4e6c7afbb2f0871d321c2af7e59cbad5288 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2017-07-26  Ms2ger  <Ms2ger@igalia.com>
+
+        Fix an incorrect check in 2d.missingargs.html.
+        https://bugs.webkit.org/show_bug.cgi?id=174854
+
+        Reviewed by Carlos Garcia Campos.
+
+        The check was introduced without explanation in r168302. This change reverts
+        it to the previous, correct check.
+
+        * canvas/philip/tests/2d.missingargs-expected.txt:
+        * canvas/philip/tests/2d.missingargs.html:
+        * platform/gtk/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac/canvas/philip/tests/2d.missingargs-expected.txt: Removed.
+        * platform/wpe/TestExpectations:
+
 2017-07-26  Claudio Saavedra  <csaavedra@igalia.com>
 
         [WPE] Enable KeyboardEvent key and code attributes

diff --git a/LayoutTests/canvas/philip/tests/2d.missingargs-expected.txt b/LayoutTests/canvas/philip/tests/2d.missingargs-expected.txt
index db418b2834d49ea4487bd095cf8531f2f62f9464..863339fb8ced63ccd812aa9ad0e7ba95bf830600 100644 (file)
--- a/LayoutTests/canvas/philip/tests/2d.missingargs-expected.txt
+++ b/LayoutTests/canvas/philip/tests/2d.missingargs-expected.txt
@@ -1,2 +1 @@
 Passed
-

diff --git a/LayoutTests/canvas/philip/tests/2d.missingargs.html b/LayoutTests/canvas/philip/tests/2d.missingargs.html
index fee708cd090d3e1a640193059403548a5838506d..dd0da29c2db592c61f5d3cf6c8cecb6c49aca247 100644 (file)
--- a/LayoutTests/canvas/philip/tests/2d.missingargs.html
+++ b/LayoutTests/canvas/philip/tests/2d.missingargs.html
@@ -313,7 +313,7 @@ try { var _thrown = false;
 } catch (e) { if (!(e instanceof TypeError)) _fail("Failed assertion: expected exception of type TypeError, got: "+e); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: g.addColorStop()"); }
 try { var _thrown = false;
   g.addColorStop(0);
-} catch (e) { if ((e.message != "SyntaxError (DOM Exception 12): The string did not match the expected pattern.")) _fail("Failed assertion: expected exception of type SyntaxError, got: "+e); _thrown = true; } finally { _assert(_thrown, "should throw exception of type SyntaxError: g.addColorStop(0)"); }
+} catch (e) { if (!(e instanceof TypeError)) _fail("Failed assertion: expected exception of type TypeError, got: "+e); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: g.addColorStop(0)"); }
 
 
 });

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index 0a2317bf797b1b5053e87f27d9d2ad2da0b9cdd4..af97508767d5c514c64521bd7d78777a3e4d9a5e 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -2547,7 +2547,6 @@ Bug(GTK) canvas/philip/tests/2d.composite.operation.darker.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.drawImage.broken.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html [ Failure ]
-Bug(GTK) canvas/philip/tests/2d.missingargs.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.text.draw.baseline.bottom.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.text.draw.baseline.hanging.html [ Failure ]
 Bug(GTK) canvas/philip/tests/2d.text.draw.baseline.ideographic.html [ Failure ]

diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
index 6be7c408ac4da1ecb2034d4844d2192dd78fbc42..1079fbad8867d8ec0c0cd6737fc8b2480087ff7a 100644 (file)
--- a/LayoutTests/platform/ios/TestExpectations
+++ b/LayoutTests/platform/ios/TestExpectations
@@ -433,7 +433,6 @@ webkit.org/b/137530 canvas/philip/tests/2d.composite.operation.darker.html [ Fai
 webkit.org/b/137530 canvas/philip/tests/2d.drawImage.animated.poster.html [ Failure ]
 webkit.org/b/137530 canvas/philip/tests/2d.drawImage.broken.html [ Failure ]
 webkit.org/b/137530 canvas/philip/tests/2d.drawImage.outsidesource.html [ Failure ]
-webkit.org/b/137530 canvas/philip/tests/2d.missingargs.html [ Failure ]
 webkit.org/b/137530 canvas/philip/tests/2d.path.rect.winding.html [ Failure ]
 webkit.org/b/137530 canvas/philip/tests/2d.text.draw.baseline.bottom.html [ Failure ]
 webkit.org/b/137530 canvas/philip/tests/2d.text.draw.baseline.hanging.html [ Failure ]

diff --git a/LayoutTests/platform/mac/canvas/philip/tests/2d.missingargs-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.missingargs-expected.txt
deleted file mode 100644 (file)
index c47ae64..0000000
--- a/LayoutTests/platform/mac/canvas/philip/tests/2d.missingargs-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-Failed assertion: expected exception of type SyntaxError, got: TypeError: Not enough arguments

diff --git a/LayoutTests/platform/wpe/TestExpectations b/LayoutTests/platform/wpe/TestExpectations
index 99ee043a6e66045b946ba7d6f5a83095ffe9f16c..aec8ff059dc4eb4ca2d7bb32287a208b68c83770 100644 (file)
--- a/LayoutTests/platform/wpe/TestExpectations
+++ b/LayoutTests/platform/wpe/TestExpectations
@@ -76,7 +76,6 @@ Bug(WPE) canvas/philip/tests/2d.composite.operation.darker.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.drawImage.animated.poster.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.drawImage.broken.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.drawImage.outsidesource.html [ Failure ]
-Bug(WPE) canvas/philip/tests/2d.missingargs.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.pattern.animated.gif.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.text.draw.baseline.bottom.html [ Failure ]
 Bug(WPE) canvas/philip/tests/2d.text.draw.baseline.hanging.html [ Failure ]