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

Side by Side Diff: client/settings_test.cc

Issue 999953002: Use LockFile/UnlockFile for Settings to port to Windows (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@lock-fileio-2
Patch Set: init Created 5 years, 8 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
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "client/settings.h" 15 #include "client/settings.h"
16 16
17 #include "gtest/gtest.h" 17 #include "gtest/gtest.h"
18 #include "test/errors.h"
18 #include "test/scoped_temp_dir.h" 19 #include "test/scoped_temp_dir.h"
19 #include "util/file/file_io.h" 20 #include "util/file/file_io.h"
20 21
21 namespace crashpad { 22 namespace crashpad {
22 namespace test { 23 namespace test {
23 namespace { 24 namespace {
24 25
25 class SettingsTest : public testing::Test { 26 class SettingsTest : public testing::Test {
26 public: 27 public:
27 SettingsTest() : settings_(settings_path()) {} 28 SettingsTest() : settings_(settings_path()) {}
28 29
29 base::FilePath settings_path() { 30 base::FilePath settings_path() {
30 return temp_dir_.path().Append("settings"); 31 return temp_dir_.path().Append(FILE_PATH_LITERAL("settings"));
31 } 32 }
32 33
33 Settings* settings() { return &settings_; } 34 Settings* settings() { return &settings_; }
34 35
35 void InitializeBadFile() { 36 void InitializeBadFile() {
36 ScopedFileHandle handle( 37 ScopedFileHandle handle(
37 LoggingOpenFileForWrite(settings_path(), 38 LoggingOpenFileForWrite(settings_path(),
38 FileWriteMode::kTruncateOrCreate, 39 FileWriteMode::kTruncateOrCreate,
39 FilePermissions::kWorldReadable)); 40 FilePermissions::kWorldReadable));
40 ASSERT_TRUE(handle.is_valid()); 41 ASSERT_TRUE(handle.is_valid());
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 EXPECT_TRUE(settings()->GetUploadsEnabled(&enabled)); 145 EXPECT_TRUE(settings()->GetUploadsEnabled(&enabled));
145 EXPECT_TRUE(enabled); 146 EXPECT_TRUE(enabled);
146 } 147 }
147 148
148 TEST_F(SettingsTest, UnlinkFile) { 149 TEST_F(SettingsTest, UnlinkFile) {
149 UUID client_id; 150 UUID client_id;
150 EXPECT_TRUE(settings()->GetClientID(&client_id)); 151 EXPECT_TRUE(settings()->GetClientID(&client_id));
151 EXPECT_TRUE(settings()->SetUploadsEnabled(true)); 152 EXPECT_TRUE(settings()->SetUploadsEnabled(true));
152 EXPECT_TRUE(settings()->SetLastUploadAttemptTime(time(nullptr))); 153 EXPECT_TRUE(settings()->SetLastUploadAttemptTime(time(nullptr)));
153 154
154 EXPECT_EQ(0, unlink(settings_path().value().c_str())); 155 #if defined(OS_WIN)
156 EXPECT_EQ(0, _wunlink(settings_path().value().c_str()));
Robert Sesek 2015/04/01 15:08:26 Log the message, like for POSIX?
scottmg 2015/04/01 19:32:10 Done.
157 #else
158 EXPECT_EQ(0, unlink(settings_path().value().c_str()))
159 << ErrnoMessage("unlink");
160 #endif
155 161
156 Settings local_settings(settings_path()); 162 Settings local_settings(settings_path());
157 EXPECT_TRUE(local_settings.Initialize()); 163 EXPECT_TRUE(local_settings.Initialize());
158 UUID new_client_id; 164 UUID new_client_id;
159 EXPECT_TRUE(local_settings.GetClientID(&new_client_id)); 165 EXPECT_TRUE(local_settings.GetClientID(&new_client_id));
160 EXPECT_NE(client_id, new_client_id); 166 EXPECT_NE(client_id, new_client_id);
161 167
162 // Check that all values are reset. 168 // Check that all values are reset.
163 bool enabled = true; 169 bool enabled = true;
164 EXPECT_TRUE(local_settings.GetUploadsEnabled(&enabled)); 170 EXPECT_TRUE(local_settings.GetUploadsEnabled(&enabled));
165 EXPECT_FALSE(enabled); 171 EXPECT_FALSE(enabled);
166 172
167 time_t time = -1; 173 time_t time = -1;
168 EXPECT_TRUE(local_settings.GetLastUploadAttemptTime(&time)); 174 EXPECT_TRUE(local_settings.GetLastUploadAttemptTime(&time));
169 EXPECT_EQ(0, time); 175 EXPECT_EQ(0, time);
170 } 176 }
171 177
172 } // namespace 178 } // namespace
173 } // namespace test 179 } // namespace test
174 } // namespace crashpad 180 } // namespace crashpad
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698