@@ -488,51 +488,6 @@ TEST_F(DartIsolateTest, InvalidLoadingUnitFails) {
488488 ASSERT_TRUE (root_isolate->Shutdown ());
489489}
490490
491- // TODO(garyq): Re-enable this test, and resolve dart-side hanging future and
492- // threading. See https://github.com/flutter/flutter/issues/72312
493- TEST_F (DartIsolateTest, DISABLED_ValidLoadingUnitSucceeds) {
494- if (!DartVM::IsRunningPrecompiledCode ()) {
495- FML_LOG (INFO) << " Split AOT does not work in JIT mode" ;
496- return ;
497- }
498-
499- ASSERT_FALSE (DartVMRef::IsInstanceRunning ());
500- AddNativeCallback (
501- " NotifyNative" ,
502- CREATE_NATIVE_ENTRY (([this ](Dart_NativeArguments args) { Signal (); })));
503- AddNativeCallback (
504- " NotifySuccess" , CREATE_NATIVE_ENTRY ([this ](Dart_NativeArguments args) {
505- auto bool_handle = Dart_GetNativeArgument (args, 0 );
506- ASSERT_FALSE (tonic::CheckAndHandleError (bool_handle));
507- ASSERT_TRUE (tonic::DartConverter<bool >::FromDart (bool_handle));
508- Signal ();
509- }));
510- const auto settings = CreateSettingsForFixture ();
511- auto vm_ref = DartVMRef::Create (settings);
512- auto thread = CreateNewThread ();
513- TaskRunners task_runners (GetCurrentTestName (), //
514- thread, //
515- thread, //
516- thread, //
517- thread //
518- );
519- auto isolate = RunDartCodeInIsolate (vm_ref, settings, task_runners,
520- " canCallDeferredLibrary" , {},
521- GetDefaultKernelFilePath ());
522- ASSERT_TRUE (isolate);
523- ASSERT_EQ (isolate->get ()->GetPhase (), DartIsolate::Phase::Running);
524- Wait ();
525-
526- auto isolate_data = std::make_unique<const fml::NonOwnedMapping>(
527- split_aot_symbols_.vm_isolate_data , 0 );
528- auto isolate_instructions = std::make_unique<const fml::NonOwnedMapping>(
529- split_aot_symbols_.vm_isolate_instrs , 0 );
530-
531- ASSERT_TRUE (isolate->get ()->LoadLoadingUnit (2 , std::move (isolate_data),
532- std::move (isolate_instructions)));
533- Wait ();
534- }
535-
536491TEST_F (DartIsolateTest, DartPluginRegistrantIsCalled) {
537492 ASSERT_FALSE (DartVMRef::IsInstanceRunning ());
538493
0 commit comments