[dart:html] Remove multitest usage in some js tests

Multitest usage that didn't involve separating out failures is
removed. Static errors are changed to static error tests.

Change-Id: I81d7409ead0005b9788ac80d229ac534279f1658
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/142543
Commit-Queue: Srujan Gaddam <[email protected]>
Reviewed-by: Sigmund Cherem <[email protected]>
Reviewed-by: Bob Nystrom <[email protected]>

Author: srujzs

tests/lib/html/js_typed_interop_default_arg_static_test.dart

@@ -0,0 +1,43 @@
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@JS()
+library js_typed_interop_test;
+
+import 'dart:html';
+
+import 'package:js/js.dart';
+import 'package:expect/minitest.dart';
+
+_injectJs() {
+  document.body!.append(new ScriptElement()
+    ..type = 'text/javascript'
+    ..innerHtml = r"""
+  var Foo = {
+    get42: function(b) { return arguments.length >= 1 ? b : 42; }
+  };
+""");
+}
+
+@JS()
+class Foo {
+  external static num get42([num? b = 3
+      // TODO(41375): This should be a static error. It's invalid to have a
+      // default value.
+      ]);
+}
+
+main() {
+  _injectJs();
+
+  test('call tearoff from dart with default', () {
+    var f = Foo.get42;
+    // Note: today both SSA and CPS remove the extra argument on static calls,
+    // but they fail to do so on tearoffs.
+    expect(f(), 3);
+    // TODO(41375): Remove this once the above is resolved. This is temporary
+    // to track this test failure.
+    throw ("This test should not execute. It should fail to compile above.");
+  });
+}

tests/lib/html/js_typed_interop_default_arg_test.dart

@@ -15,19 +15,14 @@ _injectJs() {
     ..type = 'text/javascript'
     ..innerHtml = r"""
   var Foo = {
-    get42: function(b) { return arguments.length >= 1 ? b : 42; },
-    get43: function(b) { return arguments.length >= 1 ? b : 43; }
+    get42: function(b) { return arguments.length >= 1 ? b : 42; }
   };
 """);
 }
 
 @JS()
 class Foo {
-  // Note: it's invalid to provide a default value.
-  external static num get42([num? b
-      = 3 // //# default_value: compile-time error
-      ]);
-  external static num get43([num? b]);
+  external static num get42([num? b]);
 }
 
 main() {
@@ -40,16 +35,11 @@ main() {
 
   test('call tearoff from dart with arg', () {
     var f = Foo.get42;
-    expect(f(2), 2); //# explicit_argument: ok
+    expect(f(2), 2);
   });
 
-  test('call tearoff from dart with default', () {
+  test('call tearoff from dart with no arg', () {
     var f = Foo.get42;
-    // Note: today both SSA and CPS remove the extra argument on static calls,
-    // but they fail to do so on tearoffs.
-    expect(f(), 3); //# default_value: continued
-
-    f = Foo.get43;
-    expect(f(), 43);
+    expect(f(), 42);
   });
 }

tests/lib/html/js_typed_interop_type1_test.dart

@@ -49,5 +49,5 @@ main() {
   var f = new F(6);
 
   Expect.equals(testA(a), 1);
-  Expect.equals(testF(f), 6); //# 01: ok
+  Expect.equals(testF(f), 6);
 }

tests/lib/html/js_typed_interop_type2_test.dart

@@ -45,5 +45,5 @@ main() {
   dynamic d = new D(foo: 4);
   var f = new F(6);
   Expect.equals(testC(d), 4);
-  Expect.equals(testF(f), 6); //# 01: ok
+  Expect.equals(testF(f), 6);
 }

tests/lib_2/html/js_typed_interop_default_arg_static_test.dart

@@ -0,0 +1,43 @@
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@JS()
+library js_typed_interop_test;
+
+import 'dart:html';
+
+import 'package:js/js.dart';
+import 'package:expect/minitest.dart';
+
+_injectJs() {
+  document.body.append(new ScriptElement()
+    ..type = 'text/javascript'
+    ..innerHtml = r"""
+  var Foo = {
+    get42: function(b) { return arguments.length >= 1 ? b : 42; }
+  };
+""");
+}
+
+@JS()
+class Foo {
+  external static num get42([num b = 3
+      // TODO(41375): This should be a static error. It's invalid to have a
+      // default value.
+      ]);
+}
+
+main() {
+  _injectJs();
+
+  test('call tearoff from dart with default', () {
+    var f = Foo.get42;
+    // Note: today both SSA and CPS remove the extra argument on static calls,
+    // but they fail to do so on tearoffs.
+    expect(f(), 3);
+    // TODO(41375): Remove this once the above is resolved. This is temporary
+    // to track this test failure.
+    throw ("This test should not execute. It should fail to compile above.");
+  });
+}

tests/lib_2/html/js_typed_interop_default_arg_test.dart

@@ -15,19 +15,14 @@ _injectJs() {
     ..type = 'text/javascript'
     ..innerHtml = r"""
   var Foo = {
-    get42: function(b) { return arguments.length >= 1 ? b : 42; },
-    get43: function(b) { return arguments.length >= 1 ? b : 43; }
+    get42: function(b) { return arguments.length >= 1 ? b : 42; }
   };
 """);
 }
 
 @JS()
 class Foo {
-  // Note: it's invalid to provide a default value.
-  external static num get42([num b
-      = 3 // //# default_value: compile-time error
-      ]);
-  external static num get43([num b]);
+  external static num get42([num b]);
 }
 
 main() {
@@ -40,16 +35,11 @@ main() {
 
   test('call tearoff from dart with arg', () {
     var f = Foo.get42;
-    expect(f(2), 2); //# explicit_argument: ok
+    expect(f(2), 2);
   });
 
-  test('call tearoff from dart with default', () {
+  test('call tearoff from dart with no arg', () {
     var f = Foo.get42;
-    // Note: today both SSA and CPS remove the extra argument on static calls,
-    // but they fail to do so on tearoffs.
-    expect(f(), 3); //# default_value: continued
-
-    f = Foo.get43;
-    expect(f(), 43);
+    expect(f(), 42);
   });
 }

tests/lib_2/html/js_typed_interop_type1_test.dart

@@ -45,5 +45,5 @@ main() {
   var f = new F(6);
 
   Expect.equals(testA(a), 1);
-  Expect.equals(testF(f), 6); //# 01: ok
+  Expect.equals(testF(f), 6);
 }

tests/lib_2/html/js_typed_interop_type2_test.dart

@@ -41,5 +41,5 @@ main() {
   dynamic d = new D(foo: 4);
   var f = new F(6);
   Expect.equals(testC(d), 4);
-  Expect.equals(testF(f), 6); //# 01: ok
+  Expect.equals(testF(f), 6);
 }