Skip to content

GitLab

T
tangled
Commit f7ab7398 authored by dgrogan@chromium.org's avatar dgrogan@chromium.org
Browse files
Options

Revert 282130 "Adds API test for imageWriterPrivate.writeFromFile" 

> Adds API test for imageWriterPrivate.writeFromFile
> 
> BUG=384650
> 
> Review URL: https://codereview.chromium.org/336923002

TBR=haven@chromium.org

Review URL: https://codereview.chromium.org/384513002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282141 0039d316-1c4b-4281-b951-d872f2087c98
parent 2fd86ea1
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 413 deletions
chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc
View file @ f7ab7398
...@@ -22,12 +22,16 @@ class ImageWriterDestroyPartitionsOperationTest ...@@ -22,12 +22,16 @@ class ImageWriterDestroyPartitionsOperationTest
TEST_F(ImageWriterDestroyPartitionsOperationTest, EndToEnd) { TEST_F(ImageWriterDestroyPartitionsOperationTest, EndToEnd) {
TestingProfile profile; TestingProfile profile;
MockOperationManager manager(&profile); MockOperationManager manager(&profile);
scoped_refptr<FakeImageWriterClient> client = FakeImageWriterClient::Create();
scoped_refptr<DestroyPartitionsOperation> operation( scoped_refptr<DestroyPartitionsOperation> operation(
new DestroyPartitionsOperation( new DestroyPartitionsOperation(manager.AsWeakPtr(),
manager.AsWeakPtr(), kDummyExtensionId,
kDummyExtensionId, test_device_path_.AsUTF8Unsafe()));
test_utils_.GetDevicePath().AsUTF8Unsafe()));
#if !defined(OS_CHROMEOS)
operation->SetUtilityClientForTesting(client);
#endif
EXPECT_CALL( EXPECT_CALL(
manager, manager,
...@@ -50,10 +54,10 @@ TEST_F(ImageWriterDestroyPartitionsOperationTest, EndToEnd) { ...@@ -50,10 +54,10 @@ TEST_F(ImageWriterDestroyPartitionsOperationTest, EndToEnd) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
test_utils_.GetUtilityClient()->Progress(0); client->Progress(0);
test_utils_.GetUtilityClient()->Progress(50); client->Progress(50);
test_utils_.GetUtilityClient()->Progress(100); client->Progress(100);
test_utils_.GetUtilityClient()->Success(); client->Success();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#endif #endif
......
chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc
View file @ f7ab7398
...@@ -2,54 +2,30 @@ ...@@ -2,54 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "base/message_loop/message_loop.h"
#include "chrome/browser/extensions/api/file_system/file_system_api.h"
#include "chrome/browser/extensions/api/image_writer_private/operation.h"
#include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h"
#include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
#include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/common/extensions/api/image_writer_private.h" #include "chrome/common/extensions/api/image_writer_private.h"
#include "content/public/browser/browser_thread.h"
namespace extensions { namespace extensions {
using api::image_writer_private::RemovableStorageDevice; using api::image_writer_private::RemovableStorageDevice;
using extensions::image_writer::FakeImageWriterClient;
class ImageWriterPrivateApiTest : public ExtensionApiTest { class ImageWriterPrivateApiTest : public ExtensionApiTest {
public: public:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { virtual void SetUpOnMainThread() OVERRIDE {
ExtensionApiTest::SetUpInProcessBrowserTestFixture();
test_utils_.SetUp(true);
ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetImagePath(),
image_writer::kImagePattern,
image_writer::kTestFileSize));
ASSERT_TRUE(test_utils_.FillFile(test_utils_.GetDevicePath(),
image_writer::kDevicePattern,
image_writer::kTestFileSize));
scoped_refptr<StorageDeviceList> device_list(new StorageDeviceList); scoped_refptr<StorageDeviceList> device_list(new StorageDeviceList);
RemovableStorageDevice* expected1 = new RemovableStorageDevice(); RemovableStorageDevice* expected1 = new RemovableStorageDevice();
expected1->vendor = "Vendor 1"; expected1->vendor = "Vendor 1";
expected1->model = "Model 1"; expected1->model = "Model 1";
expected1->capacity = image_writer::kTestFileSize; expected1->capacity = 1 << 20;
#if defined(OS_WIN) expected1->storage_unit_id = "/test/id/1";
expected1->storage_unit_id = test_utils_.GetDevicePath().AsUTF8Unsafe();
#else
expected1->storage_unit_id = test_utils_.GetDevicePath().value();
#endif
RemovableStorageDevice* expected2 = new RemovableStorageDevice(); RemovableStorageDevice* expected2 = new RemovableStorageDevice();
expected2->vendor = "Vendor 2"; expected2->vendor = "Vendor 2";
expected2->model = "Model 2"; expected2->model = "Model 2";
expected2->capacity = image_writer::kTestFileSize << 2; expected2->capacity = 1 << 22;
#if defined(OS_WIN) expected2->storage_unit_id = "/test/id/2";
expected2->storage_unit_id = test_utils_.GetDevicePath().AsUTF8Unsafe();
#else
expected2->storage_unit_id = test_utils_.GetDevicePath().value();
#endif
linked_ptr<RemovableStorageDevice> device1(expected1); linked_ptr<RemovableStorageDevice> device1(expected1);
device_list->data.push_back(device1); device_list->data.push_back(device1);
...@@ -59,43 +35,9 @@ class ImageWriterPrivateApiTest : public ExtensionApiTest { ...@@ -59,43 +35,9 @@ class ImageWriterPrivateApiTest : public ExtensionApiTest {
RemovableStorageProvider::SetDeviceListForTesting(device_list); RemovableStorageProvider::SetDeviceListForTesting(device_list);
} }
virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { virtual void CleanUpOnMainThread() OVERRIDE {
ExtensionApiTest::TearDownInProcessBrowserTestFixture();
test_utils_.TearDown();
RemovableStorageProvider::ClearDeviceListForTesting(); RemovableStorageProvider::ClearDeviceListForTesting();
FileSystemChooseEntryFunction::StopSkippingPickerForTest();
}
#if !defined(OS_CHROMEOS)
void ImageWriterUtilityClientCall() {
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
base::Bind(&FakeImageWriterClient::Progress,
test_utils_.GetUtilityClient(),
0));
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
base::Bind(&FakeImageWriterClient::Progress,
test_utils_.GetUtilityClient(),
50));
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
base::Bind(&FakeImageWriterClient::Progress,
test_utils_.GetUtilityClient(),
100));
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
base::Bind(&FakeImageWriterClient::Success,
test_utils_.GetUtilityClient()));
} }
#endif
protected:
image_writer::ImageWriterTestUtils test_utils_;
}; };
IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) { IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) {
...@@ -103,23 +45,4 @@ IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) { ...@@ -103,23 +45,4 @@ IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestListDevices) {
<< message_; << message_;
} }
IN_PROC_BROWSER_TEST_F(ImageWriterPrivateApiTest, TestWriteFromFile) {
FileSystemChooseEntryFunction::RegisterTempExternalFileSystemForTest(
"test_temp", test_utils_.GetTempDir());
base::FilePath selected_image(test_utils_.GetImagePath());
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
&selected_image);
#if !defined(OS_CHROMEOS)
test_utils_.GetUtilityClient()->SetWriteCallback(base::Bind(
&ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this));
test_utils_.GetUtilityClient()->SetVerifyCallback(base::Bind(
&ImageWriterPrivateApiTest::ImageWriterUtilityClientCall, this));
#endif
ASSERT_TRUE(RunPlatformAppTest("image_writer_private/write_from_file"))
<< message_;
}
} // namespace extensions } // namespace extensions
chrome/browser/extensions/api/image_writer_private/operation.cc
View file @ f7ab7398
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/lazy_instance.h"
#include "base/threading/worker_pool.h" #include "base/threading/worker_pool.h"
#include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
#include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
...@@ -25,11 +24,6 @@ const int kMD5BufferSize = 1024; ...@@ -25,11 +24,6 @@ const int kMD5BufferSize = 1024;
const char kChromeOSTempRoot[] = "/var/tmp"; const char kChromeOSTempRoot[] = "/var/tmp";
#endif #endif
#if !defined(OS_CHROMEOS)
static base::LazyInstance<scoped_refptr<ImageWriterUtilityClient> >
g_utility_client = LAZY_INSTANCE_INITIALIZER;
#endif
Operation::Operation(base::WeakPtr<OperationManager> manager, Operation::Operation(base::WeakPtr<OperationManager> manager,
const ExtensionId& extension_id, const ExtensionId& extension_id,
const std::string& device_path) const std::string& device_path)
...@@ -67,10 +61,11 @@ image_writer_api::Stage Operation::GetStage() { ...@@ -67,10 +61,11 @@ image_writer_api::Stage Operation::GetStage() {
} }
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
// static
void Operation::SetUtilityClientForTesting( void Operation::SetUtilityClientForTesting(
scoped_refptr<ImageWriterUtilityClient> client) { scoped_refptr<ImageWriterUtilityClient> client) {
g_utility_client.Get() = client; image_writer_client_ = client;
AddCleanUpFunction(
base::Bind(&ImageWriterUtilityClient::Shutdown, image_writer_client_));
} }
#endif #endif
...@@ -249,10 +244,6 @@ void Operation::CompleteAndContinue(const base::Closure& continuation) { ...@@ -249,10 +244,6 @@ void Operation::CompleteAndContinue(const base::Closure& continuation) {
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
void Operation::StartUtilityClient() { void Operation::StartUtilityClient() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK_CURRENTLY_ON(BrowserThread::FILE);
if (g_utility_client.Get()) {
image_writer_client_ = g_utility_client.Get();
return;
}
if (!image_writer_client_) { if (!image_writer_client_) {
image_writer_client_ = new ImageWriterUtilityClient(); image_writer_client_ = new ImageWriterUtilityClient();
AddCleanUpFunction(base::Bind(&Operation::StopUtilityClient, this)); AddCleanUpFunction(base::Bind(&Operation::StopUtilityClient, this));
......
chrome/browser/extensions/api/image_writer_private/operation.h
View file @ f7ab7398
...@@ -74,7 +74,7 @@ class Operation : public base::RefCountedThreadSafe<Operation> { ...@@ -74,7 +74,7 @@ class Operation : public base::RefCountedThreadSafe<Operation> {
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
// Set an ImageWriterClient to use. Should be called only when testing. // Set an ImageWriterClient to use. Should be called only when testing.
static void SetUtilityClientForTesting( void SetUtilityClientForTesting(
scoped_refptr<ImageWriterUtilityClient> client); scoped_refptr<ImageWriterUtilityClient> client);
#endif #endif
......
chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
View file @ f7ab7398
...@@ -58,7 +58,8 @@ KeyedService* BuildFakeExtensionSystem(content::BrowserContext* profile) { ...@@ -58,7 +58,8 @@ KeyedService* BuildFakeExtensionSystem(content::BrowserContext* profile) {
namespace { namespace {
class ImageWriterOperationManagerTest : public ImageWriterUnitTestBase { class ImageWriterOperationManagerTest
: public ImageWriterUnitTestBase {
public: public:
void StartCallback(bool success, const std::string& error) { void StartCallback(bool success, const std::string& error) {
started_ = true; started_ = true;
...@@ -110,11 +111,11 @@ TEST_F(ImageWriterOperationManagerTest, WriteFromFile) { ...@@ -110,11 +111,11 @@ TEST_F(ImageWriterOperationManagerTest, WriteFromFile) {
OperationManager manager(&test_profile_); OperationManager manager(&test_profile_);
manager.StartWriteFromFile( manager.StartWriteFromFile(
kDummyExtensionId, kDummyExtensionId,
test_utils_.GetImagePath(), test_image_path_,
test_utils_.GetDevicePath().AsUTF8Unsafe(), test_device_path_.AsUTF8Unsafe(),
base::Bind(&ImageWriterOperationManagerTest::StartCallback, base::Bind(&ImageWriterOperationManagerTest::StartCallback,
base::Unretained(this))); base::Unretained(this)));
EXPECT_TRUE(started_); EXPECT_TRUE(started_);
EXPECT_TRUE(start_success_); EXPECT_TRUE(start_success_);
...@@ -137,7 +138,7 @@ TEST_F(ImageWriterOperationManagerTest, DestroyPartitions) { ...@@ -137,7 +138,7 @@ TEST_F(ImageWriterOperationManagerTest, DestroyPartitions) {
manager.DestroyPartitions( manager.DestroyPartitions(
kDummyExtensionId, kDummyExtensionId,
test_utils_.GetDevicePath().AsUTF8Unsafe(), test_device_path_.AsUTF8Unsafe(),
base::Bind(&ImageWriterOperationManagerTest::StartCallback, base::Bind(&ImageWriterOperationManagerTest::StartCallback,
base::Unretained(this))); base::Unretained(this)));
......
chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
View file @ f7ab7398
...@@ -71,25 +71,26 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { ...@@ -71,25 +71,26 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase {
ImageWriterUnitTestBase::SetUp(); ImageWriterUnitTestBase::SetUp();
// Create the zip file. // Create the zip file.
base::FilePath image_dir = test_utils_.GetTempDir().AppendASCII("zip"); base::FilePath image_dir = temp_dir_.path().AppendASCII("zip");
ASSERT_TRUE(base::CreateDirectory(image_dir)); ASSERT_TRUE(base::CreateDirectory(image_dir));
ASSERT_TRUE(base::CreateTemporaryFileInDir(image_dir, &image_path_)); ASSERT_TRUE(base::CreateTemporaryFileInDir(image_dir, &image_path_));
test_utils_.FillFile(image_path_, kImagePattern, kTestFileSize); FillFile(image_path_, kImagePattern, kTestFileSize);
zip_file_ = test_utils_.GetTempDir().AppendASCII("test_image.zip"); zip_file_ = temp_dir_.path().AppendASCII("test_image.zip");
ASSERT_TRUE(zip::Zip(image_dir, zip_file_, true)); ASSERT_TRUE(zip::Zip(image_dir, zip_file_, true));
// Operation setup. // Operation setup.
operation_ = operation_ = new OperationForTest(manager_.AsWeakPtr(),
new OperationForTest(manager_.AsWeakPtr(), kDummyExtensionId,
kDummyExtensionId, test_device_path_.AsUTF8Unsafe());
test_utils_.GetDevicePath().AsUTF8Unsafe()); client_ = FakeImageWriterClient::Create();
operation_->SetImagePath(test_utils_.GetImagePath()); operation_->SetImagePath(test_image_path_);
} }
virtual void TearDown() OVERRIDE { virtual void TearDown() OVERRIDE {
// Ensure all callbacks have been destroyed and cleanup occurs. // Ensure all callbacks have been destroyed and cleanup occurs.
client_->Shutdown();
operation_->Cancel(); operation_->Cancel();
ImageWriterUnitTestBase::TearDown(); ImageWriterUnitTestBase::TearDown();
...@@ -101,6 +102,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { ...@@ -101,6 +102,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase {
scoped_ptr<TestingProfile> profile_; scoped_ptr<TestingProfile> profile_;
MockOperationManager manager_; MockOperationManager manager_;
scoped_refptr<FakeImageWriterClient> client_;
scoped_refptr<OperationForTest> operation_; scoped_refptr<OperationForTest> operation_;
}; };
...@@ -152,6 +154,10 @@ TEST_F(ImageWriterOperationTest, UnzipZipFile) { ...@@ -152,6 +154,10 @@ TEST_F(ImageWriterOperationTest, UnzipZipFile) {
#if defined(OS_LINUX) #if defined(OS_LINUX)
TEST_F(ImageWriterOperationTest, WriteImageToDevice) { TEST_F(ImageWriterOperationTest, WriteImageToDevice) {
#if !defined(OS_CHROMEOS)
operation_->SetUtilityClientForTesting(client_);
#endif
EXPECT_CALL(manager_, OnError(kDummyExtensionId, _, _, _)).Times(0); EXPECT_CALL(manager_, OnError(kDummyExtensionId, _, _, _)).Times(0);
EXPECT_CALL(manager_, EXPECT_CALL(manager_,
OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _)) OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _))
...@@ -173,10 +179,10 @@ TEST_F(ImageWriterOperationTest, WriteImageToDevice) { ...@@ -173,10 +179,10 @@ TEST_F(ImageWriterOperationTest, WriteImageToDevice) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
test_utils_.GetUtilityClient()->Progress(0); client_->Progress(0);
test_utils_.GetUtilityClient()->Progress(kTestFileSize / 2); client_->Progress(kTestFileSize / 2);
test_utils_.GetUtilityClient()->Progress(kTestFileSize); client_->Progress(kTestFileSize);
test_utils_.GetUtilityClient()->Success(); client_->Success();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#endif #endif
...@@ -188,6 +194,8 @@ TEST_F(ImageWriterOperationTest, WriteImageToDevice) { ...@@ -188,6 +194,8 @@ TEST_F(ImageWriterOperationTest, WriteImageToDevice) {
// are skipped. // are skipped.
TEST_F(ImageWriterOperationTest, VerifyFileSuccess) { TEST_F(ImageWriterOperationTest, VerifyFileSuccess) {
operation_->SetUtilityClientForTesting(client_);
EXPECT_CALL(manager_, OnError(kDummyExtensionId, _, _, _)).Times(0); EXPECT_CALL(manager_, OnError(kDummyExtensionId, _, _, _)).Times(0);
EXPECT_CALL( EXPECT_CALL(
manager_, manager_,
...@@ -202,8 +210,7 @@ TEST_F(ImageWriterOperationTest, VerifyFileSuccess) { ...@@ -202,8 +210,7 @@ TEST_F(ImageWriterOperationTest, VerifyFileSuccess) {
OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, 100)) OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, 100))
.Times(AtLeast(1)); .Times(AtLeast(1));
test_utils_.FillFile( FillFile(test_device_path_, kImagePattern, kTestFileSize);
test_utils_.GetDevicePath(), kImagePattern, kTestFileSize);
operation_->Start(); operation_->Start();
content::BrowserThread::PostTask(content::BrowserThread::FILE, content::BrowserThread::PostTask(content::BrowserThread::FILE,
...@@ -214,17 +221,17 @@ TEST_F(ImageWriterOperationTest, VerifyFileSuccess) { ...@@ -214,17 +221,17 @@ TEST_F(ImageWriterOperationTest, VerifyFileSuccess) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS) client_->Progress(0);
test_utils_.GetUtilityClient()->Progress(0); client_->Progress(kTestFileSize / 2);
test_utils_.GetUtilityClient()->Progress(kTestFileSize / 2); client_->Progress(kTestFileSize);
test_utils_.GetUtilityClient()->Progress(kTestFileSize); client_->Success();
test_utils_.GetUtilityClient()->Success();
#endif
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
TEST_F(ImageWriterOperationTest, VerifyFileFailure) { TEST_F(ImageWriterOperationTest, VerifyFileFailure) {
operation_->SetUtilityClientForTesting(client_);
EXPECT_CALL( EXPECT_CALL(
manager_, manager_,
OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _)) OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _))
...@@ -239,8 +246,7 @@ TEST_F(ImageWriterOperationTest, VerifyFileFailure) { ...@@ -239,8 +246,7 @@ TEST_F(ImageWriterOperationTest, VerifyFileFailure) {
OnError(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _, _)) OnError(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _, _))
.Times(1); .Times(1);
test_utils_.FillFile( FillFile(test_device_path_, kDevicePattern, kTestFileSize);
test_utils_.GetDevicePath(), kDevicePattern, kTestFileSize);
operation_->Start(); operation_->Start();
content::BrowserThread::PostTask(content::BrowserThread::FILE, content::BrowserThread::PostTask(content::BrowserThread::FILE,
...@@ -251,9 +257,9 @@ TEST_F(ImageWriterOperationTest, VerifyFileFailure) { ...@@ -251,9 +257,9 @@ TEST_F(ImageWriterOperationTest, VerifyFileFailure) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
test_utils_.GetUtilityClient()->Progress(0); client_->Progress(0);
test_utils_.GetUtilityClient()->Progress(kTestFileSize / 2); client_->Progress(kTestFileSize / 2);
test_utils_.GetUtilityClient()->Error(error::kVerificationFailed); client_->Error(error::kVerificationFailed);
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
......
chrome/browser/extensions/api/image_writer_private/test_utils.cc
View file @ f7ab7398
...@@ -77,9 +77,6 @@ void FakeImageWriterClient::Write(const ProgressCallback& progress_callback, ...@@ -77,9 +77,6 @@ void FakeImageWriterClient::Write(const ProgressCallback& progress_callback,
progress_callback_ = progress_callback; progress_callback_ = progress_callback;
success_callback_ = success_callback; success_callback_ = success_callback;
error_callback_ = error_callback; error_callback_ = error_callback;
if (!write_callback_.is_null())
write_callback_.Run();
} }
void FakeImageWriterClient::Verify(const ProgressCallback& progress_callback, void FakeImageWriterClient::Verify(const ProgressCallback& progress_callback,
...@@ -90,9 +87,6 @@ void FakeImageWriterClient::Verify(const ProgressCallback& progress_callback, ...@@ -90,9 +87,6 @@ void FakeImageWriterClient::Verify(const ProgressCallback& progress_callback,
progress_callback_ = progress_callback; progress_callback_ = progress_callback;
success_callback_ = success_callback; success_callback_ = success_callback;
error_callback_ = error_callback; error_callback_ = error_callback;
if (!verify_callback_.is_null())
verify_callback_.Run();
} }
void FakeImageWriterClient::Cancel(const CancelCallback& cancel_callback) { void FakeImageWriterClient::Cancel(const CancelCallback& cancel_callback) {
...@@ -101,55 +95,35 @@ void FakeImageWriterClient::Cancel(const CancelCallback& cancel_callback) { ...@@ -101,55 +95,35 @@ void FakeImageWriterClient::Cancel(const CancelCallback& cancel_callback) {
void FakeImageWriterClient::Shutdown() { void FakeImageWriterClient::Shutdown() {
// Clear handlers to not hold any reference to the caller. // Clear handlers to not hold any reference to the caller.
success_callback_.Reset(); success_callback_ = base::Closure();
progress_callback_.Reset(); progress_callback_ = base::Callback<void(int64)>();
error_callback_.Reset(); error_callback_ = base::Callback<void(const std::string&)>();
cancel_callback_.Reset(); cancel_callback_ = base::Closure();
write_callback_.Reset();
verify_callback_.Reset();
}
void FakeImageWriterClient::SetWriteCallback(
const base::Closure& write_callback) {
write_callback_ = write_callback;
}
void FakeImageWriterClient::SetVerifyCallback(
const base::Closure& verify_callback) {
verify_callback_ = verify_callback;
} }
void FakeImageWriterClient::Progress(int64 progress) { void FakeImageWriterClient::Progress(int64 progress) {
if (!progress_callback_.is_null()) progress_callback_.Run(progress);
progress_callback_.Run(progress);
} }
void FakeImageWriterClient::Success() { void FakeImageWriterClient::Success() { success_callback_.Run(); }
if (!success_callback_.is_null())
success_callback_.Run();
}
void FakeImageWriterClient::Error(const std::string& message) { void FakeImageWriterClient::Error(const std::string& message) {
if (!error_callback_.is_null()) error_callback_.Run(message);
error_callback_.Run(message);
} }
void FakeImageWriterClient::Cancel() { void FakeImageWriterClient::Cancel() { cancel_callback_.Run(); }
if (!cancel_callback_.is_null())
cancel_callback_.Run();
}
ImageWriterTestUtils::ImageWriterTestUtils() { scoped_refptr<FakeImageWriterClient> FakeImageWriterClient::Create() {
} return scoped_refptr<FakeImageWriterClient>(new FakeImageWriterClient());
ImageWriterTestUtils::~ImageWriterTestUtils() {
} }
void ImageWriterTestUtils::SetUp() { ImageWriterUnitTestBase::ImageWriterUnitTestBase()
SetUp(false); : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
} ImageWriterUnitTestBase::~ImageWriterUnitTestBase() {}
void ImageWriterUnitTestBase::SetUp() {
testing::Test::SetUp();
void ImageWriterTestUtils::SetUp(bool is_browser_test) {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(),
&test_image_path_)); &test_image_path_));
...@@ -163,20 +137,11 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) { ...@@ -163,20 +137,11 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) {
if (!chromeos::DBusThreadManager::IsInitialized()) { if (!chromeos::DBusThreadManager::IsInitialized()) {
chromeos::FakeDBusThreadManager* fake_dbus_thread_manager = chromeos::FakeDBusThreadManager* fake_dbus_thread_manager =
new chromeos::FakeDBusThreadManager; new chromeos::FakeDBusThreadManager;
fake_dbus_thread_manager->SetFakeClients();
scoped_ptr<chromeos::ImageBurnerClient> scoped_ptr<chromeos::ImageBurnerClient>
image_burner_fake(new ImageWriterFakeImageBurnerClient()); image_burner_fake(new ImageWriterFakeImageBurnerClient());
fake_dbus_thread_manager->SetImageBurnerClient(image_burner_fake.Pass()); fake_dbus_thread_manager->SetImageBurnerClient(image_burner_fake.Pass());
chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
if (is_browser_test) {
chromeos::DBusThreadManager::SetInstanceForTesting(
fake_dbus_thread_manager);
} else {
chromeos::DBusThreadManager::InitializeForTesting(
fake_dbus_thread_manager);
}
} }
FakeDiskMountManager* disk_manager = new FakeDiskMountManager(); FakeDiskMountManager* disk_manager = new FakeDiskMountManager();
chromeos::disks::DiskMountManager::InitializeForTesting(disk_manager); chromeos::disks::DiskMountManager::InitializeForTesting(disk_manager);
...@@ -197,53 +162,30 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) { ...@@ -197,53 +162,30 @@ void ImageWriterTestUtils::SetUp(bool is_browser_test) {
true, true,
false); false);
disk_manager->SetupDefaultReplies(); disk_manager->SetupDefaultReplies();
#else
client_ = new FakeImageWriterClient();
image_writer::Operation::SetUtilityClientForTesting(client_);
#endif #endif
} }
void ImageWriterTestUtils::TearDown() { void ImageWriterUnitTestBase::TearDown() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
if (chromeos::DBusThreadManager::IsInitialized()) { chromeos::DBusThreadManager::Shutdown();
chromeos::DBusThreadManager::Shutdown();
}
chromeos::disks::DiskMountManager::Shutdown(); chromeos::disks::DiskMountManager::Shutdown();
#else
image_writer::Operation::SetUtilityClientForTesting(NULL);
#endif #endif
} }
const base::FilePath& ImageWriterTestUtils::GetTempDir() { bool ImageWriterUnitTestBase::ImageWrittenToDevice(
return temp_dir_.path(); const base::FilePath& image_path,
} const base::FilePath& device_path) {
const base::FilePath& ImageWriterTestUtils::GetImagePath() {
return test_image_path_;
}
const base::FilePath& ImageWriterTestUtils::GetDevicePath() {
return test_device_path_;
}
#if !defined(OS_CHROMEOS)
FakeImageWriterClient* ImageWriterTestUtils::GetUtilityClient() {
return client_.get();
}
#endif
bool ImageWriterTestUtils::ImageWrittenToDevice() {
scoped_ptr<char[]> image_buffer(new char[kTestFileSize]); scoped_ptr<char[]> image_buffer(new char[kTestFileSize]);
scoped_ptr<char[]> device_buffer(new char[kTestFileSize]); scoped_ptr<char[]> device_buffer(new char[kTestFileSize]);
int image_bytes_read = int image_bytes_read =
ReadFile(test_image_path_, image_buffer.get(), kTestFileSize); ReadFile(image_path, image_buffer.get(), kTestFileSize);
if (image_bytes_read < 0) if (image_bytes_read < 0)
return false; return false;
int device_bytes_read = int device_bytes_read =
ReadFile(test_device_path_, device_buffer.get(), kTestFileSize); ReadFile(device_path, device_buffer.get(), kTestFileSize);
if (image_bytes_read != device_bytes_read) if (image_bytes_read != device_bytes_read)
return false; return false;
...@@ -251,30 +193,14 @@ bool ImageWriterTestUtils::ImageWrittenToDevice() { ...@@ -251,30 +193,14 @@ bool ImageWriterTestUtils::ImageWrittenToDevice() {
return memcmp(image_buffer.get(), device_buffer.get(), image_bytes_read) == 0; return memcmp(image_buffer.get(), device_buffer.get(), image_bytes_read) == 0;
} }
bool ImageWriterTestUtils::FillFile(const base::FilePath& file, bool ImageWriterUnitTestBase::FillFile(const base::FilePath& file,
const int pattern, const int pattern,
const int length) { const int length) {
scoped_ptr<char[]> buffer(new char[length]); scoped_ptr<char[]> buffer(new char[length]);
memset(buffer.get(), pattern, length); memset(buffer.get(), pattern, length);
return base::WriteFile(file, buffer.get(), length) == length; return base::WriteFile(file, buffer.get(), length) == length;
} }
ImageWriterUnitTestBase::ImageWriterUnitTestBase()
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
}
ImageWriterUnitTestBase::~ImageWriterUnitTestBase() {
}
void ImageWriterUnitTestBase::SetUp() {
testing::Test::SetUp();
test_utils_.SetUp();
}
void ImageWriterUnitTestBase::TearDown() {
testing::Test::TearDown();
test_utils_.TearDown();
}
} // namespace image_writer } // namespace image_writer
} // namespace extensions } // namespace extensions
chrome/browser/extensions/api/image_writer_private/test_utils.h
View file @ f7ab7398
...@@ -65,6 +65,20 @@ class FakeDiskMountManager : public chromeos::disks::MockDiskMountManager { ...@@ -65,6 +65,20 @@ class FakeDiskMountManager : public chromeos::disks::MockDiskMountManager {
virtual void UnmountDeviceRecursively( virtual void UnmountDeviceRecursively(
const std::string& device_path, const std::string& device_path,
const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE; const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE;
/*
MOCK_METHOD1(AddObserver, void(chromeos::disks::DiskMountManager::Observer*));
MOCK_METHOD1(RemoveObserver,
void(chromeos::disks::DiskMountManager::Observer*));
MOCK_CONST_METHOD0(disks, const DiskMap&());
MOCK_CONST_METHOD1(FindDiskBySourcePath, const Disk*(const std::string&));
MOCK_CONST_METHOD0(mount_points, const MountPointMap&());
MOCK_METHOD0(RequestMountInfoRefresh, void());
MOCK_METHOD4(MountPath, void(const std::string&, const std::string&, const
std::string&, chromeos::MountType));
MOCK_METHOD3(UnmountPath, void(const std::string&, chromeos::UnmountOptions,
const UnmountPathCallback&));
MOCK_METHOD1(FormatMountedDevice, void(const std::string&));
*/
private: private:
DiskMap disks_; DiskMap disks_;
...@@ -91,19 +105,11 @@ class FakeImageWriterClient : public ImageWriterUtilityClient { ...@@ -91,19 +105,11 @@ class FakeImageWriterClient : public ImageWriterUtilityClient {
virtual void Shutdown() OVERRIDE; virtual void Shutdown() OVERRIDE;
// Sets a callback for when a Write call is made.
void SetWriteCallback(const base::Closure& write_callback);
// Sets a callback for when a Verify call is made.
void SetVerifyCallback(const base::Closure& verify_callback);
// Triggers the progress callback.
void Progress(int64 progress); void Progress(int64 progress);
// Triggers the success callback.
void Success(); void Success();
// Triggers the error callback.
void Error(const std::string& message); void Error(const std::string& message);
// Triggers the cancel callback.
void Cancel(); void Cancel();
static scoped_refptr<FakeImageWriterClient> Create();
private: private:
virtual ~FakeImageWriterClient(); virtual ~FakeImageWriterClient();
...@@ -112,20 +118,23 @@ class FakeImageWriterClient : public ImageWriterUtilityClient { ...@@ -112,20 +118,23 @@ class FakeImageWriterClient : public ImageWriterUtilityClient {
SuccessCallback success_callback_; SuccessCallback success_callback_;
ErrorCallback error_callback_; ErrorCallback error_callback_;
CancelCallback cancel_callback_; CancelCallback cancel_callback_;
base::Closure write_callback_;
base::Closure verify_callback_;
}; };
class ImageWriterTestUtils { // Base class for unit tests that manages creating image and device files.
public: class ImageWriterUnitTestBase : public testing::Test {
ImageWriterTestUtils(); protected:
virtual ~ImageWriterTestUtils(); ImageWriterUnitTestBase();
virtual ~ImageWriterUnitTestBase();
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
// Verifies that the data in image_path was written to the file at // Verifies that the data in image_path was written to the file at
// device_path. This is different from base::ContentsEqual because the device // device_path. This is different from base::ContentsEqual because the device
// may be larger than the image. // may be larger than the image.
bool ImageWrittenToDevice(); bool ImageWrittenToDevice(const base::FilePath& image_path,
const base::FilePath& device_path);
// Fills |file| with |length| bytes of |pattern|, overwriting any existing // Fills |file| with |length| bytes of |pattern|, overwriting any existing
// data. // data.
...@@ -133,47 +142,10 @@ class ImageWriterTestUtils { ...@@ -133,47 +142,10 @@ class ImageWriterTestUtils {
const int pattern, const int pattern,
const int length); const int length);
// Set up the test utils, creating temporary folders and such.
// Note that browser tests should use the alternate form and pass "true" as an
// argument.
virtual void SetUp();
// Set up the test utils, creating temporary folders and such. If
// |is_browser_test| is true then it will use alternate initialization
// appropriate for a browser test. This should be run in
// |SetUpInProcessBrowserTestFixture|.
virtual void SetUp(bool is_browser_test);
virtual void TearDown();
const base::FilePath& GetTempDir();
const base::FilePath& GetImagePath();
const base::FilePath& GetDevicePath();
#if !defined(OS_CHROMEOS)
FakeImageWriterClient* GetUtilityClient();
#endif
protected:
base::ScopedTempDir temp_dir_; base::ScopedTempDir temp_dir_;
base::FilePath test_image_path_; base::FilePath test_image_path_;
base::FilePath test_device_path_; base::FilePath test_device_path_;
#if !defined(OS_CHROMEOS)
scoped_refptr<FakeImageWriterClient> client_;
#endif
};
// Base class for unit tests that manages creating image and device files.
class ImageWriterUnitTestBase : public testing::Test {
protected:
ImageWriterUnitTestBase();
virtual ~ImageWriterUnitTestBase();
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
ImageWriterTestUtils test_utils_;
private: private:
content::TestBrowserThreadBundle thread_bundle_; content::TestBrowserThreadBundle thread_bundle_;
}; };
......
chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc
View file @ f7ab7398
...@@ -27,10 +27,10 @@ TEST_F(ImageWriterFromFileTest, InvalidFile) { ...@@ -27,10 +27,10 @@ TEST_F(ImageWriterFromFileTest, InvalidFile) {
scoped_refptr<WriteFromFileOperation> op = scoped_refptr<WriteFromFileOperation> op =
new WriteFromFileOperation(manager_.AsWeakPtr(), new WriteFromFileOperation(manager_.AsWeakPtr(),
kDummyExtensionId, kDummyExtensionId,
test_utils_.GetImagePath(), test_image_path_,
test_utils_.GetDevicePath().AsUTF8Unsafe()); test_device_path_.AsUTF8Unsafe());
base::DeleteFile(test_utils_.GetImagePath(), false); base::DeleteFile(test_image_path_, false);
EXPECT_CALL(manager_, OnProgress(kDummyExtensionId, _, _)).Times(0); EXPECT_CALL(manager_, OnProgress(kDummyExtensionId, _, _)).Times(0);
EXPECT_CALL(manager_, OnComplete(kDummyExtensionId)).Times(0); EXPECT_CALL(manager_, OnComplete(kDummyExtensionId)).Times(0);
...@@ -50,8 +50,13 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) { ...@@ -50,8 +50,13 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) {
scoped_refptr<WriteFromFileOperation> op = scoped_refptr<WriteFromFileOperation> op =
new WriteFromFileOperation(manager_.AsWeakPtr(), new WriteFromFileOperation(manager_.AsWeakPtr(),
kDummyExtensionId, kDummyExtensionId,
test_utils_.GetImagePath(), test_image_path_,
test_utils_.GetDevicePath().AsUTF8Unsafe()); test_device_path_.AsUTF8Unsafe());
#if !defined(OS_CHROMEOS)
scoped_refptr<FakeImageWriterClient> client = FakeImageWriterClient::Create();
op->SetUtilityClientForTesting(client);
#endif
EXPECT_CALL(manager_, EXPECT_CALL(manager_,
OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _)) OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _))
.Times(AnyNumber()); .Times(AnyNumber());
...@@ -85,15 +90,15 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) { ...@@ -85,15 +90,15 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
test_utils_.GetUtilityClient()->Progress(0); client->Progress(0);
test_utils_.GetUtilityClient()->Progress(50); client->Progress(50);
test_utils_.GetUtilityClient()->Progress(100); client->Progress(100);
test_utils_.GetUtilityClient()->Success(); client->Success();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
test_utils_.GetUtilityClient()->Progress(0); client->Progress(0);
test_utils_.GetUtilityClient()->Progress(50); client->Progress(50);
test_utils_.GetUtilityClient()->Progress(100); client->Progress(100);
test_utils_.GetUtilityClient()->Success(); client->Success();
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
#endif #endif
} }
......
chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc
View file @ f7ab7398
...@@ -77,8 +77,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { ...@@ -77,8 +77,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase {
// Turn on interception and set up our dummy file. // Turn on interception and set up our dummy file.
net::URLFetcher::SetEnableInterceptionForTests(true); net::URLFetcher::SetEnableInterceptionForTests(true);
get_interceptor_.reset(new GetInterceptor()); get_interceptor_.reset(new GetInterceptor());
get_interceptor_->SetResponse(GURL(kTestImageUrl), get_interceptor_->SetResponse(GURL(kTestImageUrl), test_image_path_);
test_utils_.GetImagePath());
} }
virtual void TearDown() OVERRIDE { virtual void TearDown() OVERRIDE {
...@@ -96,7 +95,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { ...@@ -96,7 +95,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase {
test_profile_.GetRequestContext(), test_profile_.GetRequestContext(),
url, url,
hash, hash,
test_utils_.GetDevicePath().AsUTF8Unsafe())); test_device_path_.AsUTF8Unsafe()));
operation->Start(); operation->Start();
return operation; return operation;
} }
...@@ -141,8 +140,8 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) { ...@@ -141,8 +140,8 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) {
scoped_refptr<OperationForTest> operation = scoped_refptr<OperationForTest> operation =
CreateOperation(GURL(kTestImageUrl), ""); CreateOperation(GURL(kTestImageUrl), "");
EXPECT_TRUE(base::CreateTemporaryFileInDir(test_utils_.GetTempDir(), EXPECT_TRUE(
&download_target_path)); base::CreateTemporaryFileInDir(temp_dir_.path(), &download_target_path));
operation->SetImagePath(download_target_path); operation->SetImagePath(download_target_path);
EXPECT_CALL( EXPECT_CALL(
...@@ -165,8 +164,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) { ...@@ -165,8 +164,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) {
runloop.Run(); runloop.Run();
EXPECT_TRUE(base::ContentsEqual(test_utils_.GetImagePath(), EXPECT_TRUE(base::ContentsEqual(test_image_path_, operation->GetImagePath()));
operation->GetImagePath()));
EXPECT_EQ(1, get_interceptor_->GetHitCount()); EXPECT_EQ(1, get_interceptor_->GetHitCount());
...@@ -175,7 +173,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) { ...@@ -175,7 +173,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) {
TEST_F(ImageWriterWriteFromUrlOperationTest, VerifyFile) { TEST_F(ImageWriterWriteFromUrlOperationTest, VerifyFile) {
scoped_ptr<char[]> data_buffer(new char[kTestFileSize]); scoped_ptr<char[]> data_buffer(new char[kTestFileSize]);
base::ReadFile(test_utils_.GetImagePath(), data_buffer.get(), kTestFileSize); base::ReadFile(test_image_path_, data_buffer.get(), kTestFileSize);
base::MD5Digest expected_digest; base::MD5Digest expected_digest;
base::MD5Sum(data_buffer.get(), kTestFileSize, &expected_digest); base::MD5Sum(data_buffer.get(), kTestFileSize, &expected_digest);
std::string expected_hash = base::MD5DigestToBase16(expected_digest); std::string expected_hash = base::MD5DigestToBase16(expected_digest);
...@@ -196,7 +194,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, VerifyFile) { ...@@ -196,7 +194,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, VerifyFile) {
image_writer_api::STAGE_VERIFYDOWNLOAD, image_writer_api::STAGE_VERIFYDOWNLOAD,
100)).Times(AtLeast(1)); 100)).Times(AtLeast(1));
operation->SetImagePath(test_utils_.GetImagePath()); operation->SetImagePath(test_image_path_);
content::BrowserThread::PostTask(content::BrowserThread::FILE, content::BrowserThread::PostTask(content::BrowserThread::FILE,
FROM_HERE, FROM_HERE,
base::Bind(&OperationForTest::VerifyDownload, base::Bind(&OperationForTest::VerifyDownload,
......
chrome/chrome_tests.gypi
View file @ f7ab7398
...@@ -1105,7 +1105,6 @@ ...@@ -1105,7 +1105,6 @@
'browser/extensions/api/idle/idle_apitest.cc', 'browser/extensions/api/idle/idle_apitest.cc',
'browser/extensions/api/idltest/idltest_apitest.cc', 'browser/extensions/api/idltest/idltest_apitest.cc',
'browser/extensions/api/image_writer_private/image_writer_private_apitest.cc', 'browser/extensions/api/image_writer_private/image_writer_private_apitest.cc',
'browser/extensions/api/image_writer_private/test_utils.cc',
'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc', 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
'browser/extensions/api/management/management_api_browsertest.cc', 'browser/extensions/api/management/management_api_browsertest.cc',
'browser/extensions/api/management/management_apitest.cc', 'browser/extensions/api/management/management_apitest.cc',
......
chrome/test/data/extensions/api_test/image_writer_private/list_devices/test.js
View file @ f7ab7398
...@@ -2,17 +2,16 @@ ...@@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// storage_unit_id is skipped because it is generated to point at a temporary
// file.
var expectedDevices = [{ var expectedDevices = [{
'vendor': 'Vendor 1', 'vendor': 'Vendor 1',
'model': 'Model 1', 'model': 'Model 1',
'capacity': 1 << 15, 'capacity': 1 << 20,
'storageUnitId': '/test/id/1',
}, { }, {
'vendor': 'Vendor 2', 'vendor': 'Vendor 2',
'model': 'Model 2', 'model': 'Model 2',
'capacity': 1 << 17, 'capacity': 1 << 22,
'storageUnitId': '/test/id/2',
}]; }];
...@@ -35,6 +34,7 @@ function listRemovableDevicesCallback(deviceList) { ...@@ -35,6 +34,7 @@ function listRemovableDevicesCallback(deviceList) {
chrome.test.assertEq(expected.vendor, dev.vendor); chrome.test.assertEq(expected.vendor, dev.vendor);
chrome.test.assertEq(expected.model, dev.model); chrome.test.assertEq(expected.model, dev.model);
chrome.test.assertEq(expected.capacity, dev.capacity); chrome.test.assertEq(expected.capacity, dev.capacity);
chrome.test.assertEq(expected.storageUnitId, dev.storageUnitId);
}); });
} }
......
chrome/test/data/extensions/api_test/image_writer_private/write_from_file/background.js deleted 100644 → 0
View file @ 2fd86ea1
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
chrome.app.runtime.onLaunched.addListener(function () {
chrome.app.window.create('test.html');
});
chrome/test/data/extensions/api_test/image_writer_private/write_from_file/manifest.json deleted 100644 → 0
View file @ 2fd86ea1
{
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6aedfP5QXnA176+/EKXFwbBoXl3smca9uaO1ytfLCRsH8Ja0xrjJG+/2tvcCL1JzBbc8/31cwWIOiNFawJiIc+nfZAi4rO27yakn4W83kHOhjr7hA4/a+CtmOPTTgpK1DCIpo0Xy+lpzQuqHBKL9/sXMCN4bKqcXMe7XA09VJYD6Rv+CTDfKkgN3oNYhm0KBOwkvJ/P7x7KeBUCusd+UOzJygBP4p2mDgIX/WfUZAuRGq1ty/Eu9dBm29Jhe1YBctFaARyR5FnMsr57Kw/mWrNXkZ2iewrLUzNh1FWLQUbiL4QdqaP9//Xxhsrf+LG1UcJN1HBnn/b0xYLfcH9W7RQIDAQAB",
"name": "Image Writer Private",
"version": "0.1",
"app": {
"background": {
"scripts": ["background.js"]
}
},
"permissions": ["imageWriterPrivate", "fileSystem"]
}
chrome/test/data/extensions/api_test/image_writer_private/write_from_file/test.js deleted 100644 → 0
View file @ 2fd86ea1
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
function assertNotNullOrUndefined(value, message) {
chrome.test.assertTrue(value !== null, message);
chrome.test.assertTrue(value !== undefined, message);
}
function testWriteFromFile() {
var fileEntry;
var storageDevice;
var currentStage = "none";
var currentProgress = -1;
var started = true;
function chooseEntryCallback(entry) {
fileEntry = entry;
chrome.imageWriterPrivate.listRemovableStorageDevices(
listDevicesCallback);
}
function listDevicesCallback(deviceList) {
chrome.test.assertTrue(deviceList.length >= 1);
storageDevice = deviceList[0];
startWrite();
}
function startWrite() {
assertNotNullOrUndefined(fileEntry, "FileEntry should be defined.");
assertNotNullOrUndefined(
storageDevice.storageUnitId, "Storage Unit should be defined.");
chrome.imageWriterPrivate.writeFromFile(
storageDevice.storageUnitId,
fileEntry,
startWriteCallback);
}
function startWriteCallback() {
started = true;
}
function writeProgressCallback(progressInfo) {
currentProgress = progressInfo.percentComplete;
currentStage = progressInfo.stage;
}
function writeCompleteCallback() {
chrome.test.assertTrue(started, "Complete triggered before being started.");
chrome.test.assertEq(100, currentProgress);
chrome.test.succeed("Write completed successfully.");
}
function writeErrorCallback(message) {
chrome.test.fail("An error occurred during writing.");
}
chrome.imageWriterPrivate.onWriteProgress.
addListener(writeProgressCallback);
chrome.imageWriterPrivate.onWriteComplete.
addListener(writeCompleteCallback);
chrome.imageWriterPrivate.onWriteError.
addListener(writeErrorCallback);
chrome.fileSystem.chooseEntry(chooseEntryCallback);
}
testWriteFromFile();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment