Skip to content

Commit 70a0471

Browse files
jmagmanfilmil
jmagman
authored and
filmil
committed
Unskip iOS launch URL tests (flutter#27854)
1 parent bbb9045 commit 70a0471

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

‎shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ @interface FlutterAppDelegateTest : XCTestCase
1818

1919
@implementation FlutterAppDelegateTest
2020

21-
// TODO(dnfield): https://github.com/flutter/flutter/issues/74267
22-
- (void)skip_testLaunchUrl {
21+
- (void)testLaunchUrl {
2322
FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
2423
FlutterViewController* viewController = OCMClassMock([FlutterViewController class]);
2524
FlutterEngine* engine = OCMClassMock([FlutterEngine class]);
2625
FlutterMethodChannel* navigationChannel = OCMClassMock([FlutterMethodChannel class]);
2726
OCMStub([engine navigationChannel]).andReturn(navigationChannel);
2827
OCMStub([viewController engine]).andReturn(engine);
29-
OCMStub([engine waitForFirstFrame:3.0 callback:([OCMArg invokeBlockWithArgs:@(NO), nil])]);
28+
// Set blockNoInvoker to a strong local to retain to end of scope.
29+
id blockNoInvoker = [OCMArg invokeBlockWithArgs:@NO, nil];
30+
OCMStub([engine waitForFirstFrame:3.0 callback:blockNoInvoker]);
3031
appDelegate.rootFlutterViewControllerGetter = ^{
3132
return viewController;
3233
};
@@ -42,14 +43,16 @@ - (void)skip_testLaunchUrl {
4243
OCMVerify([navigationChannel invokeMethod:@"pushRoute" arguments:@"/custom/route?query=test"]);
4344
}
4445

45-
- (void)skip_testLaunchUrlWithQueryParameterAndFragment {
46+
- (void)testLaunchUrlWithQueryParameterAndFragment {
4647
FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
4748
FlutterViewController* viewController = OCMClassMock([FlutterViewController class]);
4849
FlutterEngine* engine = OCMClassMock([FlutterEngine class]);
4950
FlutterMethodChannel* navigationChannel = OCMClassMock([FlutterMethodChannel class]);
5051
OCMStub([engine navigationChannel]).andReturn(navigationChannel);
5152
OCMStub([viewController engine]).andReturn(engine);
52-
OCMStub([engine waitForFirstFrame:3.0 callback:([OCMArg invokeBlockWithArgs:@(NO), nil])]);
53+
// Set blockNoInvoker to a strong local to retain to end of scope.
54+
id blockNoInvoker = [OCMArg invokeBlockWithArgs:@NO, nil];
55+
OCMStub([engine waitForFirstFrame:3.0 callback:blockNoInvoker]);
5356
appDelegate.rootFlutterViewControllerGetter = ^{
5457
return viewController;
5558
};
@@ -66,14 +69,16 @@ - (void)skip_testLaunchUrlWithQueryParameterAndFragment {
6669
arguments:@"/custom/route?query=test#fragment"]);
6770
}
6871

69-
- (void)skip_testLaunchUrlWithFragmentNoQueryParameter {
72+
- (void)testLaunchUrlWithFragmentNoQueryParameter {
7073
FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
7174
FlutterViewController* viewController = OCMClassMock([FlutterViewController class]);
7275
FlutterEngine* engine = OCMClassMock([FlutterEngine class]);
7376
FlutterMethodChannel* navigationChannel = OCMClassMock([FlutterMethodChannel class]);
7477
OCMStub([engine navigationChannel]).andReturn(navigationChannel);
7578
OCMStub([viewController engine]).andReturn(engine);
76-
OCMStub([engine waitForFirstFrame:3.0 callback:([OCMArg invokeBlockWithArgs:@(NO), nil])]);
79+
// Set blockNoInvoker to a strong local to retain to end of scope.
80+
id blockNoInvoker = [OCMArg invokeBlockWithArgs:@NO, nil];
81+
OCMStub([engine waitForFirstFrame:3.0 callback:blockNoInvoker]);
7782
appDelegate.rootFlutterViewControllerGetter = ^{
7883
return viewController;
7984
};

‎testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
0AC232F424BA71D300A85907 /* SemanticsObjectTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SemanticsObjectTest.mm; sourceTree = "<group>"; };
4545
0AC232F724BA71D300A85907 /* FlutterEngineTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterEngineTest.mm; sourceTree = "<group>"; };
4646
0AC2330324BA71D300A85907 /* accessibility_bridge_test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = accessibility_bridge_test.mm; sourceTree = "<group>"; };
47-
0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterTextInputPluginTest.m; sourceTree = "<group>"; };
47+
0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterTextInputPluginTest.mm; sourceTree = "<group>"; };
4848
0AC2330F24BA71D300A85907 /* FlutterBinaryMessengerRelayTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterBinaryMessengerRelayTest.mm; sourceTree = "<group>"; };
4949
0AC2331024BA71D300A85907 /* connection_collection_test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = connection_collection_test.mm; sourceTree = "<group>"; };
5050
0AC2331224BA71D300A85907 /* FlutterEnginePlatformViewTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterEnginePlatformViewTest.mm; sourceTree = "<group>"; };
51-
0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterPluginAppLifeCycleDelegateTest.m; sourceTree = "<group>"; };
51+
0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterPluginAppLifeCycleDelegateTest.mm; sourceTree = "<group>"; };
5252
0AC2332124BA71D300A85907 /* FlutterViewControllerTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterViewControllerTest.mm; sourceTree = "<group>"; };
5353
0D1CE5D7233430F400E5D880 /* FlutterChannelsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterChannelsTest.m; sourceTree = "<group>"; };
5454
0D6AB6B122BB05E100EEE540 /* IosUnitTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IosUnitTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -90,11 +90,11 @@
9090
0AC232F424BA71D300A85907 /* SemanticsObjectTest.mm */,
9191
0AC232F724BA71D300A85907 /* FlutterEngineTest.mm */,
9292
0AC2330324BA71D300A85907 /* accessibility_bridge_test.mm */,
93-
0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.m */,
93+
0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.mm */,
9494
0AC2330F24BA71D300A85907 /* FlutterBinaryMessengerRelayTest.mm */,
9595
0AC2331024BA71D300A85907 /* connection_collection_test.mm */,
9696
0AC2331224BA71D300A85907 /* FlutterEnginePlatformViewTest.mm */,
97-
0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.m */,
97+
0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.mm */,
9898
0AC2332124BA71D300A85907 /* FlutterViewControllerTest.mm */,
9999
);
100100
name = Source;
@@ -209,8 +209,8 @@
209209
0D6AB6A922BB05E100EEE540 /* Project object */ = {
210210
isa = PBXProject;
211211
attributes = {
212-
LastUpgradeCheck = 1020;
213-
ORGANIZATIONNAME = "Aaron Clarke";
212+
LastUpgradeCheck = 1300;
213+
ORGANIZATIONNAME = "The Flutter Authors";
214214
TargetAttributes = {
215215
0D6AB6B022BB05E100EEE540 = {
216216
CreatedOnToolsVersion = 10.2.1;

‎testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)