dropping unnecessary try usage, better testharness.js usage

web-platform-tests · Jul 27, 2015 · 68be7a9 · 68be7a9
1 parent f675441
commit 68be7a9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/...ent_interface_synthetic_events_with_new_clipboardevent_constructor_paste_on_document.html b/...ent_interface_synthetic_events_with_new_clipboardevent_constructor_paste_on_document.html
@@ -13,14 +13,9 @@
     return e.clipboardData.getData('text/plain')=='synthetic event text';
 }
 function onTestSetupReady(){
-    try{
-        var evt = new ClipboardEvent('paste')
-        evt.clipboardData.items.add('synthetic event text', 'text/plain');
-        document.dispatchEvent(evt);
-    }catch(e){
-        result('Unexpected Exception when initiating ClipboardEvent: '+e);
-        return;
-    }
+    var evt = new ClipboardEvent('paste')
+    evt.clipboardData.items.add('synthetic event text', 'text/plain');
+    document.dispatchEvent(evt);
 }
 
     </script>

diff --git a/...ipboardevent_interface_synthetic_events_with_nonstandard_mime_type_paste_on_document.html b/...ipboardevent_interface_synthetic_events_with_nonstandard_mime_type_paste_on_document.html
@@ -14,14 +14,9 @@
 }
 
 function onTestSetupReady(){
-    try{
-        var evt = new ClipboardEvent('paste');
-        evt.clipboardData.items.add('synthetic event text', 'text/foobarbogustype');
-        document.dispatchEvent(evt);
-    }catch(e){
-        result('Unexpected Exception when initiating ClipboardEvent: '+e);
-        return;
-    }
+    var evt = new ClipboardEvent('paste');
+    evt.clipboardData.items.add('synthetic event text', 'text/foobarbogustype');
+    document.dispatchEvent(evt);
 }
 
     </script>

diff --git a/clipboard-apis/getdata_method_with_wrong_number_of_arguments_paste_on_document.html b/clipboard-apis/getdata_method_with_wrong_number_of_arguments_paste_on_document.html
@@ -10,16 +10,14 @@
 /* Events: paste */
 /* paste data: "pasted text" */
 function clipboard_api_test(e){
-    var passed=true;
-    try{
+  result(function(){
+    assert_throws(new TypeError, function(){
         e.clipboardData.getData();
-        passed=false;
-    }catch(e){}
-    try{
+    });
+/*    assert_throws('TypeError', function(){
         e.clipboardData.getData('text/plain', 'wrong number of arguments');
-        passed=false;
-    }catch(e){}
-    return passed;
+    });*/
+  });
 }
 
     </script>

diff --git a/...ta_method_does_not_throw_when_implementation_does_not_know_the_type_copy_on_document.html b/...ta_method_does_not_throw_when_implementation_does_not_know_the_type_copy_on_document.html
@@ -14,14 +14,9 @@
 //TODO: this test asserts a NOOP.
 // how this SHOULD work is, however, underspecified..
 function clipboard_api_test(e){
-    var passed = false;
-    try{
-        e.clipboardData.setData('text/foobarbogustype', 'copycutpaste modified text');
-        e.preventDefault();
-        passed=true;
-    }catch(e){
-    }
-    return passed;
+    e.clipboardData.setData('text/foobarbogustype', 'copycutpaste modified text');
+    e.preventDefault();
+    // pass condition is external, check clipboard contents
 }
 
     </script>

diff --git a/...ata_method_does_not_throw_when_implementation_does_not_know_the_type_cut_on_document.html b/...ata_method_does_not_throw_when_implementation_does_not_know_the_type_cut_on_document.html
@@ -14,14 +14,9 @@
 //TODO: this test asserts a NOOP.
 // how this SHOULD work is, however, underspecified..
 function clipboard_api_test(e){
-    var passed = false;
-    try{
-        e.clipboardData.setData('text/foobarbogustype', 'copycutpaste modified text');
-        e.preventDefault();
-        passed=true;
-    }catch(e){
-    }
-    return passed;
+    e.clipboardData.setData('text/foobarbogustype', 'copycutpaste modified text');
+    e.preventDefault();
+    // pass condition is external, check clipboard contents
 }
 
     </script>