#2398. Update async tests to avoid false-positive results on web. Lan…

…guage and LanguageFeatures tests (#2407) Update async tests to avoid false-positive results on web, Language and LanguageFeatures tests
dart-lang · Dec 1, 2023 · a07bdfb · a07bdfb
1 parent 8d82009
commit a07bdfb
Show file tree

Hide file tree

Showing 39 changed files with 54 additions and 82 deletions.
diff --git a/Language/Expressions/Await_Expressions/syntax_t03.dart b/Language/Expressions/Await_Expressions/syntax_t03.dart
@@ -9,13 +9,7 @@
 /// @description Check that it is a compile error if unaryExpression is missing
 /// @author a.semenov@unipro.ru
 
-
 import 'dart:async';
-import '../../../Utils/expect.dart';
-
-f() {
-  return new Future<int>.value(1);
-}
 
 Future test() async {
   await;
@@ -25,6 +19,5 @@ Future test() async {
 }
 
 main() {
-  asyncStart();
-  test().then( (value) => asyncEnd() );
+  test();
 }
diff --git a/Language/Expressions/Await_Expressions/syntax_t04.dart b/Language/Expressions/Await_Expressions/syntax_t04.dart
@@ -9,13 +9,7 @@
 /// @description Check that it is a compile error if unaryExpression is missing
 /// @author a.semenov@unipro.ru
 
-
 import 'dart:async';
-import '../../../Utils/expect.dart';
-
-f() {
-  return new Future<int>.value(1);
-}
 
 Stream test() async* {
   await (await);
@@ -25,6 +19,5 @@ Stream test() async* {
 }
 
 main() {
-  asyncStart();
-  test().isEmpty.then( (value) => asyncEnd() );
+  test();
 }
diff --git a/Language/Expressions/Await_Expressions/syntax_t05.dart b/Language/Expressions/Await_Expressions/syntax_t05.dart
@@ -11,9 +11,7 @@
 /// enclosing await expression is not marked with async, async* or sync*
 /// @author a.semenov@unipro.ru
 
-
 import 'dart:async';
-import '../../../Utils/expect.dart';
 
 f() {
   return new Future<int>.value(1);

diff --git a/Language/Expressions/Await_Expressions/syntax_t06.dart b/Language/Expressions/Await_Expressions/syntax_t06.dart
@@ -11,9 +11,7 @@
 /// enclosing await expression is marked with sync*
 /// @author a.semenov@unipro.ru
 
-
 import 'dart:async';
-import '../../../Utils/expect.dart';
 
 f() {
   return new Future<int>.value(1);
@@ -27,5 +25,5 @@ Iterable test() sync* {
 }
 
 main() {
-  Expect.isTrue(test().isEmpty);
+  test();
 }
diff --git a/Language/Functions/element_type_A01_t03.dart b/Language/Functions/element_type_A01_t03.dart
@@ -15,6 +15,7 @@
 /// @description Check a run-time type of a return value of a synchronous
 /// generator function
 /// @author sgrekhov22@gmail.com
+/// @issue 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";

diff --git a/Language/Functions/element_type_A01_t04.dart b/Language/Functions/element_type_A01_t04.dart
@@ -16,6 +16,7 @@
 /// return type derives the union-free type `S`, and assume that `S` implements
 /// `Iterable<U>`. Then check that the element type of `f` is `U`.
 /// @author sgrekhov22@gmail.com
+/// @issue 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";

diff --git a/Language/Functions/element_type_A01_t06.dart b/Language/Functions/element_type_A01_t06.dart
@@ -16,6 +16,7 @@
 /// return type derives the union-free type `S`, and assume that `S` implements
 /// `Iterable<U>`. Then check that the element type of `f` is `U`.
 /// @author sgrekhov22@gmail.com
+/// @issue 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";

diff --git a/Language/Functions/element_type_A02_t03.dart b/Language/Functions/element_type_A02_t03.dart
@@ -16,6 +16,7 @@
 /// @description Check a run-time type of a returned value of an asynchronous
 /// generator function
 /// @author sgrekhov22@gmail.com
+/// @issue 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";
@@ -27,6 +28,7 @@ void isRuntimeTypeImplementsStream<T>(Object? o) async {
   List<T> list = await o.toList();
   try {
     list.addAll(<T>[]);
+    asyncEnd();
   } on TypeError catch (_) {
     throw ExpectException("Expected Stream<$T> but found $o");
   }
@@ -39,7 +41,9 @@ FutureOr<Stream<int>?> foo() async* {
 }
 
 main() async {
+  asyncStart(2);
   dynamic d = await foo();
   FutureOr<Stream<int>> o = d;
   isRuntimeTypeImplementsStream<int>(d);
+  asyncEnd();
 }
diff --git a/Language/Functions/element_type_A02_t04.dart b/Language/Functions/element_type_A02_t04.dart
@@ -17,6 +17,7 @@
 /// return type derives the union-free type `S`, and assume that `S` implements
 /// `Stream<U>`. Then check that the element type of `f` is `U`.
 /// @author sgrekhov22@gmail.com
+/// @issue 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";
@@ -29,6 +30,7 @@ void isRuntimeTypeImplementsStream<T>(Object? o) async {
   List<T> list = await o.toList();
   try {
     list.addAll(<T>[]);
+    asyncEnd();
   } on TypeError catch (_) {
     throw ExpectException("Expected Stream<$T> but found $o");
   }
@@ -41,7 +43,9 @@ FutureOr<Stream<int>?> foo() async* {
 }
 
 main() async {
+  asyncStart(2);
   var o = await foo();
   o.expectStaticType<Exactly<Stream<int>?>>();
   isRuntimeTypeImplementsStream<int>(o);
+  asyncEnd();
 }
diff --git a/Language/Functions/element_type_A02_t06.dart b/Language/Functions/element_type_A02_t06.dart
@@ -17,7 +17,7 @@
 /// return type derives the union-free type `S`, and assume that `S` implements
 /// `Stream<U>`. Then check that the element type of `f` is `U`.
 /// @author sgrekhov22@gmail.com
-/// @issue 53051
+/// @issue 53051, 54159
 
 import "dart:async";
 import "../../Utils/expect.dart";

diff --git a/Language/Statements/For/Asynchronous_For_in/execution_A05_t01.dart b/Language/Statements/For/Asynchronous_For_in/execution_A05_t01.dart
@@ -55,7 +55,7 @@ import 'dart:async';
 import '../../../../Utils/expect.dart';
 
 main() async {
-  asyncStart();
+  asyncStart(2);
   List<int> log = [];
   StreamController sc = StreamController(onCancel: () {
     Expect.listEquals([1, 2, 3], log);
@@ -68,4 +68,5 @@ main() async {
       break;
     }
   }
+  asyncEnd();
 }
diff --git a/Language/Statements/For/Asynchronous_For_in/execution_A05_t02.dart b/Language/Statements/For/Asynchronous_For_in/execution_A05_t02.dart
@@ -56,7 +56,7 @@ import 'dart:async';
 import '../../../../Utils/expect.dart';
 
 main() async {
-  asyncStart();
+  asyncStart(2);
   List<int> log = [];
   StreamController sc = StreamController(onCancel: () {
     Expect.listEquals([1, 2, 3], log);
@@ -72,4 +72,5 @@ main() async {
       }
     }
   }
+  asyncEnd();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A02_t01.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A02_t01.dart
@@ -59,9 +59,10 @@ Future test() async {
   await null;
   ss.resume();
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t01.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t01.dart
@@ -56,9 +56,10 @@ Future test() async {
   log.add('c');
   ss.resume();
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t02.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t02.dart
@@ -52,9 +52,10 @@ Future test() async {
   await null;
   log.add('c');
   ss.resume();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t10.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t10.dart
@@ -71,9 +71,10 @@ Future test() async {
   ss.resume();
   await c.future;
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t13.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t13.dart
@@ -72,9 +72,10 @@ Future test() async {
   ss.resume();
   await c.future;
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t14.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t14.dart
@@ -68,9 +68,10 @@ Future test() async {
   await c.future;
   log.add('two');
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t15.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A03_t15.dart
@@ -73,9 +73,10 @@ Future test() async {
   await c.future;
   Expect.listEquals([-1, 1, 'one', 'two',  2], log);
   await sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A04_t01.dart b/Language/Statements/Yield_and_Yield_Each/Yield_Each/execution_async_A04_t01.dart
@@ -48,9 +48,10 @@ Future test() async {
   sc.add('b');
   sc.add('c');
   sc.close();
+  asyncEnd();
 }
 
 main() {
-  asyncStart();
+  asyncStart(2);
   test();
 }
diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t57.dart b/LanguageFeatures/nnbd/future_flattening_A01_t57.dart
@@ -26,18 +26,15 @@ import "dart:async";
 import "../../Utils/expect.dart";
 
 main() {
-  asyncStart();
+  asyncStart(4);
   Future<int?>(() => 1).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<int?>>(() => Future<int?>(() => 1)).then((value) {
     value.then((value1) => asyncEnd());
   });
 
-  asyncStart();
   Future<Object?>(() => 1).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<Object?>>(() => Future<Object?>(() => 1)).then((value) {
     value.then((value1) => asyncEnd());
   });

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t58.dart b/LanguageFeatures/nnbd/future_flattening_A01_t58.dart
@@ -26,18 +26,15 @@ import "dart:async";
 import "../../Utils/expect.dart";
 
 main() {
-  asyncStart();
+  asyncStart(4);
   Future<int?>(() => null).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<int?>>(() => Future<int?>(() => null)).then((value) {
     value.then((value1) => asyncEnd());
   });
 
-  asyncStart();
   Future<Object?>(() => null).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<Object?>>(() => Future<Object?>(() => null)).then((value) {
     value.then((value1) => asyncEnd());
   });

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t59.dart b/LanguageFeatures/nnbd/future_flattening_A01_t59.dart
@@ -26,18 +26,15 @@ import "dart:async";
 import "../../Utils/expect.dart";
 
 main() {
-  asyncStart();
+  asyncStart(4);
   Future<int>(() => 1).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<int>>(() => Future<int>(() => 1)).then((value) {
     value.then((value1) => asyncEnd());
   });
 
-  asyncStart();
   Future<Object>(() => 1).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<Object>>(() => Future<Object>(() => 1)).then((value) {
     value.then((value1) => asyncEnd());
   });

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t64.dart b/LanguageFeatures/nnbd/future_flattening_A01_t64.dart
@@ -28,12 +28,11 @@ import "../../Utils/expect.dart";
 dynamic getNull() => null;
 
 main() {
-  asyncStart();
+  asyncStart(2);
   Future f = Future<int>(() => getNull());
   f.then((value) { Expect.fail("Should not reach here"); },
       onError:(e) => asyncEnd());
 
-  asyncStart();
   f = Future<Future<int>>(() => getNull());
   f.then((value) { Expect.fail("Should not reach here"); },
       onError:(e) => asyncEnd());

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t65.dart b/LanguageFeatures/nnbd/future_flattening_A01_t65.dart
@@ -28,12 +28,11 @@ import "../../Utils/expect.dart";
 dynamic getNull() => null;
 
 main() {
-  asyncStart();
+  asyncStart(2);
   Future f = Future<Object>(() => getNull());
   f.then((value) { Expect.fail("Should not reach here!"); },
       onError:(e) => asyncEnd());
 
-  asyncStart();
   f = Future<Future<Object>>(() => getNull());
   f.then((value) { Expect.fail("Should not reach here!"); },
       onError:(e) => asyncEnd());

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t66.dart b/LanguageFeatures/nnbd/future_flattening_A01_t66.dart
@@ -28,11 +28,10 @@ import "../../Utils/expect.dart";
 dynamic getNull() => null;
 
 main() {
-  asyncStart();
+  asyncStart(2);
   Future f = Future<Object>(() => Future<Object?>(() => getNull()));
   f.then((value) => asyncEnd());
 
-  asyncStart();
   Future f1 = Future<Object?>(() => Future<Object>(() => getNull()));
   f1.then((value) { Expect.fail("Should not reach here!"); },
       onError:(e) => asyncEnd());

diff --git a/LanguageFeatures/nnbd/future_flattening_A01_t75.dart b/LanguageFeatures/nnbd/future_flattening_A01_t75.dart
@@ -26,10 +26,9 @@ import "dart:async";
 import "../../Utils/expect.dart";
 
 main() {
-  asyncStart();
+  asyncStart(2);
   Future<dynamic>(() => 1).then((value) => asyncEnd());
 
-  asyncStart();
   Future<Future<dynamic>>(() => Future<dynamic>(() => 1)).then((value) {
     value.then((value1) => asyncEnd());
   });