Index: gpu/config/gpu_control_list_version_unittest.cc |
diff --git a/gpu/config/gpu_control_list_version_info_unittest.cc b/gpu/config/gpu_control_list_version_unittest.cc |
similarity index 59% |
rename from gpu/config/gpu_control_list_version_info_unittest.cc |
rename to gpu/config/gpu_control_list_version_unittest.cc |
index bde9d0c2f56ef559aa863af1d37c08fb763ee1b1..0a1bf03c6eeb1449aa538d4940b979128c4c659f 100644 |
--- a/gpu/config/gpu_control_list_version_info_unittest.cc |
+++ b/gpu/config/gpu_control_list_version_unittest.cc |
@@ -9,133 +9,52 @@ |
namespace gpu { |
-class VersionInfoTest : public testing::Test { |
- public: |
- VersionInfoTest() { } |
- ~VersionInfoTest() override {} |
+namespace { |
- typedef GpuControlList::VersionInfo VersionInfo; |
-}; |
+constexpr auto kNumerical = GpuControlList::kVersionStyleNumerical; |
+constexpr auto kLexical = GpuControlList::kVersionStyleLexical; |
-TEST_F(VersionInfoTest, ValidVersionInfo) { |
- const std::string op[] = { |
- "=", |
- "<", |
- "<=", |
- ">", |
- ">=", |
- "any", |
- "between" |
- }; |
- for (size_t i = 0; i < arraysize(op); ++i) { |
- std::string string1; |
- std::string string2; |
- if (op[i] != "any") |
- string1 = "8.9"; |
- if (op[i] == "between") |
- string2 = "9.0"; |
- VersionInfo info(op[i], std::string(), string1, string2); |
- EXPECT_TRUE(info.IsValid()); |
- } |
+constexpr auto kBetween = GpuControlList::kBetween; |
+constexpr auto kEQ = GpuControlList::kEQ; |
+constexpr auto kLT = GpuControlList::kLT; |
+constexpr auto kLE = GpuControlList::kLE; |
+constexpr auto kGT = GpuControlList::kGT; |
+constexpr auto kGE = GpuControlList::kGE; |
+constexpr auto kAny = GpuControlList::kAny; |
- const std::string style[] = { |
- "lexical", |
- "numerical", |
- "" // Default, same as "numerical" |
- }; |
- for (size_t i =0; i < arraysize(style); ++i) { |
- VersionInfo info("=", style[i], "8.9", std::string()); |
- EXPECT_TRUE(info.IsValid()); |
- if (style[i] == "lexical") |
- EXPECT_TRUE(info.IsLexical()); |
- else |
- EXPECT_FALSE(info.IsLexical()); |
- } |
- |
- const std::string number[] = { |
- "10", |
- "10.9", |
- "10.0", |
- "10.0.9", |
- "0.8", |
- // Leading 0s are valid. |
- "10.09", |
- // Whitespaces are ignored. |
- " 10.9", |
- "10.9 ", |
- "10 .9", |
- "10. 9", |
- }; |
- for (size_t i =0; i < arraysize(number); ++i) { |
- VersionInfo info("=", std::string(), number[i], std::string()); |
- EXPECT_TRUE(info.IsValid()); |
- } |
-} |
+} // namespace anonymous |
-TEST_F(VersionInfoTest, InvalidVersionInfo) { |
- const std::string op[] = { |
- "=", |
- "<", |
- "<=", |
- ">", |
- ">=", |
- "any", |
- "between" |
- }; |
- for (size_t i = 0; i < arraysize(op); ++i) { |
- { |
- VersionInfo info(op[i], std::string(), "8.9", std::string()); |
- if (op[i] == "between") |
- EXPECT_FALSE(info.IsValid()); |
- else |
- EXPECT_TRUE(info.IsValid()); |
- } |
- { |
- VersionInfo info(op[i], std::string(), std::string(), std::string()); |
- if (op[i] == "any") |
- EXPECT_TRUE(info.IsValid()); |
- else |
- EXPECT_FALSE(info.IsValid()); |
- } |
- { |
- VersionInfo info(op[i], std::string(), "8.9", "9.0"); |
- EXPECT_TRUE(info.IsValid()); |
- } |
- } |
+class VersionTest : public testing::Test { |
+ public: |
+ VersionTest() {} |
+ ~VersionTest() override {} |
- const std::string number[] = { |
- "8.E", |
- "8-9", |
- }; |
- for (size_t i = 0; i < arraysize(number); ++i) { |
- VersionInfo info("=", std::string(), number[i], std::string()); |
- EXPECT_FALSE(info.IsValid()); |
- } |
-} |
+ typedef GpuControlList::Version Version; |
+}; |
-TEST_F(VersionInfoTest, VersionComparison) { |
+TEST_F(VersionTest, VersionComparison) { |
{ |
- VersionInfo info("any", std::string(), std::string(), std::string()); |
+ Version info = {kAny, kNumerical, nullptr, nullptr}; |
EXPECT_TRUE(info.Contains("0")); |
EXPECT_TRUE(info.Contains("8.9")); |
EXPECT_TRUE(info.Contains("100")); |
} |
{ |
- VersionInfo info(">", std::string(), "8.9", std::string()); |
+ Version info = {kGT, kNumerical, "8.9", nullptr}; |
EXPECT_FALSE(info.Contains("7")); |
EXPECT_FALSE(info.Contains("8.9")); |
EXPECT_FALSE(info.Contains("8.9.1")); |
EXPECT_TRUE(info.Contains("9")); |
} |
{ |
- VersionInfo info(">=", std::string(), "8.9", std::string()); |
+ Version info = {kGE, kNumerical, "8.9", nullptr}; |
EXPECT_FALSE(info.Contains("7")); |
EXPECT_TRUE(info.Contains("8.9")); |
EXPECT_TRUE(info.Contains("8.9.1")); |
EXPECT_TRUE(info.Contains("9")); |
} |
{ |
- VersionInfo info("=", std::string(), "8.9", std::string()); |
+ Version info = {kEQ, kNumerical, "8.9", nullptr}; |
EXPECT_FALSE(info.Contains("7")); |
EXPECT_TRUE(info.Contains("8")); |
EXPECT_TRUE(info.Contains("8.9")); |
@@ -143,7 +62,7 @@ TEST_F(VersionInfoTest, VersionComparison) { |
EXPECT_FALSE(info.Contains("9")); |
} |
{ |
- VersionInfo info("<", std::string(), "8.9", std::string()); |
+ Version info = {kLT, kNumerical, "8.9", nullptr}; |
EXPECT_TRUE(info.Contains("7")); |
EXPECT_TRUE(info.Contains("8.8")); |
EXPECT_FALSE(info.Contains("8")); |
@@ -152,7 +71,7 @@ TEST_F(VersionInfoTest, VersionComparison) { |
EXPECT_FALSE(info.Contains("9")); |
} |
{ |
- VersionInfo info("<=", std::string(), "8.9", std::string()); |
+ Version info = {kLE, kNumerical, "8.9", nullptr}; |
EXPECT_TRUE(info.Contains("7")); |
EXPECT_TRUE(info.Contains("8.8")); |
EXPECT_TRUE(info.Contains("8")); |
@@ -161,7 +80,7 @@ TEST_F(VersionInfoTest, VersionComparison) { |
EXPECT_FALSE(info.Contains("9")); |
} |
{ |
- VersionInfo info("between", std::string(), "8.9", "9.1"); |
+ Version info = {kBetween, kNumerical, "8.9", "9.1"}; |
EXPECT_FALSE(info.Contains("7")); |
EXPECT_FALSE(info.Contains("8.8")); |
EXPECT_TRUE(info.Contains("8")); |
@@ -175,18 +94,18 @@ TEST_F(VersionInfoTest, VersionComparison) { |
} |
} |
-TEST_F(VersionInfoTest, DateComparison) { |
+TEST_F(VersionTest, DateComparison) { |
// When we use '-' as splitter, we assume a format of mm-dd-yyyy |
// or mm-yyyy, i.e., a date. |
{ |
- VersionInfo info("=", std::string(), "1976.3.21", std::string()); |
+ Version info = {kEQ, kNumerical, "1976.3.21", nullptr}; |
EXPECT_TRUE(info.Contains("3-21-1976", '-')); |
EXPECT_TRUE(info.Contains("3-1976", '-')); |
EXPECT_TRUE(info.Contains("03-1976", '-')); |
EXPECT_FALSE(info.Contains("21-3-1976", '-')); |
} |
{ |
- VersionInfo info(">", std::string(), "1976.3.21", std::string()); |
+ Version info = {kGT, kNumerical, "1976.3.21", nullptr}; |
EXPECT_TRUE(info.Contains("3-22-1976", '-')); |
EXPECT_TRUE(info.Contains("4-1976", '-')); |
EXPECT_TRUE(info.Contains("04-1976", '-')); |
@@ -194,7 +113,7 @@ TEST_F(VersionInfoTest, DateComparison) { |
EXPECT_FALSE(info.Contains("2-1976", '-')); |
} |
{ |
- VersionInfo info("between", std::string(), "1976.3.21", "2012.12.25"); |
+ Version info = {kBetween, kNumerical, "1976.3.21", "2012.12.25"}; |
EXPECT_FALSE(info.Contains("3-20-1976", '-')); |
EXPECT_TRUE(info.Contains("3-21-1976", '-')); |
EXPECT_TRUE(info.Contains("3-22-1976", '-')); |
@@ -213,11 +132,11 @@ TEST_F(VersionInfoTest, DateComparison) { |
} |
} |
-TEST_F(VersionInfoTest, LexicalComparison) { |
+TEST_F(VersionTest, LexicalComparison) { |
// When we use lexical style, we assume a format major.minor.*. |
// We apply numerical comparison to major, lexical comparison to others. |
{ |
- VersionInfo info("<", "lexical", "8.201", std::string()); |
+ Version info = {kLT, kLexical, "8.201", nullptr}; |
EXPECT_TRUE(info.Contains("8.001.100")); |
EXPECT_TRUE(info.Contains("8.109")); |
EXPECT_TRUE(info.Contains("8.10900")); |
@@ -236,7 +155,7 @@ TEST_F(VersionInfoTest, LexicalComparison) { |
EXPECT_FALSE(info.Contains("12.201")); |
} |
{ |
- VersionInfo info("<", "lexical", "9.002", std::string()); |
+ Version info = {kLT, kLexical, "9.002", nullptr}; |
EXPECT_TRUE(info.Contains("8.001.100")); |
EXPECT_TRUE(info.Contains("8.109")); |
EXPECT_TRUE(info.Contains("8.10900")); |
@@ -257,4 +176,3 @@ TEST_F(VersionInfoTest, LexicalComparison) { |
} |
} // namespace gpu |
- |