Update size.attributes.parse.trailingjunk

Fix size.attributes.parse.trailingjunk to match spec: offscreenCanvas.width = '100#!?' should shrow TypeError because 100#!? is NaN. Bug:1067639 Change-Id: I5b9798cfb7d4f7ecfc77854fd1431c1df89f84a4
web-platform-tests · Apr 9, 2020 · 60492b3 · 60492b3
1 parent a6b1cb6
commit 60492b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html b/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
@@ -20,10 +20,7 @@ <h1>size.attributes.parse.trailingjunk</h1>
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-offscreenCanvas.width = '100#!?';
-offscreenCanvas.height = '100#!?';
-_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
-_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
+assert_throws_js(TypeError, function() { offscreenCanvas.width = '100#!?'; });
 t.done();
 
 });

diff --git a/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js b/offscreen-canvas/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
@@ -16,10 +16,7 @@ t.step(function() {
 var offscreenCanvas = new OffscreenCanvas(100, 50);
 var ctx = offscreenCanvas.getContext('2d');
 
-offscreenCanvas.width = '100#!?';
-offscreenCanvas.height = '100#!?';
-_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100");
-_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100");
+assert_throws_js(TypeError, function() { offscreenCanvas.width = '100#!?'; });
 t.done();
 
 });

diff --git a/offscreen-canvas/tools/tests2d.yaml b/offscreen-canvas/tools/tests2d.yaml
@@ -9791,7 +9791,7 @@
         ("percent", "100%", 100),
         ("em", "100em", 100),
         ("junk", "#!?", None),
-        ("trailingjunk", "100#!?", 100),
+        ("trailingjunk", "100#!?", "exception"),
     ]
     def gen(name, string, exp, code):
         testing = ["size.nonnegativeinteger"]
@@ -9800,6 +9800,9 @@
             code += "offscreenCanvas.width = '%s';\noffscreenCanvas.height = '%s';\n" % (string, string)
             code += "@assert offscreenCanvas.width === 100;\n@assert offscreenCanvas.height === 50;\n"
             expected = None
+        elif exp == "exception":
+            code += "@assert throws TypeError offscreenCanvas.width = '%s';\n" % string
+            expected = None
         else:
             code += "offscreenCanvas.width = '%s';\noffscreenCanvas.height = '%s';\n" % (string, string)
             code += "@assert offscreenCanvas.width === %s;\n@assert offscreenCanvas.height === %s;\n" % (exp, exp)