Re-Migrate Block 192 and 193 to original unittest usage and re-run migration tool to move over *.html files too.

R=bkonyi@google.com Change-Id: I7cb8019c7b6881b09b52333a0457744f877f7aa0 Reviewed-on: https://dart-review.googlesource.com/7780 Reviewed-by: Terry Lucas <terry@google.com> Commit-Queue: Terry Lucas <terry@google.com>
2024-09-18 20:11:19 +00:00 · 2017-09-26 18:44:04 +00:00 · 2017-09-26 18:44:04 +00:00 · e61c567d7b
parent a02ca2070f
commit e61c567d7b
27 changed files with 102 additions and 28 deletions
--- a/tests/lib_2/html/canvasrenderingcontext2d_test.dart
+++ b/tests/lib_2/html/canvasrenderingcontext2d_test.dart
@ -7,7 +7,8 @@ library canvas_rendering_context_2d_test;
 import 'dart:html';
 import 'dart:math';

-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';

 // Some rounding errors in the browsers.
 checkPixel(List<int> pixel, List<int> expected) {
@ -80,6 +81,8 @@ void expectPixelUnfilled(int x, int y) {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  group('pixel_manipulation', () {
    setUp(setupFunc);
    tearDown(tearDownFunc);
--- a/tests/lib_2/html/custom/document_register_template_test.html
+++ b/tests/lib_2/html/custom/document_register_template_test.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="dart.unittest" content="full-stack-traces">
+  <title> document_register_basic_test </title>
+  <style>
+     .unittest-table { font-family:monospace; border:1px; }
+     .unittest-pass { background: #6b3;}
+     .unittest-fail { background: #d55;}
+     .unittest-error { background: #a11;}
+  </style>
+  <script src="/packages/web_components/webcomponents-lite.js"></script>
+  <script src="/packages/web_components/dart_support.js"></script>
+</head>
+<body>
+  <h1> Running document_register_basic_test </h1>
+  <script type="text/javascript"
+      src="/root_dart/tools/testing/dart/test_controller.js"></script>
+  %TEST_SCRIPTS%
+</body>
+</html>
--- a/tests/lib_2/html/custom/document_register_type_extensions_test.dart
+++ b/tests/lib_2/html/custom/document_register_type_extensions_test.dart
@ -4,7 +4,8 @@

 import 'dart:html';

-import 'package:expect/minitest.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';

 import '../utils.dart';

@ -57,7 +58,7 @@ class MyCanvas extends CanvasElement {
    width = 100;
    height = 100;

-    var context = this.getContext('2d');
+    CanvasRenderingContext2D context = this.getContext('2d');
    context.fillStyle = 'red';
    context.fillRect(0, 0, width, height);
    context.fill();
@ -223,10 +224,10 @@ main() {
        var fooBarCreated = new Element.tag(Foo.tag, Bar.tag);
        expect(
            fooBarCreated.outerHtml,
-            anyOf(
+            anyOf([
                '<x-foo is="x-bar"></x-foo>',
                '<?XML:NAMESPACE PREFIX = PUBLIC NS = "URN:COMPONENT" />'
-                '<x-foo is="x-bar"></x-foo>'));
+                '<x-foo is="x-bar"></x-foo>']));
        expect(fooBarCreated is Foo, isTrue);
      });

--- a/tests/lib_strong/html/custom/document_register_type_extensions_test.html
+++ b/tests/lib_strong/html/custom/document_register_type_extensions_test.html
--- a/tests/lib_2/html/custom/element_upgrade_failure_test.dart
+++ b/tests/lib_2/html/custom/element_upgrade_failure_test.dart
@ -6,7 +6,8 @@ import 'dart:async';
 import 'dart:html';
 import 'dart:js' as js;

-import 'package:expect/minitest.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';

 import '../utils.dart';

@ -42,13 +43,13 @@ main() {

  test('cannot create upgrader for interfaces', () {
    expect(() {
-      document.createElementUpgrader(HtmlElementInterface);
+      document.createElementUpgrader(HtmlElementInterface); /*@compile-error=unspecified*/
    }, throws);
  });

  test('cannot upgrade interfaces', () {
    expect(() {
-      upgrader.upgrade(new HtmlElementInterface()); /*@compile-error=unspecified*/
+      upgrader.upgrade(new HtmlElementInterface());
    }, throws);
  });
 }
--- a/tests/lib_2/html/custom/element_upgrade_test.dart
+++ b/tests/lib_2/html/custom/element_upgrade_test.dart
@ -6,7 +6,8 @@ import 'dart:async';
 import 'dart:html';
 import 'dart:js' as js;

-import 'package:expect/minitest.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';

 import '../utils.dart';

--- a/tests/lib_strong/html/custom/element_upgrade_test.html
+++ b/tests/lib_strong/html/custom/element_upgrade_test.html
--- a/tests/lib_2/html/custom/entered_left_view_test.dart
+++ b/tests/lib_2/html/custom/entered_left_view_test.dart
@ -7,7 +7,8 @@ library entered_left_view_test;
 import 'dart:async';
 import 'dart:html';
 import 'dart:js' as js;
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import '../utils.dart';

 var invocations = [];
@ -62,6 +63,8 @@ class FooOldCallbacks extends HtmlElement {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  // Adapted from Blink's
  // fast/dom/custom/attached-detached-document.html test.

--- a/tests/lib_strong/html/custom/entered_left_view_test.html
+++ b/tests/lib_strong/html/custom/entered_left_view_test.html
--- a/tests/lib_2/html/custom/js_custom_test.dart
+++ b/tests/lib_2/html/custom/js_custom_test.dart
@ -4,7 +4,8 @@

 library js_custom_test;

-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'dart:html';
 import '../utils.dart';
 import 'dart:mirrors';
@ -20,6 +21,8 @@ class A extends HtmlElement {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  // Adapted from Blink's
  // fast/dom/custom/constructor-calls-created-synchronously test.

--- a/tests/lib_strong/html/custom/js_custom_test.html
+++ b/tests/lib_strong/html/custom/js_custom_test.html
--- a/tests/lib_2/html/custom/mirrors_2_test.html
+++ b/tests/lib_2/html/custom/mirrors_2_test.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="dart.unittest" content="full-stack-traces">
+  <title> mirrors_2_test </title>
+  <style>
+     .unittest-table { font-family:monospace; border:1px; }
+     .unittest-pass { background: #6b3;}
+     .unittest-fail { background: #d55;}
+     .unittest-error { background: #a11;}
+  </style>
+  <script src="/packages/web_components/webcomponents.js"></script>
+  <script src="/packages/web_components/dart_support.js"></script>
+</head>
+<body>
+  <h1> Running mirrors_2_test </h1>
+  <script type="text/javascript"
+      src="/root_dart/tools/testing/dart/test_controller.js"></script>
+  %TEST_SCRIPTS%
+</body>
+</html>
--- a/tests/lib_2/html/custom/mirrors_test.dart
+++ b/tests/lib_2/html/custom/mirrors_test.dart
@ -7,7 +7,8 @@ library tests.html.mirrors_test;
@MirrorsUsed(targets: const [A, B])
 import 'dart:mirrors';
 import 'dart:html';
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import '../utils.dart';

 /// Regression test for a tricky mirrors+custom_elements issue:
@ -15,6 +16,8 @@ import '../utils.dart';
 /// This was failing for custom elements on IE 10, because the constructor was
 /// HTMLUnknownElement for all of them. So mirrors called the wrong method.
 main() {
+  useHtmlIndividualConfiguration();
+
  var registered = false;
  setUp(() => customElementsReady.then((_) {
        if (!registered) {
--- a/tests/lib_strong/html/custom/mirrors_test.html
+++ b/tests/lib_strong/html/custom/mirrors_test.html
--- a/tests/lib_2/html/custom/regress_194523002_test.dart
+++ b/tests/lib_2/html/custom/regress_194523002_test.dart
@ -6,7 +6,8 @@

 library js_custom_test;

-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'dart:html';
 import '../utils.dart';

@ -17,6 +18,8 @@ class A extends HtmlElement {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  // Adapted from Blink's
  // fast/dom/custom/constructor-calls-created-synchronously test.

--- a/tests/lib_2/html/custom_element_method_clash_test.dart
+++ b/tests/lib_2/html/custom_element_method_clash_test.dart
@ -6,7 +6,8 @@ library custom_elements_method_clash;

 import 'dart:async';
 import 'dart:html';
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'utils.dart';

 class CustomElement extends HtmlElement {
@ -21,6 +22,8 @@ class CustomElement extends HtmlElement {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  setUp(() => customElementsReady);

  group('test', () {
--- a/tests/lib_strong/html/custom_element_method_clash_test.html
+++ b/tests/lib_strong/html/custom_element_method_clash_test.html
--- a/tests/lib_2/html/custom_element_name_clash_test.dart
+++ b/tests/lib_2/html/custom_element_name_clash_test.dart
@ -6,7 +6,8 @@ library custom_elements_name_clash;

 import 'dart:async';
 import 'dart:html';
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'utils.dart';

 class CustomElement extends HtmlElement {
@ -19,6 +20,8 @@ class CustomElement extends HtmlElement {
 }

 main() {
+  useHtmlIndividualConfiguration();
+
  setUp(() => customElementsReady);

  group('test', () {
--- a/tests/lib_strong/html/custom_element_name_clash_test.html
+++ b/tests/lib_strong/html/custom_element_name_clash_test.html
--- a/tests/lib_2/html/custom_elements_23127_test.dart
+++ b/tests/lib_2/html/custom_elements_23127_test.dart
@ -10,7 +10,8 @@ library custom_elements_23127_test;

 import 'dart:async';
 import 'dart:html';
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'utils.dart';

 abstract class B1 extends HtmlElement {
@ -87,6 +88,8 @@ class C2T extends B2T {
 var callTwice;

 main() {
+  useHtmlIndividualConfiguration();
+
  setUp(() => customElementsReady);

  callTwice = (f) {
--- a/tests/lib_strong/html/custom_elements_23127_test.html
+++ b/tests/lib_strong/html/custom_elements_23127_test.html
--- a/tests/lib_2/html/custom_elements_test.dart
+++ b/tests/lib_2/html/custom_elements_test.dart
@ -6,7 +6,8 @@ library custom_elements_test;

 import 'dart:async';
 import 'dart:html';
-import 'package:test/test.dart';
+import 'package:unittest/html_individual_config.dart';
+import 'package:unittest/unittest.dart';
 import 'utils.dart';

 class CustomMixin {
@ -39,6 +40,8 @@ String get nextTag => 'x-type${nextTagId++}';
 class NotAnElement {}

 main() {
+  useHtmlIndividualConfiguration();
+
  setUp(() => customElementsReady);

  group('register', () {
--- a/tests/lib_2/lib_2_analyzer.status
+++ b/tests/lib_2/lib_2_analyzer.status
@ -3,7 +3,6 @@
 # BSD-style license that can be found in the LICENSE file.

 [ $compiler == dart2analyzer ]
-html/custom/element_upgrade_failure_test: CompileTimeError
 mirrors/deferred_type_test: StaticWarning, OK # Deliberately refers to a deferred type in a declaration.
 mirrors/deferred_mirrors_metadata_test: Fail # Issue 17522
 mirrors/generic_f_bounded_mixin_application_test: StaticWarning # Test Issue
--- a/tests/lib_2/lib_2_dart2js.status
+++ b/tests/lib_2/lib_2_dart2js.status
@ -36,6 +36,7 @@ async/future_or_strong_test: RuntimeError
 convert/base64_test/01: Fail, OK # Uses bit-wise operations to detect invalid values. Some large invalid values accepted by dart2js.
 convert/chunked_conversion_utf88_test: Slow, Pass
 convert/utf85_test: Slow, Pass
+html/custom/element_upgrade_failure_test: MissingCompileTimeError
 html/custom/document_register_type_extensions_test/construction: Pass, Timeout # Roll 50 failure
 html/custom/document_register_type_extensions_test/registration: Pass, Timeout # Roll 50 failure
 html/custom/entered_left_view_test/shadow_dom: Pass, Timeout # Roll 50 failure
--- a/tests/lib_2/lib_2_dartdevc.status
+++ b/tests/lib_2/lib_2_dartdevc.status
@ -3,14 +3,14 @@
 # BSD-style license that can be found in the LICENSE file.

 [ $compiler == dartdevc ]
-html/custom/document_register_type_extensions_test/construction: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/constructors: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/createElement with type extension: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/functional: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/namespaces: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/parsing: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/registration: CompileTimeError # Issue 29922
-html/custom/document_register_type_extensions_test/single-parameter createElement: CompileTimeError # Issue 29922
+html/custom/document_register_type_extensions_test/construction: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/constructors: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/createElement with type extension: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/functional: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/namespaces: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/parsing: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/registration: Crash # dartdevc compiler crash Issue 30885
+html/custom/document_register_type_extensions_test/single-parameter createElement: Crash # dartdevc compiler crash Issue 30885
 html/custom/element_upgrade_test: Crash # Crashes compiler Issue ?????
 html/custom/entered_left_view_test: Crash # Issue 29922
 html/custom/js_custom_test: Crash # Issue 29922
--- a/tests/lib_2/lib_2_flutter.status
+++ b/tests/lib_2/lib_2_flutter.status
@ -12,6 +12,7 @@ async/run_zoned9_test/01: Skip # Flutter Issue 9113
 async/schedule_microtask_test: Skip # Flutter Issue 9113
 async/stream_empty_test: Skip # Flutter Issue 9113
 async/stream_event_transformed_test: Skip # Flutter Issue 9113
+html/*: Skip # dart:html will be a problem in the VM
 isolate/issue_21398_parent_isolate2_test/01: Skip # Flutter Issue 9114
 isolate/isolate_import_test/01: Skip # Flutter Issue 9114
 math/random_secure_test: RuntimeError # Flutter Issue 9113
--- a/tests/lib_2/lib_2_vm.status
+++ b/tests/lib_2/lib_2_vm.status
@ -2,8 +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.

-html/*: Skip # dart:html will be a problem in the VM
-
 [ $runtime == vm && $system == fuchsia ]
 async/first_regression_test: RuntimeError
 async/future_timeout_test: RuntimeError
@ -51,6 +49,7 @@ async/future_or_only_in_async_test/00: MissingCompileTimeError
 [ $runtime == vm ]
 async/stream_timeout_test: RuntimeError
 convert/streamed_conversion_json_utf8_decode_test: Pass, Slow # Infrequent timeouts.
+html/*: Skip # dart:html will be a problem in the VM
 js/datetime_roundtrip_test: CompileTimeError
 js/null_test: CompileTimeError
 mirrors/deferred_type_test: CompileTimeError