Make tests/lib/js/static_interop not use minitest.

Change-Id: Id7a8a6ac0098df55b04fa089587c62b07e9cf3c2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403860
Reviewed-by: Sigmund Cherem <[email protected]>
Commit-Queue: Lasse Nielsen <[email protected]>
Reviewed-by: Srujan Gaddam <[email protected]>

Author: lrhn

sdk/lib/_internal/js_shared/lib/js_util_patch.dart

@@ -525,7 +525,7 @@ bool typeofEquals<T>(Object? o, String type) {
 @patch
 @pragma('dart2js:tryInline')
 T not<T>(Object? o) {
-  return JS<dynamic>('Object', '!#', o);
+  return JS<T>('bool', '!#', o);
 }
 
 @patch
@@ -537,13 +537,13 @@ bool isTruthy<T>(Object? o) {
 @patch
 @pragma('dart2js:tryInline')
 T or<T>(Object? first, Object? second) {
-  return JS<dynamic>('Object|bool', '# || #', first, second);
+  return JS<dynamic>('Object|Null|bool', '# || #', first, second);
 }
 
 @patch
 @pragma('dart2js:tryInline')
 T and<T>(Object? first, Object? second) {
-  return JS<dynamic>('Object|bool', '# && #', first, second);
+  return JS<dynamic>('Object|Null|bool', '# && #', first, second);
 }
 
 @patch

tests/lib/js/static_interop_test/allowed_external_member_native_type_test.dart

@@ -6,9 +6,6 @@
 // valid ones are those that <: `JavaScriptObject` and users can reference,
 // which end up only being the types in the SDK web libraries.
 
-@JS()
-library allowed_external_member_native_type_test;
-
 import 'dart:html';
 import 'dart:js_interop';
 import 'dart:svg';

tests/lib/js/static_interop_test/allowed_external_member_type_test.dart

@@ -2,9 +2,6 @@
 // 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 allowed_external_member_type_test;
-
 import 'dart:js_interop';
 
 import 'package:js/js.dart' as pkgJs;
@@ -192,8 +189,13 @@ external ExtensionType interopExtensionTypeMethod(ExtensionType _);
 @JS()
 external void primitivesMethod(num a, int b, double c, bool d, String e);
 
-void functionToJSTest<T extends JSAny, U extends ExtensionType,
-    V extends StaticInterop, W, Y>() {
+void functionToJSTest<
+  T extends JSAny,
+  U extends ExtensionType,
+  V extends StaticInterop,
+  W,
+  Y
+>() {
   // Test `toJS` conversions of functions.
   ((double _) => 4.0.toJS).toJS;
 

tests/lib/js/static_interop_test/call_utils.dart

@@ -15,8 +15,7 @@ dynamic confuse(dynamic x) => x;
 external JSAny? eval(String script);
 
 void injectJS() {
-  eval(
-    '''
+  eval('''
     self.jsFunction = function(s) {
         if (this == null) {
           throw "`this` is null or undefined";
@@ -47,8 +46,7 @@ void injectJS() {
       }
     }
     self.jsClass = new NamedClass();
-    ''',
-  );
+    ''');
 }
 
 bool jsThisIsNullCheck(e) =>

tests/lib/js/static_interop_test/constants_test.dart

@@ -2,9 +2,6 @@
 // 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 constants_test;
-
 import 'dart:html';
 
 import 'package:js/js.dart';

tests/lib/js/static_interop_test/disallowed_generative_constructor_static_test.dart

@@ -2,9 +2,6 @@
 // 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 disallowed_generative_constructor_static_test;
-
 import 'package:js/js.dart';
 
 @JS()
@@ -24,16 +21,16 @@ class SyntheticConstructor {}
 
 void main() {
   SyntheticConstructor();
-//^
-// [web] Synthetic constructors on `@staticInterop` classes can not be used.
+  // [error column 3]
+  // [web] Synthetic constructors on `@staticInterop` classes can not be used.
 
   SyntheticConstructor.new;
-//^
-// [web] Synthetic constructors on `@staticInterop` classes can not be used.
+  // [error column 3]
+  // [web] Synthetic constructors on `@staticInterop` classes can not be used.
 
   // Make sure that we report an error for every usage of the constant and that
   // we check nested constants.
   const [SyntheticConstructor.new];
-//^
-// [web] Synthetic constructors on `@staticInterop` classes can not be used.
+  // [error column 3]
+  // [web] Synthetic constructors on `@staticInterop` classes can not be used.
 }

tests/lib/js/static_interop_test/extension_type/external_extension_member_test.dart

@@ -2,12 +2,8 @@
 // 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 external_extension_member_test;
-
 import 'dart:js_interop';
-
-import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use_from_same_package
+import 'package:expect/expect.dart';
 
 @JS()
 external void eval(String code);
@@ -52,24 +48,24 @@ void main() {
   var extension = ExtensionType();
 
   // Fields.
-  expect(extension.field, 'field');
+  Expect.equals('field', extension.field);
   extension.field = 'modified';
-  expect(extension.field, 'modified');
-  expect(extension.renamedField, 'modified');
+  Expect.equals('modified', extension.field);
+  Expect.equals('modified', extension.renamedField);
   extension.renamedField = 'renamedField';
-  expect(extension.renamedField, 'renamedField');
-  expect(extension.finalField, 'finalField');
+  Expect.equals('renamedField', extension.renamedField);
+  Expect.equals('finalField', extension.finalField);
 
   // Getters and setters.
-  expect(extension.getSet, 'getSet');
+  Expect.equals('getSet', extension.getSet);
   extension.getSet = 'modified';
-  expect(extension.getSet, 'modified');
-  expect(extension.renamedGetSet, 'modified');
+  Expect.equals('modified', extension.getSet);
+  Expect.equals('modified', extension.renamedGetSet);
   extension.renamedGetSet = 'renamedGetSet';
-  expect(extension.renamedGetSet, 'renamedGetSet');
+  Expect.equals('renamedGetSet', extension.renamedGetSet);
 
   // Methods.
-  expect(extension.method(), 'method');
-  expect(extension.differentArgsMethod('method'), 'methodundefined');
-  expect(extension.renamedMethod(), 'method');
+  Expect.equals('method', extension.method());
+  Expect.equals('methodundefined', extension.differentArgsMethod('method'));
+  Expect.equals('method', extension.renamedMethod());
 }

tests/lib/js/static_interop_test/extension_type/external_member_test.dart

@@ -2,13 +2,9 @@
 // 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 external_member_test;
-
 import 'dart:js_interop';
 
 import 'package:expect/expect.dart';
-import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use_from_same_package
 import 'package:expect/variations.dart';
 
 const soundNullSafety = !unsoundNullSafety;
@@ -41,8 +37,11 @@ extension type External<T extends JSAny?, U extends Nested>._(JSObject _) {
   @JS('addMethod')
   external T addMethodT(T a, T b);
   @JS('addMethod')
-  external R addMethodGeneric<R extends JSAny?, P extends JSAny?>(P a, P b,
-      [bool dontAddNull]);
+  external R addMethodGeneric<R extends JSAny?, P extends JSAny?>(
+    P a,
+    P b, [
+    bool dontAddNull,
+  ]);
 
   external Nested nested;
   external Nested combineNested(Nested a, Nested b);
@@ -87,61 +86,65 @@ void main() {
   final external = External<JSString, Nested>();
 
   // Fields.
-  expect(external.field, 'field');
+  Expect.equals('field', external.field);
   external.field = 'modified';
-  expect(external.field, 'modified');
-  expect(external.renamedField, 'modified');
+  Expect.equals('modified', external.field);
+  Expect.equals('modified', external.renamedField);
   external.renamedField = 'renamedField';
-  expect(external.renamedField, 'renamedField');
-  expect(external.finalField, 'finalField');
+  Expect.equals('renamedField', external.renamedField);
+  Expect.equals('finalField', external.finalField);
 
   // Getters and setters.
-  expect(external.getSet, 'getSet');
+  Expect.equals('getSet', external.getSet);
   external.getSet = 'modified';
-  expect(external.getSet, 'modified');
-  expect(external.renamedGetSet, 'modified');
+  Expect.equals('modified', external.getSet);
+  Expect.equals('modified', external.renamedGetSet);
   external.renamedGetSet = 'renamedGetSet';
-  expect(external.renamedGetSet, 'renamedGetSet');
+  Expect.equals('renamedGetSet', external.renamedGetSet);
 
   // Methods.
-  expect(external.method(), 'method');
-  expect(external.addMethod('method'), 'methodundefined');
-  expect(external.addMethod('method', 'method'), 'methodmethod');
-  expect(external.renamedMethod(), 'method');
+  Expect.equals('method', external.method());
+  Expect.equals('methodundefined', external.addMethod('method'));
+  Expect.equals('methodmethod', external.addMethod('method', 'method'));
+  Expect.equals('method', external.renamedMethod());
 
   // Check that type parameters operate as expected on external interfaces.
   final value = 'value';
   final jsValue = value.toJS;
   external.fieldT = jsValue;
-  expect(external.fieldT.toDart, value);
-  expect(external.addMethodT(jsValue, jsValue).toDart, '$value$value');
-  expect(
-      external.addMethodGeneric<JSNumber, JSNumber>(0.toJS, 0.toJS).toDartInt,
-      0);
+  Expect.equals(value, external.fieldT.toDart);
+  Expect.equals('$value$value', external.addMethodT(jsValue, jsValue).toDart);
+  Expect.equals(
+    0,
+    external.addMethodGeneric<JSNumber, JSNumber>(0.toJS, 0.toJS).toDartInt,
+  );
 
   external.nested = Nested(jsValue);
-  expect((external.nested as Nested<JSString>).value.toDart, value);
-  expect(
-      (external.combineNested(Nested(value.toJS), Nested(jsValue))
-              as Nested<JSString>)
-          .value
-          .toDart,
-      '$value$value');
+  Expect.equals(value, (external.nested as Nested<JSString>).value.toDart);
+  Expect.equals(
+    '$value$value',
+    (external.combineNested(Nested(value.toJS), Nested(jsValue))
+            as Nested<JSString>)
+        .value
+        .toDart,
+  );
 
   external.nestedU = Nested(jsValue);
-  expect((external.nestedU as Nested<JSString>).value.toDart, value);
-  expect(
-      (external.combineNestedU(Nested(jsValue), Nested(jsValue))
-              as Nested<JSString>)
-          .value
-          .toDart,
-      '$value$value');
-  expect(
-      external
-          .combineNestedGeneric(Nested(jsValue), Nested(jsValue))
-          .value
-          .toDart,
-      '$value$value');
+  Expect.equals(value, (external.nestedU as Nested<JSString>).value.toDart);
+  Expect.equals(
+    '$value$value',
+    (external.combineNestedU(Nested(jsValue), Nested(jsValue))
+            as Nested<JSString>)
+        .value
+        .toDart,
+  );
+  Expect.equals(
+    '$value$value',
+    external
+        .combineNestedGeneric(Nested(jsValue), Nested(jsValue))
+        .value
+        .toDart,
+  );
 
   // Try invalid generics.
   (external as External<JSNumber, Nested>).fieldT = 0.toJS;
@@ -151,15 +154,25 @@ void main() {
   Expect.throws(() => external.fieldT.toDart.toLowerCase());
   (external as External<JSNumber?, Nested>).fieldT = null;
   Expect.throwsWhen(
-      soundNullSafety && checkedImplicitDowncasts, () => external.fieldT);
-  Expect.throws(() => external
-      .addMethodGeneric<JSNumber, JSString>(value.toJS, value.toJS)
-      .toDartInt);
-  Expect.throws(() => external
-      .addMethodGeneric<JSString, JSNumber>(0.toJS, 0.toJS)
-      .toDart
-      .toLowerCase());
-  Expect.throwsWhen(soundNullSafety && checkedImplicitDowncasts,
-      () => external.addMethodGeneric<JSString, JSString?>(null, null, true));
+    soundNullSafety && checkedImplicitDowncasts,
+    () => external.fieldT,
+  );
+  Expect.throws(
+    () =>
+        external
+            .addMethodGeneric<JSNumber, JSString>(value.toJS, value.toJS)
+            .toDartInt,
+  );
+  Expect.throws(
+    () =>
+        external
+            .addMethodGeneric<JSString, JSNumber>(0.toJS, 0.toJS)
+            .toDart
+            .toLowerCase(),
+  );
+  Expect.throwsWhen(
+    soundNullSafety && checkedImplicitDowncasts,
+    () => external.addMethodGeneric<JSString, JSString?>(null, null, true),
+  );
   external.addMethodGeneric<JSString?, JSString?>(''.toJS, null, true);
 }