Make EventListener-invoke-legacy.html a little more robust to missing…

… interfaces.
servo · Feb 20, 2017 · 0200a23 · 0200a23
1 parent 4fadf9b
commit 0200a23
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -160431,7 +160431,7 @@
    "support"
   ],
   "dom/events/EventListener-invoke-legacy.html": [
-   "5c047e994f2bcb971918b42760c70cea7176abcb",
+   "e56b332acb454ab76964b78588536777946ddff8",
    "testharness"
   ],
   "dom/events/EventListenerOptions-capture.html": [

diff --git a/tests/wpt/metadata/dom/events/EventListener-invoke-legacy.html.ini b/tests/wpt/metadata/dom/events/EventListener-invoke-legacy.html.ini
@@ -1,9 +1,27 @@
 [EventListener-invoke-legacy.html]
   type: testharness
-  expected: ERROR
+  expected: TIMEOUT
   [Listener of transitionend]
     expected: FAIL
 
   [Legacy listener of transitionend]
     expected: TIMEOUT
 
+  [Listener of animationend]
+    expected: TIMEOUT
+
+  [Legacy listener of animationend]
+    expected: TIMEOUT
+
+  [Listener of animationiteration]
+    expected: TIMEOUT
+
+  [Legacy listener of animationiteration]
+    expected: TIMEOUT
+
+  [Listener of animationstart]
+    expected: TIMEOUT
+
+  [Legacy listener of animationstart]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-invoke-legacy.html b/tests/wpt/web-platform-tests/dom/events/EventListener-invoke-legacy.html
@@ -43,7 +43,7 @@
         assert_unreached("listener of " + legacyType + " should not be invoked again");
         return;
       }
-      elem.dispatchEvent(new ctor(type));
+      elem.dispatchEvent(new window[ctor](type));
       t.done();
     }));
     setup(elem);
@@ -65,8 +65,8 @@
   elem.style.animation = 'test 30ms 2';
 }
 
-runLegacyEventTest('transitionend', 'webkitTransitionEnd', TransitionEvent, setupTransition);
-runLegacyEventTest('animationend', 'webkitAnimationEnd', AnimationEvent, setupAnimation);
-runLegacyEventTest('animationiteration', 'webkitAnimationIteration', AnimationEvent, setupAnimation);
-runLegacyEventTest('animationstart', 'webkitAnimationStart', AnimationEvent, setupAnimation);
+runLegacyEventTest('transitionend', 'webkitTransitionEnd', "TransitionEvent", setupTransition);
+runLegacyEventTest('animationend', 'webkitAnimationEnd', "AnimationEvent", setupAnimation);
+runLegacyEventTest('animationiteration', 'webkitAnimationIteration', "AnimationEvent", setupAnimation);
+runLegacyEventTest('animationstart', 'webkitAnimationStart', "AnimationEvent", setupAnimation);
 </script>