clean up

Author: xster

shell/platform/darwin/ios/framework/Source/FlutterViewController.mm

@@ -607,7 +607,6 @@ - (void)viewWillAppear:(BOOL)animated {
   if (_viewportMetrics.physical_width) {
     [self surfaceUpdated:YES];
   }
-  NSLog(@"FlutterViewController instance %@ is viewWillAppear", self);
   [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.inactive"];
 
   [super viewWillAppear:animated];
@@ -617,15 +616,13 @@ - (void)viewDidAppear:(BOOL)animated {
   TRACE_EVENT0("flutter", "viewDidAppear");
   [self onUserSettingsChanged:nil];
   [self onAccessibilityStatusChanged:nil];
-  NSLog(@"FlutterViewController instance %@ is viewDidAppear", self);
   [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.resumed"];
 
   [super viewDidAppear:animated];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
   TRACE_EVENT0("flutter", "viewWillDisappear");
-  NSLog(@"FlutterViewController instance %@ is viewWillDisappear", self);
   [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.inactive"];
 
   [super viewWillDisappear:animated];
@@ -635,7 +632,6 @@ - (void)viewDidDisappear:(BOOL)animated {
   TRACE_EVENT0("flutter", "viewDidDisappear");
   if ([_engine.get() viewController] == self) {
     [self surfaceUpdated:NO];
-    NSLog(@"FlutterViewController instance %@ is viewDidDisappear", self);
     [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.paused"];
     [self flushOngoingTouches];
     [_engine.get() notifyLowMemory];
@@ -693,26 +689,22 @@ - (void)applicationBecameActive:(NSNotification*)notification {
   TRACE_EVENT0("flutter", "applicationBecameActive");
   if (_viewportMetrics.physical_width)
     [self surfaceUpdated:YES];
-  NSLog(@"FlutterViewController instance %@ is applicationBecameActive", self);
   [self goToApplicationLifecycle:@"AppLifecycleState.resumed"];
 }
 
 - (void)applicationWillResignActive:(NSNotification*)notification {
   TRACE_EVENT0("flutter", "applicationWillResignActive");
   [self surfaceUpdated:NO];
-  NSLog(@"FlutterViewController instance %@ is applicationWillResignActive", self);
   [self goToApplicationLifecycle:@"AppLifecycleState.inactive"];
 }
 
 - (void)applicationDidEnterBackground:(NSNotification*)notification {
   TRACE_EVENT0("flutter", "applicationDidEnterBackground");
-  NSLog(@"FlutterViewController instance %@ is applicationDidEnterBackground", self);
   [self goToApplicationLifecycle:@"AppLifecycleState.paused"];
 }
 
 - (void)applicationWillEnterForeground:(NSNotification*)notification {
   TRACE_EVENT0("flutter", "applicationWillEnterForeground");
-  NSLog(@"FlutterViewController instance %@ is applicationWillEnterForeground", self);
   [self goToApplicationLifecycle:@"AppLifecycleState.inactive"];
 }
 

testing/scenario_app/ios/Scenarios/ScenariosTests/AppLifecycleTests.m

@@ -38,17 +38,18 @@ @implementation AppLifecycleTests
 - (void)setUp {
   [super setUp];
   self.continueAfterFailure = NO;
+  // Since this test checks for view controller and application lifecycles, the starting point
+  // must be well defined.
+  XCTAssertEqual([UIApplication sharedApplication].applicationState, UIApplicationStateActive);
 }
 
 - (void)testDismissedFlutterViewControllerNotRespondingToApplicationLifecycle {
   XCTestExpectation* engineStartedExpectation = [self expectationWithDescription:@"Engine started"];
-
   // Let the engine finish booting (at the end of which the channels are properly set-up) before
   // moving onto the next step of showing the next view controller.
   ScreenBeforeFlutter* rootVC = [[ScreenBeforeFlutter alloc] initWithEngineRunCompletion:^void() {
     [engineStartedExpectation fulfill];
   }];
-
   [self waitForExpectationsWithTimeout:5 handler:nil];
 
   UIApplication* application = UIApplication.sharedApplication;
@@ -64,16 +65,16 @@ - (void)testDismissedFlutterViewControllerNotRespondingToApplicationLifecycle {
     [[XCAppLifecycleTestExpectation alloc] initForLifecycle:@"AppLifecycleState.resumed"
                                                     forStep:@"showing a FlutterViewController"]
   ]];
-  
+
   [engine.lifecycleChannel setMessageHandler:^(id message, FlutterReply callback) {
     if (lifecycleExpectations.count == 0) {
       XCTFail(@"Unexpected lifecycle transition: %@", message);
       return;
     }
     XCAppLifecycleTestExpectation* nextExpectation = [lifecycleExpectations objectAtIndex:0];
     if (![[nextExpectation expectedLifecycle] isEqualToString:message]) {
-      XCTFail(@"Expected lifecycle %@ but instead received %@",
-              [nextExpectation expectedLifecycle], message);
+      XCTFail(@"Expected lifecycle %@ but instead received %@", [nextExpectation expectedLifecycle],
+              message);
       return;
     }
 
@@ -91,8 +92,6 @@ - (void)testDismissedFlutterViewControllerNotRespondingToApplicationLifecycle {
       [vcShown fulfill];
     }];
     [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    NSLog(@"FlutterViewController instance %@ created", flutterVC);
-
     // The expectations list isn't dequeued by the message handler yet.
     [self waitForExpectations:lifecycleExpectations timeout:5 enforceOrder:YES];
 
@@ -208,16 +207,16 @@ - (void)testVisibleFlutterViewControllerRespondsToApplicationLifecycle {
     [[XCAppLifecycleTestExpectation alloc] initForLifecycle:@"AppLifecycleState.resumed"
                                                     forStep:@"showing a FlutterViewController"]
   ]];
-  
+
   [engine.lifecycleChannel setMessageHandler:^(id message, FlutterReply callback) {
     if (lifecycleExpectations.count == 0) {
       XCTFail(@"Unexpected lifecycle transition: %@", message);
       return;
     }
     XCAppLifecycleTestExpectation* nextExpectation = [lifecycleExpectations objectAtIndex:0];
     if (![[nextExpectation expectedLifecycle] isEqualToString:message]) {
-      XCTFail(@"Expected lifecycle %@ but instead received %@",
-              [nextExpectation expectedLifecycle], message);
+      XCTFail(@"Expected lifecycle %@ but instead received %@", [nextExpectation expectedLifecycle],
+              message);
       return;
     }
 
@@ -232,8 +231,6 @@ - (void)testVisibleFlutterViewControllerRespondsToApplicationLifecycle {
       [vcShown fulfill];
     }];
     [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    NSLog(@"FlutterViewController instance %@ created", flutterVC);
-
     [self waitForExpectations:lifecycleExpectations timeout:5];
 
     // Now put the FlutterViewController into background.
@@ -318,23 +315,23 @@ - (void)testFlutterViewControllerDetachingSendsApplicationLifecycle {
     [[XCAppLifecycleTestExpectation alloc] initForLifecycle:@"AppLifecycleState.resumed"
                                                     forStep:@"showing a FlutterViewController"]
   ]];
-  
+
   [engine.lifecycleChannel setMessageHandler:^(id message, FlutterReply callback) {
     if (lifecycleExpectations.count == 0) {
       XCTFail(@"Unexpected lifecycle transition: %@", message);
       return;
     }
     XCAppLifecycleTestExpectation* nextExpectation = [lifecycleExpectations objectAtIndex:0];
     if (![[nextExpectation expectedLifecycle] isEqualToString:message]) {
-      XCTFail(@"Expected lifecycle %@ but instead received %@",
-              [nextExpectation expectedLifecycle], message);
+      XCTFail(@"Expected lifecycle %@ but instead received %@", [nextExpectation expectedLifecycle],
+              message);
       return;
     }
 
     [nextExpectation fulfill];
     [lifecycleExpectations removeObjectAtIndex:0];
   }];
-  
+
   // At the end of Flutter VC, we want to make sure it deallocs and sends detached signal.
   // Using autoreleasepool will guarantee that.
   FlutterViewController* flutterVC;
@@ -344,8 +341,6 @@ - (void)testFlutterViewControllerDetachingSendsApplicationLifecycle {
       [vcShown fulfill];
     }];
     [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    NSLog(@"FlutterViewController instance %@ created", flutterVC);
-
     [self waitForExpectations:lifecycleExpectations timeout:5];
 
     // Starts dealloc flutter VC.