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

Side by Side Diff: chrome/browser/chromeos/file_system_provider/service_unittest.cc

Issue 1221093002: Add support for refreshing contents of providers which don't support watchers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests. Created 5 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/chromeos/file_system_provider/service.h" 5 #include "chrome/browser/chromeos/file_system_provider/service.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 410
411 TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) { 411 TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
412 LoggingObserver observer; 412 LoggingObserver observer;
413 service_->AddObserver(&observer); 413 service_->AddObserver(&observer);
414 414
415 // Remember a fake file system first in order to be able to restore it. 415 // Remember a fake file system first in order to be able to restore it.
416 MountOptions options(kFileSystemId, kDisplayName); 416 MountOptions options(kFileSystemId, kDisplayName);
417 options.supports_notify_tag = true; 417 options.supports_notify_tag = true;
418 ProvidedFileSystemInfo file_system_info( 418 ProvidedFileSystemInfo file_system_info(
419 kExtensionId, options, base::FilePath(FILE_PATH_LITERAL("/a/b/c")), 419 kExtensionId, options, base::FilePath(FILE_PATH_LITERAL("/a/b/c")),
420 false /* configurable */, extensions::SOURCE_FILE); 420 false /* configurable */, false /* watchable */, extensions::SOURCE_FILE);
421 Watchers fake_watchers; 421 Watchers fake_watchers;
422 fake_watchers[WatcherKey(fake_watcher_.entry_path, fake_watcher_.recursive)] = 422 fake_watchers[WatcherKey(fake_watcher_.entry_path, fake_watcher_.recursive)] =
423 fake_watcher_; 423 fake_watcher_;
424 registry_->RememberFileSystem(file_system_info, fake_watchers); 424 registry_->RememberFileSystem(file_system_info, fake_watchers);
425 425
426 EXPECT_EQ(0u, observer.mounts.size()); 426 EXPECT_EQ(0u, observer.mounts.size());
427 427
428 // Directly call the observer's method. 428 // Directly call the observer's method.
429 service_->OnExtensionLoaded(profile_, extension_.get()); 429 service_->OnExtensionLoaded(profile_, extension_.get());
430 430
431 ASSERT_EQ(1u, observer.mounts.size()); 431 ASSERT_EQ(1u, observer.mounts.size());
432 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error()); 432 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
433 EXPECT_EQ(MOUNT_CONTEXT_RESTORE, observer.mounts[0].context()); 433 EXPECT_EQ(MOUNT_CONTEXT_RESTORE, observer.mounts[0].context());
434 434
435 EXPECT_EQ(file_system_info.extension_id(), 435 EXPECT_EQ(file_system_info.extension_id(),
436 observer.mounts[0].file_system_info().extension_id()); 436 observer.mounts[0].file_system_info().extension_id());
437 EXPECT_EQ(file_system_info.file_system_id(), 437 EXPECT_EQ(file_system_info.file_system_id(),
438 observer.mounts[0].file_system_info().file_system_id()); 438 observer.mounts[0].file_system_info().file_system_id());
439 EXPECT_EQ(file_system_info.writable(), 439 EXPECT_EQ(file_system_info.writable(),
440 observer.mounts[0].file_system_info().writable()); 440 observer.mounts[0].file_system_info().watchable());
441 EXPECT_EQ(file_system_info.supports_notify_tag(), 441 EXPECT_EQ(file_system_info.supports_notify_tag(),
442 observer.mounts[0].file_system_info().supports_notify_tag()); 442 observer.mounts[0].file_system_info().supports_notify_tag());
443 443
444 std::vector<ProvidedFileSystemInfo> file_system_info_list = 444 std::vector<ProvidedFileSystemInfo> file_system_info_list =
445 service_->GetProvidedFileSystemInfoList(); 445 service_->GetProvidedFileSystemInfoList();
446 ASSERT_EQ(1u, file_system_info_list.size()); 446 ASSERT_EQ(1u, file_system_info_list.size());
447 447
448 ProvidedFileSystemInterface* const file_system = 448 ProvidedFileSystemInterface* const file_system =
449 service_->GetProvidedFileSystem(kExtensionId, kFileSystemId); 449 service_->GetProvidedFileSystem(kExtensionId, kFileSystemId);
450 ASSERT_TRUE(file_system); 450 ASSERT_TRUE(file_system);
(...skipping 23 matching lines...) Expand all
474 EXPECT_EQ(base::File::FILE_OK, 474 EXPECT_EQ(base::File::FILE_OK,
475 service_->MountFileSystem( 475 service_->MountFileSystem(
476 kExtensionId, MountOptions(kFileSystemId, kDisplayName))); 476 kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
477 ASSERT_EQ(1u, observer.mounts.size()); 477 ASSERT_EQ(1u, observer.mounts.size());
478 478
479 ASSERT_TRUE(registry_->file_system_info()); 479 ASSERT_TRUE(registry_->file_system_info());
480 EXPECT_EQ(kExtensionId, registry_->file_system_info()->extension_id()); 480 EXPECT_EQ(kExtensionId, registry_->file_system_info()->extension_id());
481 EXPECT_EQ(kFileSystemId, registry_->file_system_info()->file_system_id()); 481 EXPECT_EQ(kFileSystemId, registry_->file_system_info()->file_system_id());
482 EXPECT_EQ(kDisplayName, registry_->file_system_info()->display_name()); 482 EXPECT_EQ(kDisplayName, registry_->file_system_info()->display_name());
483 EXPECT_FALSE(registry_->file_system_info()->writable()); 483 EXPECT_FALSE(registry_->file_system_info()->writable());
484 EXPECT_FALSE(registry_->file_system_info()->configurable());
485 EXPECT_FALSE(registry_->file_system_info()->watchable());
484 EXPECT_FALSE(registry_->file_system_info()->supports_notify_tag()); 486 EXPECT_FALSE(registry_->file_system_info()->supports_notify_tag());
485 ASSERT_TRUE(registry_->watchers()); 487 ASSERT_TRUE(registry_->watchers());
486 488
487 service_->RemoveObserver(&observer); 489 service_->RemoveObserver(&observer);
488 } 490 }
489 491
490 TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountOnShutdown) { 492 TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountOnShutdown) {
491 LoggingObserver observer; 493 LoggingObserver observer;
492 service_->AddObserver(&observer); 494 service_->AddObserver(&observer);
493 495
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 EXPECT_EQ(1u, observer.unmounts.size()); 542 EXPECT_EQ(1u, observer.unmounts.size());
541 EXPECT_FALSE(registry_->file_system_info()); 543 EXPECT_FALSE(registry_->file_system_info());
542 EXPECT_FALSE(registry_->watchers()); 544 EXPECT_FALSE(registry_->watchers());
543 } 545 }
544 546
545 service_->RemoveObserver(&observer); 547 service_->RemoveObserver(&observer);
546 } 548 }
547 549
548 } // namespace file_system_provider 550 } // namespace file_system_provider
549 } // namespace chromeos 551 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698