| OLD | NEW |
| 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "apps/saved_files_service.h" | 7 #include "apps/saved_files_service_impl.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/test/values_test_util.h" | 10 #include "base/test/values_test_util.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "chrome/browser/extensions/test_extension_environment.h" | 12 #include "chrome/browser/extensions/test_extension_environment.h" |
| 13 #include "chrome/test/base/testing_profile.h" | 13 #include "chrome/test/base/testing_profile.h" |
| 14 #include "extensions/browser/api/file_system/saved_files_service.h" |
| 14 #include "extensions/browser/extension_prefs.h" | 15 #include "extensions/browser/extension_prefs.h" |
| 15 #include "extensions/browser/extension_system.h" | 16 #include "extensions/browser/extension_system.h" |
| 16 #include "extensions/common/extension.h" | 17 #include "extensions/common/extension.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 19 |
| 19 #define TRACE_CALL(expression) \ | 20 #define TRACE_CALL(expression) \ |
| 20 do { \ | 21 do { \ |
| 21 SCOPED_TRACE(#expression); \ | 22 SCOPED_TRACE(#expression); \ |
| 22 expression; \ | 23 expression; \ |
| 23 } while (0) | 24 } while (0) |
| 24 | 25 |
| 25 using apps::SavedFileEntry; | 26 using apps::SavedFilesServiceImpl; |
| 26 using apps::SavedFilesService; | 27 using extensions::SavedFilesService; |
| 28 using Entry = extensions::SavedFilesService::Entry; |
| 27 | 29 |
| 28 namespace { | 30 namespace { |
| 29 | 31 |
| 30 std::string GenerateId(int i) { | 32 std::string GenerateId(int i) { |
| 31 return base::IntToString(i) + ":filename.ext"; | 33 return base::IntToString(i) + ":filename.ext"; |
| 32 } | 34 } |
| 33 | 35 |
| 34 } // namespace | 36 } // namespace |
| 35 | 37 |
| 36 class SavedFilesServiceUnitTest : public testing::Test { | 38 class SavedFilesServiceImplUnitTest : public testing::Test { |
| 37 protected: | 39 protected: |
| 38 void SetUp() override { | 40 void SetUp() override { |
| 39 testing::Test::SetUp(); | 41 testing::Test::SetUp(); |
| 40 extension_ = env_.MakeExtension(*base::test::ParseJson( | 42 extension_ = env_.MakeExtension(*base::test::ParseJson( |
| 41 "{" | 43 "{" |
| 42 " \"app\": {" | 44 " \"app\": {" |
| 43 " \"background\": {" | 45 " \"background\": {" |
| 44 " \"scripts\": [\"background.js\"]" | 46 " \"scripts\": [\"background.js\"]" |
| 45 " }" | 47 " }" |
| 46 " }," | 48 " }," |
| 47 " \"permissions\": [" | 49 " \"permissions\": [" |
| 48 " {\"fileSystem\": [\"retainEntries\"]}" | 50 " {\"fileSystem\": [\"retainEntries\"]}" |
| 49 " ]" | 51 " ]" |
| 50 "}")); | 52 "}")); |
| 51 service_ = SavedFilesService::Get(env_.profile()); | 53 service_ = SavedFilesServiceImpl::Get(env_.profile()); |
| 52 path_ = base::FilePath(FILE_PATH_LITERAL("filename.ext")); | 54 path_ = base::FilePath(FILE_PATH_LITERAL("filename.ext")); |
| 53 } | 55 } |
| 54 | 56 |
| 55 void TearDown() override { | 57 void TearDown() override { |
| 56 SavedFilesService::ClearMaxSequenceNumberForTest(); | 58 SavedFilesServiceImpl::ClearMaxSequenceNumberForTest(); |
| 57 SavedFilesService::ClearLruSizeForTest(); | 59 SavedFilesServiceImpl::ClearLruSizeForTest(); |
| 58 testing::Test::TearDown(); | 60 testing::Test::TearDown(); |
| 59 } | 61 } |
| 60 | 62 |
| 61 // Check that a registered file entry has the correct value. | 63 // Check that a registered file entry has the correct value. |
| 62 void CheckEntrySequenceNumber(int id, int sequence_number) { | 64 void CheckEntrySequenceNumber(int id, int sequence_number) { |
| 63 std::string id_string = GenerateId(id); | 65 std::string id_string = GenerateId(id); |
| 64 SCOPED_TRACE(id_string); | 66 SCOPED_TRACE(id_string); |
| 65 EXPECT_TRUE(service_->IsRegistered(extension_->id(), id_string)); | 67 EXPECT_TRUE(service_->IsRegistered(extension_->id(), id_string)); |
| 66 const SavedFileEntry* entry = | 68 const Entry* entry = service_->GetFileEntry(extension_->id(), id_string); |
| 67 service_->GetFileEntry(extension_->id(), id_string); | |
| 68 ASSERT_TRUE(entry); | 69 ASSERT_TRUE(entry); |
| 69 EXPECT_EQ(id_string, entry->id); | 70 EXPECT_EQ(id_string, entry->id); |
| 70 EXPECT_EQ(path_, entry->path); | 71 EXPECT_EQ(path_, entry->path); |
| 71 EXPECT_TRUE(entry->is_directory); | 72 EXPECT_TRUE(entry->is_directory); |
| 72 EXPECT_EQ(sequence_number, entry->sequence_number); | 73 EXPECT_EQ(sequence_number, entry->sequence_number); |
| 73 } | 74 } |
| 74 | 75 |
| 75 // Check that a range of registered file entries have the correct values. | 76 // Check that a range of registered file entries have the correct values. |
| 76 void CheckRangeEnqueuedInOrder(int start, int end) { | 77 void CheckRangeEnqueuedInOrder(int start, int end) { |
| 77 SavedFileEntry entry; | 78 Entry entry; |
| 78 for (int i = start; i < end; i++) { | 79 for (int i = start; i < end; i++) { |
| 79 CheckEntrySequenceNumber(i, i + 1); | 80 CheckEntrySequenceNumber(i, i + 1); |
| 80 } | 81 } |
| 81 } | 82 } |
| 82 | 83 |
| 83 extensions::TestExtensionEnvironment env_; | 84 extensions::TestExtensionEnvironment env_; |
| 84 const extensions::Extension* extension_; | 85 const extensions::Extension* extension_; |
| 85 SavedFilesService* service_; | 86 SavedFilesServiceImpl* service_; |
| 86 base::FilePath path_; | 87 base::FilePath path_; |
| 87 }; | 88 }; |
| 88 | 89 |
| 89 TEST_F(SavedFilesServiceUnitTest, RetainTwoFilesTest) { | 90 TEST_F(SavedFilesServiceImplUnitTest, RetainTwoFilesTest) { |
| 90 service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true); | 91 service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true); |
| 91 service_->RegisterFileEntry(extension_->id(), GenerateId(2), path_, true); | 92 service_->RegisterFileEntry(extension_->id(), GenerateId(2), path_, true); |
| 92 service_->RegisterFileEntry(extension_->id(), GenerateId(3), path_, true); | 93 service_->RegisterFileEntry(extension_->id(), GenerateId(3), path_, true); |
| 93 | 94 |
| 94 // Test that no entry has a sequence number. | 95 // Test that no entry has a sequence number. |
| 95 TRACE_CALL(CheckEntrySequenceNumber(1, 0)); | 96 TRACE_CALL(CheckEntrySequenceNumber(1, 0)); |
| 96 TRACE_CALL(CheckEntrySequenceNumber(2, 0)); | 97 TRACE_CALL(CheckEntrySequenceNumber(2, 0)); |
| 97 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); | 98 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); |
| 98 | 99 |
| 99 // Test that only entry #1 has a sequence number. | 100 // Test that only entry #1 has a sequence number. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 119 TRACE_CALL(CheckEntrySequenceNumber(1, 1)); | 120 TRACE_CALL(CheckEntrySequenceNumber(1, 1)); |
| 120 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); | 121 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); |
| 121 | 122 |
| 122 // Test that entry #1 has been assigned the next sequence number. | 123 // Test that entry #1 has been assigned the next sequence number. |
| 123 service_->EnqueueFileEntry(extension_->id(), GenerateId(1)); | 124 service_->EnqueueFileEntry(extension_->id(), GenerateId(1)); |
| 124 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); | 125 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); |
| 125 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); | 126 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); |
| 126 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); | 127 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); |
| 127 | 128 |
| 128 EXPECT_FALSE(service_->IsRegistered(extension_->id(), "another id")); | 129 EXPECT_FALSE(service_->IsRegistered(extension_->id(), "another id")); |
| 129 SavedFileEntry entry; | 130 Entry entry; |
| 130 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); | 131 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); |
| 131 | 132 |
| 132 // ClearQueueIfNoRetainPermission should be a no-op because the app has the | 133 // ClearQueueIfNoRetainPermission should be a no-op because the app has the |
| 133 // fileSystem.retainEntries permission. | 134 // fileSystem.retainEntries permission. |
| 134 service_->ClearQueueIfNoRetainPermission(extension_); | 135 service_->ClearQueueIfNoRetainPermission(extension_); |
| 135 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); | 136 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); |
| 136 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); | 137 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); |
| 137 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); | 138 TRACE_CALL(CheckEntrySequenceNumber(3, 0)); |
| 138 | 139 |
| 139 // Test that after a clear, retained file entries are unchanged, but file | 140 // Test that after a clear, retained file entries are unchanged, but file |
| 140 // entries that have been registered but not retained are no longer | 141 // entries that have been registered but not retained are no longer |
| 141 // registered. | 142 // registered. |
| 142 service_->Clear(extension_->id()); | 143 service_->Clear(extension_->id()); |
| 143 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); | 144 TRACE_CALL(CheckEntrySequenceNumber(1, 3)); |
| 144 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); | 145 TRACE_CALL(CheckEntrySequenceNumber(2, 2)); |
| 145 EXPECT_FALSE(service_->IsRegistered(extension_->id(), GenerateId(3))); | 146 EXPECT_FALSE(service_->IsRegistered(extension_->id(), GenerateId(3))); |
| 146 } | 147 } |
| 147 | 148 |
| 148 TEST_F(SavedFilesServiceUnitTest, NoRetainEntriesPermissionTest) { | 149 TEST_F(SavedFilesServiceImplUnitTest, NoRetainEntriesPermissionTest) { |
| 149 extension_ = env_.MakeExtension(*base::test::ParseJson( | 150 extension_ = env_.MakeExtension(*base::test::ParseJson( |
| 150 "{\"app\": {\"background\": {\"scripts\": [\"background.js\"]}}," | 151 "{\"app\": {\"background\": {\"scripts\": [\"background.js\"]}}," |
| 151 "\"permissions\": [\"fileSystem\"]}")); | 152 "\"permissions\": [\"fileSystem\"]}")); |
| 152 service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true); | 153 service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true); |
| 153 TRACE_CALL(CheckEntrySequenceNumber(1, 0)); | 154 TRACE_CALL(CheckEntrySequenceNumber(1, 0)); |
| 154 SavedFileEntry entry; | 155 Entry entry; |
| 155 service_->EnqueueFileEntry(extension_->id(), GenerateId(1)); | 156 service_->EnqueueFileEntry(extension_->id(), GenerateId(1)); |
| 156 TRACE_CALL(CheckEntrySequenceNumber(1, 1)); | 157 TRACE_CALL(CheckEntrySequenceNumber(1, 1)); |
| 157 EXPECT_FALSE(service_->IsRegistered(extension_->id(), "another id")); | 158 EXPECT_FALSE(service_->IsRegistered(extension_->id(), "another id")); |
| 158 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); | 159 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); |
| 159 | 160 |
| 160 // ClearQueueIfNoRetainPermission should clear the queue, since the app does | 161 // ClearQueueIfNoRetainPermission should clear the queue, since the app does |
| 161 // not have the "retainEntries" permission. | 162 // not have the "retainEntries" permission. |
| 162 service_->ClearQueueIfNoRetainPermission(extension_); | 163 service_->ClearQueueIfNoRetainPermission(extension_); |
| 163 std::vector<SavedFileEntry> entries = | 164 std::vector<Entry> entries = service_->GetAllFileEntries(extension_->id()); |
| 164 service_->GetAllFileEntries(extension_->id()); | |
| 165 EXPECT_TRUE(entries.empty()); | 165 EXPECT_TRUE(entries.empty()); |
| 166 } | 166 } |
| 167 | 167 |
| 168 TEST_F(SavedFilesServiceUnitTest, EvictionTest) { | 168 TEST_F(SavedFilesServiceImplUnitTest, EvictionTest) { |
| 169 SavedFilesService::SetLruSizeForTest(10); | 169 SavedFilesServiceImpl::SetLruSizeForTest(10); |
| 170 for (int i = 0; i < 10; i++) { | 170 for (int i = 0; i < 10; i++) { |
| 171 service_->RegisterFileEntry(extension_->id(), GenerateId(i), path_, true); | 171 service_->RegisterFileEntry(extension_->id(), GenerateId(i), path_, true); |
| 172 service_->EnqueueFileEntry(extension_->id(), GenerateId(i)); | 172 service_->EnqueueFileEntry(extension_->id(), GenerateId(i)); |
| 173 } | 173 } |
| 174 service_->RegisterFileEntry(extension_->id(), GenerateId(10), path_, true); | 174 service_->RegisterFileEntry(extension_->id(), GenerateId(10), path_, true); |
| 175 | 175 |
| 176 // Expect that entries 0 to 9 are in the queue, but 10 is not. | 176 // Expect that entries 0 to 9 are in the queue, but 10 is not. |
| 177 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 10)); | 177 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 10)); |
| 178 TRACE_CALL(CheckEntrySequenceNumber(10, 0)); | 178 TRACE_CALL(CheckEntrySequenceNumber(10, 0)); |
| 179 service_->EnqueueFileEntry(extension_->id(), GenerateId(10)); | 179 service_->EnqueueFileEntry(extension_->id(), GenerateId(10)); |
| 180 | 180 |
| 181 // Expect that entries 1 to 10 are in the queue, but entry 0 is not. | 181 // Expect that entries 1 to 10 are in the queue, but entry 0 is not. |
| 182 TRACE_CALL(CheckEntrySequenceNumber(0, 0)); | 182 TRACE_CALL(CheckEntrySequenceNumber(0, 0)); |
| 183 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 11)); | 183 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 11)); |
| 184 | 184 |
| 185 // Check that retained entries are unchanged after a clear. | 185 // Check that retained entries are unchanged after a clear. |
| 186 service_->Clear(extension_->id()); | 186 service_->Clear(extension_->id()); |
| 187 SavedFileEntry entry; | 187 Entry entry; |
| 188 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), GenerateId(0))); | 188 EXPECT_FALSE(service_->GetFileEntry(extension_->id(), GenerateId(0))); |
| 189 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 11)); | 189 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 11)); |
| 190 | 190 |
| 191 // Expect that entry 2 is now at the back of the queue, and no further entries | 191 // Expect that entry 2 is now at the back of the queue, and no further entries |
| 192 // have been evicted. | 192 // have been evicted. |
| 193 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); | 193 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); |
| 194 TRACE_CALL(CheckEntrySequenceNumber(2, 12)); | 194 TRACE_CALL(CheckEntrySequenceNumber(2, 12)); |
| 195 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 1)); | 195 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 1)); |
| 196 TRACE_CALL(CheckRangeEnqueuedInOrder(3, 11)); | 196 TRACE_CALL(CheckRangeEnqueuedInOrder(3, 11)); |
| 197 | 197 |
| 198 // Check that retained entries are unchanged after a clear. | 198 // Check that retained entries are unchanged after a clear. |
| 199 service_->Clear(extension_->id()); | 199 service_->Clear(extension_->id()); |
| 200 TRACE_CALL(CheckEntrySequenceNumber(2, 12)); | 200 TRACE_CALL(CheckEntrySequenceNumber(2, 12)); |
| 201 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 1)); | 201 TRACE_CALL(CheckRangeEnqueuedInOrder(1, 1)); |
| 202 TRACE_CALL(CheckRangeEnqueuedInOrder(3, 11)); | 202 TRACE_CALL(CheckRangeEnqueuedInOrder(3, 11)); |
| 203 } | 203 } |
| 204 | 204 |
| 205 TEST_F(SavedFilesServiceUnitTest, SequenceNumberCompactionTest) { | 205 TEST_F(SavedFilesServiceImplUnitTest, SequenceNumberCompactionTest) { |
| 206 SavedFilesService::SetMaxSequenceNumberForTest(8); | 206 SavedFilesServiceImpl::SetMaxSequenceNumberForTest(8); |
| 207 SavedFilesService::SetLruSizeForTest(8); | 207 SavedFilesServiceImpl::SetLruSizeForTest(8); |
| 208 for (int i = 0; i < 4; i++) { | 208 for (int i = 0; i < 4; i++) { |
| 209 service_->RegisterFileEntry(extension_->id(), GenerateId(i), path_, true); | 209 service_->RegisterFileEntry(extension_->id(), GenerateId(i), path_, true); |
| 210 service_->EnqueueFileEntry(extension_->id(), GenerateId(i)); | 210 service_->EnqueueFileEntry(extension_->id(), GenerateId(i)); |
| 211 } | 211 } |
| 212 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); | 212 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); |
| 213 service_->EnqueueFileEntry(extension_->id(), GenerateId(3)); | 213 service_->EnqueueFileEntry(extension_->id(), GenerateId(3)); |
| 214 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); | 214 service_->EnqueueFileEntry(extension_->id(), GenerateId(2)); |
| 215 | 215 |
| 216 // The sequence numbers should be sparse, as they have not gone over the | 216 // The sequence numbers should be sparse, as they have not gone over the |
| 217 // limit. | 217 // limit. |
| 218 TRACE_CALL(CheckEntrySequenceNumber(0, 1)); | 218 TRACE_CALL(CheckEntrySequenceNumber(0, 1)); |
| 219 TRACE_CALL(CheckEntrySequenceNumber(1, 2)); | 219 TRACE_CALL(CheckEntrySequenceNumber(1, 2)); |
| 220 TRACE_CALL(CheckEntrySequenceNumber(2, 7)); | 220 TRACE_CALL(CheckEntrySequenceNumber(2, 7)); |
| 221 TRACE_CALL(CheckEntrySequenceNumber(3, 6)); | 221 TRACE_CALL(CheckEntrySequenceNumber(3, 6)); |
| 222 service_->Clear(extension_->id()); | 222 service_->Clear(extension_->id()); |
| 223 TRACE_CALL(CheckEntrySequenceNumber(0, 1)); | 223 TRACE_CALL(CheckEntrySequenceNumber(0, 1)); |
| 224 TRACE_CALL(CheckEntrySequenceNumber(1, 2)); | 224 TRACE_CALL(CheckEntrySequenceNumber(1, 2)); |
| 225 TRACE_CALL(CheckEntrySequenceNumber(2, 7)); | 225 TRACE_CALL(CheckEntrySequenceNumber(2, 7)); |
| 226 TRACE_CALL(CheckEntrySequenceNumber(3, 6)); | 226 TRACE_CALL(CheckEntrySequenceNumber(3, 6)); |
| 227 | 227 |
| 228 // This should push the sequence number to the limit of 8, and trigger a | 228 // This should push the sequence number to the limit of 8, and trigger a |
| 229 // sequence number compaction. Expect that the sequence numbers are | 229 // sequence number compaction. Expect that the sequence numbers are |
| 230 // contiguous from 1 to 4. | 230 // contiguous from 1 to 4. |
| 231 service_->EnqueueFileEntry(extension_->id(), GenerateId(3)); | 231 service_->EnqueueFileEntry(extension_->id(), GenerateId(3)); |
| 232 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 4)); | 232 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 4)); |
| 233 service_->Clear(extension_->id()); | 233 service_->Clear(extension_->id()); |
| 234 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 4)); | 234 TRACE_CALL(CheckRangeEnqueuedInOrder(0, 4)); |
| 235 } | 235 } |
| OLD | NEW |