Gracefully handle didCommitNavigation: call after didFinishNavigation:

ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/web_state/ui/crw_wk_navigation_states.h"
 
 #import <WebKit/WebKit.h>
 
 #import "ios/web/web_state/navigation_context_impl.h"
 #include "net/http/http_response_headers.h"
@@ skipping 25 matching lines @@
   WKNavigation* navigation1_;
   WKNavigation* navigation2_;
   WKNavigation* navigation3_;
   CRWWKNavigationStates* states_;
 };
 
 // Tests |removeNavigation:| method.
 TEST_F(CRWWKNavigationStatesTest, RemovingNavigation) {
   // navigation_1 is the only navigation and it is the latest.
   [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_];
+  ASSERT_EQ(WKNavigationState::REQUESTED,
+            [states_ stateForNavigation:navigation1_]);
   ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]);
   [states_ removeNavigation:navigation1_];
-  ASSERT_FALSE([states_ lastAddedNavigation]);
+  EXPECT_FALSE([states_ lastAddedNavigation]);
+  EXPECT_EQ(WKNavigationState::NONE, [states_ stateForNavigation:navigation1_]);
 }
 
 // Tests |lastAddedNavigation| method.
 TEST_F(CRWWKNavigationStatesTest, LastAddedNavigation) {
   // navigation_1 is the only navigation and it is the latest.
   [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_];
+  EXPECT_EQ(WKNavigationState::REQUESTED,
+            [states_ stateForNavigation:navigation1_]);
   EXPECT_EQ(navigation1_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
 
   // navigation_2 is added later and hence the latest.
   [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation2_];
+  EXPECT_EQ(WKNavigationState::REQUESTED,
+            [states_ stateForNavigation:navigation2_]);
   EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
 
   // Updating state for existing navigation does not make it the latest.
   [states_ setState:WKNavigationState::STARTED forNavigation:navigation1_];
+  EXPECT_EQ(WKNavigationState::STARTED,
+            [states_ stateForNavigation:navigation1_]);
   EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
 
   // navigation_2 is still the latest.
   [states_ setState:WKNavigationState::STARTED forNavigation:navigation2_];
+  EXPECT_EQ(WKNavigationState::STARTED,
+            [states_ stateForNavigation:navigation2_]);
   EXPECT_EQ(navigation2_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]);
 
   // navigation_3 is added later and hence the latest.
   std::unique_ptr<web::NavigationContextImpl> context =
       NavigationContextImpl::CreateNavigationContext(
           nullptr /*web_state*/, GURL(kTestUrl1),
           ui::PageTransition::PAGE_TRANSITION_SERVER_REDIRECT);
   [states_ setContext:std::move(context) forNavigation:navigation3_];
   EXPECT_EQ(navigation3_, [states_ lastAddedNavigation]);
@@ skipping 35 matching lines @@
   EXPECT_EQ(GURL(kTestUrl2),
             [states_ contextForNavigation:navigation1_]->GetUrl());
   EXPECT_FALSE([states_ contextForNavigation:navigation1_]->IsSameDocument());
   EXPECT_EQ(error, [states_ contextForNavigation:navigation1_]->GetError());
 }
 
 // Tests null WKNavigation object.
 TEST_F(CRWWKNavigationStatesTest, NullNavigation) {
   // navigation_1 is the only navigation and it is the latest.
   [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_];
+  EXPECT_EQ(WKNavigationState::REQUESTED,
+            [states_ stateForNavigation:navigation1_]);
   ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
 
   // null navigation is added later and hence the latest.
   [states_ setState:WKNavigationState::STARTED forNavigation:nil];
+  EXPECT_EQ(WKNavigationState::STARTED, [states_ stateForNavigation:nil]);
   EXPECT_FALSE([states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::STARTED, [states_ lastAddedNavigationState]);
 
   // navigation_1 is the latest again after removing null navigation.
   [states_ removeNavigation:nil];
   ASSERT_EQ(navigation1_, [states_ lastAddedNavigation]);
   EXPECT_EQ(WKNavigationState::REQUESTED, [states_ lastAddedNavigationState]);
 }
 
 // Tests -[CRWWKNavigationStates pendingNavigations].
 TEST_F(CRWWKNavigationStatesTest, PendingNavigations) {
   ASSERT_EQ(0U, [states_ pendingNavigations].count);
 
   // Add pending navigation_1.
   [states_ setState:WKNavigationState::REQUESTED forNavigation:navigation1_];
+  ASSERT_EQ(WKNavigationState::REQUESTED,
+            [states_ stateForNavigation:navigation1_]);
   ASSERT_EQ(1U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation1_]);
 
   // Add pending navigation_2.
   [states_ setState:WKNavigationState::STARTED forNavigation:navigation2_];
+  ASSERT_EQ(WKNavigationState::STARTED,
+            [states_ stateForNavigation:navigation2_]);
   ASSERT_EQ(2U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation1_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
 
   // Add pending navigation_3.
   [states_ setState:WKNavigationState::STARTED forNavigation:navigation3_];
+  ASSERT_EQ(WKNavigationState::STARTED,
+            [states_ stateForNavigation:navigation3_]);
   ASSERT_EQ(3U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation1_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
 
   // Add pending null navigation.
   [states_ setState:WKNavigationState::STARTED forNavigation:nil];
+  ASSERT_EQ(WKNavigationState::STARTED, [states_ stateForNavigation:nil]);
   ASSERT_EQ(4U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation1_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:[NSNull null]]);
 
   // Provisionally fail null navigation.
   [states_ setState:WKNavigationState::PROVISIONALY_FAILED forNavigation:nil];
+  ASSERT_EQ(WKNavigationState::PROVISIONALY_FAILED,
+            [states_ stateForNavigation:nil]);
   ASSERT_EQ(3U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
 
   // Commit navigation_1.
   [states_ setState:WKNavigationState::COMMITTED forNavigation:navigation1_];
+  ASSERT_EQ(WKNavigationState::COMMITTED,
+            [states_ stateForNavigation:navigation1_]);
   ASSERT_EQ(2U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
 
   // Finish navigation_1.
   [states_ setState:WKNavigationState::FINISHED forNavigation:navigation1_];
+  ASSERT_EQ(WKNavigationState::FINISHED,
+            [states_ stateForNavigation:navigation1_]);
   ASSERT_EQ(2U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation2_]);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
 
   // Remove navigation_2.
   [states_ removeNavigation:navigation2_];
   ASSERT_EQ(1U, [states_ pendingNavigations].count);
   EXPECT_TRUE([[states_ pendingNavigations] containsObject:navigation3_]);
 
   // Fail navigation_3.
   [states_ setState:WKNavigationState::FAILED forNavigation:navigation3_];
+  ASSERT_EQ(WKNavigationState::FAILED,
+            [states_ stateForNavigation:navigation3_]);
   ASSERT_EQ(0U, [states_ pendingNavigations].count);
 }
 
 }  // namespace web