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

Side by Side Diff: base/version_unittest.cc

Issue 949573002: Support plugin version mid-portions with leading zeros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: only reject leading zero for first version part Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « base/version.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/version.h" 5 #include "base/version.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace { 9 namespace {
10 10
(...skipping 23 matching lines...) Expand all
34 bool success; 34 bool success;
35 } cases[] = { 35 } cases[] = {
36 {"", 0, false}, 36 {"", 0, false},
37 {" ", 0, false}, 37 {" ", 0, false},
38 {"\t", 0, false}, 38 {"\t", 0, false},
39 {"\n", 0, false}, 39 {"\n", 0, false},
40 {" ", 0, false}, 40 {" ", 0, false},
41 {".", 0, false}, 41 {".", 0, false},
42 {" . ", 0, false}, 42 {" . ", 0, false},
43 {"0", 1, true}, 43 {"0", 1, true},
44 {"0.", 0, false},
44 {"0.0", 2, true}, 45 {"0.0", 2, true},
45 {"65537.0", 0, false}, 46 {"65537.0", 0, false},
46 {"-1.0", 0, false}, 47 {"-1.0", 0, false},
47 {"1.-1.0", 0, false}, 48 {"1.-1.0", 0, false},
Nico 2015/02/22 01:16:31 can you add a row like {"1.--1.0", 0, false},
Will Harris 2015/02/22 01:21:25 Done.
48 {"+1.0", 0, false}, 49 {"+1.0", 0, false},
49 {"1.+1.0", 0, false}, 50 {"1.+1.0", 0, false},
51 {"1+1.0", 0, false},
52 {"++1.0", 0, false},
50 {"1.0a", 0, false}, 53 {"1.0a", 0, false},
51 {"1.2.3.4.5.6.7.8.9.0", 10, true}, 54 {"1.2.3.4.5.6.7.8.9.0", 10, true},
52 {"02.1", 0, false}, 55 {"02.1", 0, false},
56 {"0.01", 2, true},
53 {"f.1", 0, false}, 57 {"f.1", 0, false},
58 {"15.007.20011", 3, true},
54 }; 59 };
55 60
56 for (size_t i = 0; i < arraysize(cases); ++i) { 61 for (size_t i = 0; i < arraysize(cases); ++i) {
57 Version version(cases[i].input); 62 Version version(cases[i].input);
58 EXPECT_EQ(cases[i].success, version.IsValid()); 63 EXPECT_EQ(cases[i].success, version.IsValid());
59 if (cases[i].success) 64 if (cases[i].success)
60 EXPECT_EQ(cases[i].parts, version.components().size()); 65 EXPECT_EQ(cases[i].parts, version.components().size());
61 } 66 }
62 } 67 }
63 68
64 TEST(VersionTest, Compare) { 69 TEST(VersionTest, Compare) {
65 static const struct version_compare { 70 static const struct version_compare {
66 const char* lhs; 71 const char* lhs;
67 const char* rhs; 72 const char* rhs;
68 int expected; 73 int expected;
69 } cases[] = { 74 } cases[] = {
70 {"1.0", "1.0", 0}, 75 {"1.0", "1.0", 0},
71 {"1.0", "0.0", 1}, 76 {"1.0", "0.0", 1},
72 {"1.0", "2.0", -1}, 77 {"1.0", "2.0", -1},
73 {"1.0", "1.1", -1}, 78 {"1.0", "1.1", -1},
74 {"1.1", "1.0", 1}, 79 {"1.1", "1.0", 1},
75 {"1.0", "1.0.1", -1}, 80 {"1.0", "1.0.1", -1},
76 {"1.1", "1.0.1", 1}, 81 {"1.1", "1.0.1", 1},
77 {"1.1", "1.0.1", 1}, 82 {"1.1", "1.0.1", 1},
78 {"1.0.0", "1.0", 0}, 83 {"1.0.0", "1.0", 0},
79 {"1.0.3", "1.0.20", -1}, 84 {"1.0.3", "1.0.20", -1},
85 {"11.0.10", "15.007.20011", -1},
80 }; 86 };
81 for (size_t i = 0; i < arraysize(cases); ++i) { 87 for (size_t i = 0; i < arraysize(cases); ++i) {
82 Version lhs(cases[i].lhs); 88 Version lhs(cases[i].lhs);
83 Version rhs(cases[i].rhs); 89 Version rhs(cases[i].rhs);
84 EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) << 90 EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) <<
85 cases[i].lhs << " ? " << cases[i].rhs; 91 cases[i].lhs << " ? " << cases[i].rhs;
86 92
87 EXPECT_EQ(lhs.IsOlderThan(cases[i].rhs), (cases[i].expected == -1)); 93 EXPECT_EQ(lhs.IsOlderThan(cases[i].rhs), (cases[i].expected == -1));
88 } 94 }
89 } 95 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 {"*", false}, 138 {"*", false},
133 {"*.2", false}, 139 {"*.2", false},
134 }; 140 };
135 for (size_t i = 0; i < arraysize(cases); ++i) { 141 for (size_t i = 0; i < arraysize(cases); ++i) {
136 EXPECT_EQ(Version::IsValidWildcardString(cases[i].version), 142 EXPECT_EQ(Version::IsValidWildcardString(cases[i].version),
137 cases[i].expected) << cases[i].version << "?" << cases[i].expected; 143 cases[i].expected) << cases[i].version << "?" << cases[i].expected;
138 } 144 }
139 } 145 }
140 146
141 } // namespace 147 } // namespace
OLDNEW
« no previous file with comments | « base/version.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698