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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/installer/gcapi/gcapi_omaha_experiment_test.cc

Issue 291653007: Cleanup, mostly replacing uses of SplitStringUsingSubstr() with SplitString(), (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/gcapi/gcapi_omaha_experiment.cc ('k') | chrome/installer/util/google_update_experiment_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/installer/gcapi/gcapi_omaha_experiment.h" 5 #include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/installer/gcapi/gcapi.h" 8 #include "chrome/installer/gcapi/gcapi.h"
9 #include "chrome/installer/gcapi/gcapi_test_registry_overrider.h" 9 #include "chrome/installer/gcapi/gcapi_test_registry_overrider.h"
10 #include "chrome/installer/util/google_update_constants.h" 10 #include "chrome/installer/util/google_update_constants.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ASSERT_TRUE(SetRelaunchExperimentLabels(kBrand, kUserLevel)); 59 ASSERT_TRUE(SetRelaunchExperimentLabels(kBrand, kUserLevel));
60 VerifyExperimentLabels(relaunch_label_); 60 VerifyExperimentLabels(relaunch_label_);
61 } 61 }
62 62
63 TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) { 63 TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
64 GoogleUpdateSettings::SetExperimentLabels(false, kSomeExperiments); 64 GoogleUpdateSettings::SetExperimentLabels(false, kSomeExperiments);
65 65
66 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 66 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
67 67
68 base::string16 expected_labels(kSomeExperiments); 68 base::string16 expected_labels(kSomeExperiments);
69 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 69 expected_labels += google_update::kExperimentLabelSeparator;
70 expected_labels.append(reactivation_label_); 70 expected_labels.append(reactivation_label_);
71 VerifyExperimentLabels(expected_labels); 71 VerifyExperimentLabels(expected_labels);
72 } 72 }
73 73
74 TEST_F(GCAPIOmahaExperimentTest, 74 TEST_F(GCAPIOmahaExperimentTest,
75 SetReactivationLabelWithExistingIdenticalExperiment) { 75 SetReactivationLabelWithExistingIdenticalExperiment) {
76 base::string16 previous_labels(kSomeExperiments); 76 base::string16 previous_labels(kSomeExperiments);
77 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 77 previous_labels += google_update::kExperimentLabelSeparator;
78 previous_labels.append(reactivation_label_); 78 previous_labels.append(reactivation_label_);
79 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 79 previous_labels += google_update::kExperimentLabelSeparator;
80 previous_labels.append(kSomeOtherExperiments); 80 previous_labels.append(kSomeOtherExperiments);
81 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels); 81 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
82 82
83 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 83 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
84 84
85 base::string16 expected_labels(kSomeExperiments); 85 base::string16 expected_labels(kSomeExperiments);
86 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 86 expected_labels += google_update::kExperimentLabelSeparator;
87 expected_labels.append(kSomeOtherExperiments); 87 expected_labels.append(kSomeOtherExperiments);
88 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 88 expected_labels += google_update::kExperimentLabelSeparator;
89 expected_labels.append(reactivation_label_); 89 expected_labels.append(reactivation_label_);
90 VerifyExperimentLabels(expected_labels); 90 VerifyExperimentLabels(expected_labels);
91 } 91 }
92 92
93 TEST_F(GCAPIOmahaExperimentTest, 93 TEST_F(GCAPIOmahaExperimentTest,
94 SetReactivationLabelWithExistingIdenticalAtBeginning) { 94 SetReactivationLabelWithExistingIdenticalAtBeginning) {
95 base::string16 previous_labels(reactivation_label_); 95 base::string16 previous_labels(reactivation_label_);
96 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 96 previous_labels += google_update::kExperimentLabelSeparator;
97 previous_labels.append(kSomeExperiments); 97 previous_labels.append(kSomeExperiments);
98 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels); 98 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
99 99
100 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 100 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
101 101
102 base::string16 expected_labels(kSomeExperiments); 102 base::string16 expected_labels(kSomeExperiments);
103 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 103 expected_labels += google_update::kExperimentLabelSeparator;
104 expected_labels.append(reactivation_label_); 104 expected_labels.append(reactivation_label_);
105 VerifyExperimentLabels(expected_labels); 105 VerifyExperimentLabels(expected_labels);
106 } 106 }
107 107
108 TEST_F(GCAPIOmahaExperimentTest, 108 TEST_F(GCAPIOmahaExperimentTest,
109 SetReactivationLabelWithFakeMatchInAnExperiment) { 109 SetReactivationLabelWithFakeMatchInAnExperiment) {
110 base::string16 previous_labels(kSomeExperiments); 110 base::string16 previous_labels(kSomeExperiments);
111 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 111 previous_labels += google_update::kExperimentLabelSeparator;
112 previous_labels.append(L"blah_"); 112 previous_labels.append(L"blah_");
113 // Shouldn't match deletion criteria. 113 // Shouldn't match deletion criteria.
114 previous_labels.append(reactivation_label_); 114 previous_labels.append(reactivation_label_);
115 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 115 previous_labels += google_update::kExperimentLabelSeparator;
116 previous_labels.append(kSomeOtherExperiments); 116 previous_labels.append(kSomeOtherExperiments);
117 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 117 previous_labels += google_update::kExperimentLabelSeparator;
118 // Should match the deletion criteria. 118 // Should match the deletion criteria.
119 previous_labels.append(reactivation_label_); 119 previous_labels.append(reactivation_label_);
120 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 120 previous_labels += google_update::kExperimentLabelSeparator;
121 previous_labels.append(kSomeMoreExperiments); 121 previous_labels.append(kSomeMoreExperiments);
122 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels); 122 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
123 123
124 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 124 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
125 125
126 base::string16 expected_labels(kSomeExperiments); 126 base::string16 expected_labels(kSomeExperiments);
127 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 127 expected_labels += google_update::kExperimentLabelSeparator;
128 expected_labels.append(L"blah_"); 128 expected_labels.append(L"blah_");
129 expected_labels.append(reactivation_label_); 129 expected_labels.append(reactivation_label_);
130 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 130 expected_labels += google_update::kExperimentLabelSeparator;
131 expected_labels.append(kSomeOtherExperiments); 131 expected_labels.append(kSomeOtherExperiments);
132 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 132 expected_labels += google_update::kExperimentLabelSeparator;
133 expected_labels.append(kSomeMoreExperiments); 133 expected_labels.append(kSomeMoreExperiments);
134 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 134 expected_labels += google_update::kExperimentLabelSeparator;
135 expected_labels.append(reactivation_label_); 135 expected_labels.append(reactivation_label_);
136 VerifyExperimentLabels(expected_labels); 136 VerifyExperimentLabels(expected_labels);
137 } 137 }
138 138
139 TEST_F(GCAPIOmahaExperimentTest, 139 TEST_F(GCAPIOmahaExperimentTest,
140 SetReactivationLabelWithFakeMatchInAnExperimentAndNoRealMatch) { 140 SetReactivationLabelWithFakeMatchInAnExperimentAndNoRealMatch) {
141 base::string16 previous_labels(kSomeExperiments); 141 base::string16 previous_labels(kSomeExperiments);
142 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 142 previous_labels += google_update::kExperimentLabelSeparator;
143 previous_labels.append(L"blah_"); 143 previous_labels.append(L"blah_");
144 // Shouldn't match deletion criteria. 144 // Shouldn't match deletion criteria.
145 previous_labels.append(reactivation_label_); 145 previous_labels.append(reactivation_label_);
146 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 146 previous_labels += google_update::kExperimentLabelSeparator;
147 previous_labels.append(kSomeOtherExperiments); 147 previous_labels.append(kSomeOtherExperiments);
148 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels); 148 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
149 149
150 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 150 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
151 151
152 base::string16 expected_labels(kSomeExperiments); 152 base::string16 expected_labels(kSomeExperiments);
153 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 153 expected_labels += google_update::kExperimentLabelSeparator;
154 expected_labels.append(L"blah_"); 154 expected_labels.append(L"blah_");
155 expected_labels.append(reactivation_label_); 155 expected_labels.append(reactivation_label_);
156 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 156 expected_labels += google_update::kExperimentLabelSeparator;
157 expected_labels.append(kSomeOtherExperiments); 157 expected_labels.append(kSomeOtherExperiments);
158 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 158 expected_labels += google_update::kExperimentLabelSeparator;
159 expected_labels.append(reactivation_label_); 159 expected_labels.append(reactivation_label_);
160 VerifyExperimentLabels(expected_labels); 160 VerifyExperimentLabels(expected_labels);
161 } 161 }
162 162
163 TEST_F(GCAPIOmahaExperimentTest, 163 TEST_F(GCAPIOmahaExperimentTest,
164 SetReactivationLabelWithExistingEntryWithLabelAsPrefix) { 164 SetReactivationLabelWithExistingEntryWithLabelAsPrefix) {
165 base::string16 previous_labels(kSomeExperiments); 165 base::string16 previous_labels(kSomeExperiments);
166 previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 166 previous_labels += google_update::kExperimentLabelSeparator;
167 // Append prefix matching the label, but not followed by '='. 167 // Append prefix matching the label, but not followed by '='.
168 previous_labels.append(gcapi_internals::kReactivationLabel); 168 previous_labels.append(gcapi_internals::kReactivationLabel);
169 // Shouldn't match deletion criteria. 169 // Shouldn't match deletion criteria.
170 previous_labels.append(kSomeOtherExperiments); 170 previous_labels.append(kSomeOtherExperiments);
171 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels); 171 GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
172 172
173 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel)); 173 ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
174 174
175 base::string16 expected_labels(kSomeExperiments); 175 base::string16 expected_labels(kSomeExperiments);
176 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 176 expected_labels += google_update::kExperimentLabelSeparator;
177 expected_labels.append(gcapi_internals::kReactivationLabel); 177 expected_labels.append(gcapi_internals::kReactivationLabel);
178 expected_labels.append(kSomeOtherExperiments); 178 expected_labels.append(kSomeOtherExperiments);
179 expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep)); 179 expected_labels += google_update::kExperimentLabelSeparator;
180 expected_labels.append(reactivation_label_); 180 expected_labels.append(reactivation_label_);
181 VerifyExperimentLabels(expected_labels); 181 VerifyExperimentLabels(expected_labels);
182 } 182 }
183 183
184 } // namespace 184 } // namespace
OLDNEW
« no previous file with comments | « chrome/installer/gcapi/gcapi_omaha_experiment.cc ('k') | chrome/installer/util/google_update_experiment_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698