diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml index cfe73df7a..4fef0f1a3 100644 --- a/pkgs/ffigen/pubspec.yaml +++ b/pkgs/ffigen/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: dev_dependencies: async: ^2.11.0 - coverage: ^1.8.0 + coverage: ^1.10.0 dart_flutter_team_lints: ^2.0.0 json_schema: ^5.1.1 leak_tracker: ^10.0.7 diff --git a/pkgs/ffigen/test/native_objc_test/isolate_test.dart b/pkgs/ffigen/test/native_objc_test/isolate_test.dart index f7bc1ad0f..f9f0fb8e5 100644 --- a/pkgs/ffigen/test/native_objc_test/isolate_test.dart +++ b/pkgs/ffigen/test/native_objc_test/isolate_test.dart @@ -17,26 +17,6 @@ import '../test_utils.dart'; import 'isolate_bindings.dart'; import 'util.dart'; -// TODO(https://github.com/dart-lang/coverage/issues/472): Delete this and use -// Isolate.run once the coverage bug is fixed. -Future isolateRun(FutureOr computation()) async { - FutureOr Function()? comp = computation; - Future run(SendPort sendPort) async { - sendPort.send(await comp!()); - comp = null; - sendPort.send(null); - Isolate.current.kill(); - } - - final port = ReceivePort(); - final queue = StreamQueue(port); - final isolate = await Isolate.spawn(run, port.sendPort); - final result = await queue.next as R; - await queue.next; // Wait for isolate to release its reference to comp. - port.close(); - return result; -} - void main() { group('isolate', () { setUpAll(() { @@ -60,10 +40,6 @@ void main() { sendable.value = 456; sendPort.send(oldValue); port.close(); - - // TODO(https://github.com/dart-lang/coverage/issues/472): Delete this. - sendPort.send(null); - Isolate.current.kill(); } test('Sending object through a port', () async { @@ -90,15 +66,14 @@ void main() { sendable = null; doGC(); - // TODO(https://github.com/dart-lang/coverage/issues/472): Re-enable. - // expect(objectRetainCount(pointer), 0); + expect(objectRetainCount(pointer), 0); }, skip: !canDoGC); test('Capturing object in closure', () async { Sendable? sendable = Sendable.new1(); sendable.value = 123; - final oldValue = await isolateRun(() { + final oldValue = await Isolate.run(() { final oldValue = sendable!.value; sendable!.value = 456; return oldValue; @@ -124,10 +99,6 @@ void main() { final block = await queue.next as ObjCBlock; block(123); port.close(); - - // TODO(https://github.com/dart-lang/coverage/issues/472): Delete this. - sendPort.send(null); - Isolate.current.kill(); } test('Sending block through a port', () async { @@ -156,8 +127,7 @@ void main() { block = null; doGC(); - // TODO(https://github.com/dart-lang/coverage/issues/472): Re-enable. - // expect(blockRetainCount(pointer), 0); + expect(blockRetainCount(pointer), 0); }, skip: !canDoGC); ObjCBlock makeBlock(Completer completer) { @@ -172,7 +142,7 @@ void main() { final completer = Completer(); ObjCBlock? block = makeBlock(completer); - await isolateRun(() { + await Isolate.run(() { block!(123); }); final value = await completer.future; @@ -193,7 +163,7 @@ void main() { expect(objectRetainCount(pointer), 1); expect(sendable.ref.isReleased, isFalse); - final (oldIsReleased, newIsReleased) = await isolateRun(() { + final (oldIsReleased, newIsReleased) = await Isolate.run(() { final oldIsReleased = sendable.ref.isReleased; sendable!.ref.release(); return (oldIsReleased, sendable.ref.isReleased); @@ -213,7 +183,7 @@ void main() { expect(sendable.ref.isReleased, isFalse); - await isolateRun(() { + await Isolate.run(() { sendable!.ref.release(); }); diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml index 7ad8c7369..6a88da38d 100644 --- a/pkgs/objective_c/pubspec.yaml +++ b/pkgs/objective_c/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: dev_dependencies: args: ^2.0.0 - coverage: ^1.8.0 + coverage: ^1.10.0 dart_flutter_team_lints: ^2.0.0 ffigen: ^14.0.0 flutter_lints: ^3.0.0