Commit 94d84ebd authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Chromium LUCI CQ

Improve IdentityManagerObserverBridgeTest

Making sure there is no unexpected calls to ObserverBridgeDelegate.

Bug: 903396
Change-Id: I24861862d71cb361081a1c1dd4f36972448bf98c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632676
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Auto-Submit: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844838}
parent 4187f474
...@@ -99,6 +99,21 @@ class IdentityManagerObserverBridgeTest : public testing::Test { ...@@ -99,6 +99,21 @@ class IdentityManagerObserverBridgeTest : public testing::Test {
} }
~IdentityManagerObserverBridgeTest() override {} ~IdentityManagerObserverBridgeTest() override {}
void TearDown() override {
// Check no unexpected calls. None zero counter needs to be reset at the end
// tests.
EXPECT_EQ(0, observer_bridge_delegate_.onPrimaryAccountSetCount);
EXPECT_EQ(0, observer_bridge_delegate_.onPrimaryAccountClearedCount);
EXPECT_EQ(0,
observer_bridge_delegate_.onRefreshTokenUpdatedForAccountCount);
EXPECT_EQ(0,
observer_bridge_delegate_.onRefreshTokenRemovedForAccountCount);
EXPECT_EQ(0, observer_bridge_delegate_.onRefreshTokensLoadedCount);
EXPECT_EQ(0, observer_bridge_delegate_.onAccountsInCookieUpdatedCount);
EXPECT_EQ(
0, observer_bridge_delegate_.onEndBatchOfRefreshTokenStateChangesCount);
}
public: public:
IdentityManagerObserverBridgeTest(const IdentityManagerObserverBridgeTest&) = IdentityManagerObserverBridgeTest(const IdentityManagerObserverBridgeTest&) =
delete; delete;
...@@ -128,6 +143,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnPrimaryAccountSet) { ...@@ -128,6 +143,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnPrimaryAccountSet) {
EXPECT_EQ(1, observer_bridge_delegate_.onPrimaryAccountSetCount); EXPECT_EQ(1, observer_bridge_delegate_.onPrimaryAccountSetCount);
EXPECT_EQ(account_info_, EXPECT_EQ(account_info_,
observer_bridge_delegate_.receivedPrimaryAccountInfo); observer_bridge_delegate_.receivedPrimaryAccountInfo);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onPrimaryAccountSetCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnPrimaryAccountChanged(), with clear // Tests IdentityManagerObserverBridge::OnPrimaryAccountChanged(), with clear
...@@ -141,6 +158,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnPrimaryAccountCleared) { ...@@ -141,6 +158,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnPrimaryAccountCleared) {
EXPECT_EQ(1, observer_bridge_delegate_.onPrimaryAccountClearedCount); EXPECT_EQ(1, observer_bridge_delegate_.onPrimaryAccountClearedCount);
EXPECT_EQ(account_info_, EXPECT_EQ(account_info_,
observer_bridge_delegate_.receivedPrimaryAccountInfo); observer_bridge_delegate_.receivedPrimaryAccountInfo);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onPrimaryAccountClearedCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnRefreshTokenUpdatedForAccount() // Tests IdentityManagerObserverBridge::OnRefreshTokenUpdatedForAccount()
...@@ -149,6 +168,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnRefreshTokenUpdatedForAccount) { ...@@ -149,6 +168,8 @@ TEST_F(IdentityManagerObserverBridgeTest, TestOnRefreshTokenUpdatedForAccount) {
EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokenUpdatedForAccountCount); EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokenUpdatedForAccountCount);
EXPECT_EQ(account_info_, EXPECT_EQ(account_info_,
observer_bridge_delegate_.receivedPrimaryAccountInfo); observer_bridge_delegate_.receivedPrimaryAccountInfo);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onRefreshTokenUpdatedForAccountCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnRefreshTokenRemovedForAccount() // Tests IdentityManagerObserverBridge::OnRefreshTokenRemovedForAccount()
...@@ -156,12 +177,16 @@ TEST_F(IdentityManagerObserverBridgeTest, OnRefreshTokenRemovedForAccount) { ...@@ -156,12 +177,16 @@ TEST_F(IdentityManagerObserverBridgeTest, OnRefreshTokenRemovedForAccount) {
CoreAccountId account_id; CoreAccountId account_id;
observer_bridge_.get()->OnRefreshTokenRemovedForAccount(account_id); observer_bridge_.get()->OnRefreshTokenRemovedForAccount(account_id);
EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokenRemovedForAccountCount); EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokenRemovedForAccountCount);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onRefreshTokenRemovedForAccountCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnRefreshTokensLoaded() // Tests IdentityManagerObserverBridge::OnRefreshTokensLoaded()
TEST_F(IdentityManagerObserverBridgeTest, OnRefreshTokensLoaded) { TEST_F(IdentityManagerObserverBridgeTest, OnRefreshTokensLoaded) {
observer_bridge_.get()->OnRefreshTokensLoaded(); observer_bridge_.get()->OnRefreshTokensLoaded();
EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokensLoadedCount); EXPECT_EQ(1, observer_bridge_delegate_.onRefreshTokensLoadedCount);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onRefreshTokensLoadedCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnAccountsInCookieUpdated() with no // Tests IdentityManagerObserverBridge::OnAccountsInCookieUpdated() with no
...@@ -175,6 +200,8 @@ TEST_F(IdentityManagerObserverBridgeTest, ...@@ -175,6 +200,8 @@ TEST_F(IdentityManagerObserverBridgeTest,
noError); noError);
EXPECT_EQ(1, observer_bridge_delegate_.onAccountsInCookieUpdatedCount); EXPECT_EQ(1, observer_bridge_delegate_.onAccountsInCookieUpdatedCount);
EXPECT_EQ(noError, observer_bridge_delegate_.receivedError); EXPECT_EQ(noError, observer_bridge_delegate_.receivedError);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onAccountsInCookieUpdatedCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnAccountsInCookieUpdated() with error. // Tests IdentityManagerObserverBridge::OnAccountsInCookieUpdated() with error.
...@@ -187,6 +214,8 @@ TEST_F(IdentityManagerObserverBridgeTest, OnAccountsInCookieUpdatedWithError) { ...@@ -187,6 +214,8 @@ TEST_F(IdentityManagerObserverBridgeTest, OnAccountsInCookieUpdatedWithError) {
error); error);
EXPECT_EQ(1, observer_bridge_delegate_.onAccountsInCookieUpdatedCount); EXPECT_EQ(1, observer_bridge_delegate_.onAccountsInCookieUpdatedCount);
EXPECT_EQ(error, observer_bridge_delegate_.receivedError); EXPECT_EQ(error, observer_bridge_delegate_.receivedError);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onAccountsInCookieUpdatedCount = 0;
} }
// Tests IdentityManagerObserverBridge::OnEndBatchOfRefreshTokenStateChanges(). // Tests IdentityManagerObserverBridge::OnEndBatchOfRefreshTokenStateChanges().
...@@ -195,6 +224,8 @@ TEST_F(IdentityManagerObserverBridgeTest, ...@@ -195,6 +224,8 @@ TEST_F(IdentityManagerObserverBridgeTest,
observer_bridge_.get()->OnEndBatchOfRefreshTokenStateChanges(); observer_bridge_.get()->OnEndBatchOfRefreshTokenStateChanges();
EXPECT_EQ( EXPECT_EQ(
1, observer_bridge_delegate_.onEndBatchOfRefreshTokenStateChangesCount); 1, observer_bridge_delegate_.onEndBatchOfRefreshTokenStateChangesCount);
// Reset counter to pass the tear down.
observer_bridge_delegate_.onEndBatchOfRefreshTokenStateChangesCount = 0;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment