Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Unified Diff: components/update_client/update_client_unittest.cc

Issue 1575523002: Comparison and streaming operators for base::Version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/update_client/update_client_unittest.cc
diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 06171d68463edbd880e4ea324570401a1bbe9b8d..895994e80c40d849c9bfe58f441dcaabf9d1d897 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -419,8 +419,8 @@ TEST_F(UpdateClientTest, TwoCrxUpdateNoUpdate) {
const auto& ping_items = items();
EXPECT_EQ(1U, ping_items.size());
EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.9"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(0, ping_items[0].error_category);
EXPECT_EQ(0, ping_items[0].error_code);
}
@@ -642,13 +642,13 @@ TEST_F(UpdateClientTest, TwoCrxUpdate) {
const auto& ping_items = items();
EXPECT_EQ(2U, ping_items.size());
EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.9"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(0, ping_items[0].error_category);
EXPECT_EQ(0, ping_items[0].error_code);
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id);
- EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version));
+ EXPECT_EQ(base::Version("0.8"), ping_items[1].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[1].next_version);
EXPECT_EQ(0, ping_items[1].error_category);
EXPECT_EQ(0, ping_items[1].error_code);
}
@@ -880,13 +880,13 @@ TEST_F(UpdateClientTest, TwoCrxUpdateDownloadTimeout) {
const auto& ping_items = items();
EXPECT_EQ(2U, ping_items.size());
EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.9"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(1, ping_items[0].error_category); // Network error.
EXPECT_EQ(-118, ping_items[0].error_code);
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id);
- EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version));
+ EXPECT_EQ(base::Version("0.8"), ping_items[1].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[1].next_version);
EXPECT_EQ(0, ping_items[1].error_category);
EXPECT_EQ(0, ping_items[1].error_code);
}
@@ -1138,13 +1138,13 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdate) {
const auto& ping_items = items();
EXPECT_EQ(2U, ping_items.size());
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.8").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.8"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(0, ping_items[0].error_category);
EXPECT_EQ(0, ping_items[0].error_code);
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id);
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version));
- EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version));
+ EXPECT_EQ(base::Version("1.0"), ping_items[1].previous_version);
+ EXPECT_EQ(base::Version("2.0"), ping_items[1].next_version);
EXPECT_EQ(0, ping_items[1].diff_error_category);
EXPECT_EQ(0, ping_items[1].diff_error_code);
}
@@ -1355,8 +1355,8 @@ TEST_F(UpdateClientTest, OneCrxInstallError) {
const auto& ping_items = items();
EXPECT_EQ(1U, ping_items.size());
EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.9"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(3, ping_items[0].error_category); // kInstallError.
EXPECT_EQ(9, ping_items[0].error_code); // kInstallerError.
}
@@ -1609,13 +1609,13 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdateFailsFullUpdateSucceeds) {
const auto& ping_items = items();
EXPECT_EQ(2U, ping_items.size());
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.8").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.8"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(0, ping_items[0].error_category);
EXPECT_EQ(0, ping_items[0].error_code);
EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id);
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version));
- EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version));
+ EXPECT_EQ(base::Version("1.0"), ping_items[1].previous_version);
+ EXPECT_EQ(base::Version("2.0"), ping_items[1].next_version);
EXPECT_TRUE(ping_items[1].diff_update_failed);
EXPECT_EQ(1, ping_items[1].diff_error_category); // kNetworkError.
EXPECT_EQ(-1, ping_items[1].diff_error_code);
@@ -1911,8 +1911,8 @@ TEST_F(UpdateClientTest, OneCrxInstall) {
const auto& ping_items = items();
EXPECT_EQ(1U, ping_items.size());
EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id);
- EXPECT_TRUE(base::Version("0.0").Equals(ping_items[0].previous_version));
- EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version));
+ EXPECT_EQ(base::Version("0.0"), ping_items[0].previous_version);
+ EXPECT_EQ(base::Version("1.0"), ping_items[0].next_version);
EXPECT_EQ(0, ping_items[0].error_category);
EXPECT_EQ(0, ping_items[0].error_code);
}

Powered by Google App Engine
This is Rietveld 408576698