summaryrefslogtreecommitdiff
path: root/base/version_unittest.cc
diff options
context:
space:
mode:
authorJay Civelli <jcivelli@google.com>2017-03-22 17:31:44 -0700
committerTreehugger Robot <treehugger-gerrit@google.com>2017-07-26 01:47:45 +0000
commit0601274935e7f632eb0d6ce0fd223b744349d20b (patch)
tree09642629eabdbeccfd68e6338253228465088c57 /base/version_unittest.cc
parentf320c0cf71af274e34404746d4303e6a2452e2d6 (diff)
downloadlibchrome-0601274935e7f632eb0d6ce0fd223b744349d20b.tar.gz
libchrome: Uprev the library to r456626 from Chromium
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r456626 which corresponds to git commit 08266b3fca707804065a2cfd60331722ade41969 of Mar 14, 2017 Notable changes are: - FOR_EACH_OBSERVER macro removed (replaced by use of C++ 11 range-base for loop) - base::Values no more FundamentalValue - stl_util moved to base namespace - some scoped pointers removed in crypto/ in favor of BoringSSL UniquePtr. - path() accessor renamed to GetPath() in ScopedTempDir (and other classes) - introduction of base::CallbackOnce Test: All unit-tests should still pass. Change-Id: I5c2cb41ea4c037fe69fbb425e711b1399d55d591
Diffstat (limited to 'base/version_unittest.cc')
-rw-r--r--base/version_unittest.cc27
1 files changed, 18 insertions, 9 deletions
diff --git a/base/version_unittest.cc b/base/version_unittest.cc
index 5d9ea9973c..4ca784fc11 100644
--- a/base/version_unittest.cc
+++ b/base/version_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -13,17 +14,17 @@
namespace {
TEST(VersionTest, DefaultConstructor) {
- Version v;
+ base::Version v;
EXPECT_FALSE(v.IsValid());
}
TEST(VersionTest, ValueSemantics) {
- Version v1("1.2.3.4");
+ base::Version v1("1.2.3.4");
EXPECT_TRUE(v1.IsValid());
- Version v3;
+ base::Version v3;
EXPECT_FALSE(v3.IsValid());
{
- Version v2(v1);
+ base::Version v2(v1);
v3 = v2;
EXPECT_TRUE(v2.IsValid());
EXPECT_EQ(v1, v2);
@@ -31,6 +32,14 @@ TEST(VersionTest, ValueSemantics) {
EXPECT_EQ(v3, v1);
}
+TEST(VersionTest, MoveSemantics) {
+ const std::vector<uint32_t> components = {1, 2, 3, 4};
+ base::Version v1(std::move(components));
+ EXPECT_TRUE(v1.IsValid());
+ base::Version v2("1.2.3.4");
+ EXPECT_EQ(v1, v2);
+}
+
TEST(VersionTest, GetVersionFromString) {
static const struct version_string {
const char* input;
@@ -67,7 +76,7 @@ TEST(VersionTest, GetVersionFromString) {
};
for (size_t i = 0; i < arraysize(cases); ++i) {
- Version version(cases[i].input);
+ base::Version version(cases[i].input);
EXPECT_EQ(cases[i].success, version.IsValid());
if (cases[i].success) {
EXPECT_EQ(cases[i].parts, version.components().size());
@@ -96,8 +105,8 @@ TEST(VersionTest, Compare) {
{"11.0.10", "15.5.28.130162", -1},
};
for (size_t i = 0; i < arraysize(cases); ++i) {
- Version lhs(cases[i].lhs);
- Version rhs(cases[i].rhs);
+ base::Version lhs(cases[i].lhs);
+ base::Version rhs(cases[i].rhs);
EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) <<
cases[i].lhs << " ? " << cases[i].rhs;
@@ -152,7 +161,7 @@ TEST(VersionTest, CompareToWildcardString) {
{"1.2.0.0.0.0", "1.2.*", 0},
};
for (size_t i = 0; i < arraysize(cases); ++i) {
- const Version version(cases[i].lhs);
+ const base::Version version(cases[i].lhs);
const int result = version.CompareToWildcardString(cases[i].rhs);
EXPECT_EQ(result, cases[i].expected) << cases[i].lhs << "?" << cases[i].rhs;
}
@@ -176,7 +185,7 @@ TEST(VersionTest, IsValidWildcardString) {
{"*.2", false},
};
for (size_t i = 0; i < arraysize(cases); ++i) {
- EXPECT_EQ(Version::IsValidWildcardString(cases[i].version),
+ EXPECT_EQ(base::Version::IsValidWildcardString(cases[i].version),
cases[i].expected) << cases[i].version << "?" << cases[i].expected;
}
}