summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 20:44:00 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 20:44:00 +0000
commit28dc42112899ad4c118cb55ddb3af6437471243f (patch)
tree7a536b151c9e2137c9249e85b01f9e649216367c /chrome/browser/policy
parentb2c71fa0ab3d6a1ef3a8d47b4a827d3539208da6 (diff)
downloadchromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.zip
chromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.tar.gz
chromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.tar.bz2
Another big out-of-lining of test code. Hits a lot of gmock objects
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6413036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
-rw-r--r--chrome/browser/policy/asynchronous_policy_loader_unittest.cc1
-rw-r--r--chrome/browser/policy/asynchronous_policy_test_base.cc31
-rw-r--r--chrome/browser/policy/asynchronous_policy_test_base.h25
-rw-r--r--chrome/browser/policy/file_based_policy_provider_unittest.cc1
-rw-r--r--chrome/browser/policy/mock_device_management_backend.cc13
-rw-r--r--chrome/browser/policy/mock_device_management_backend.h7
6 files changed, 58 insertions, 20 deletions
diff --git a/chrome/browser/policy/asynchronous_policy_loader_unittest.cc b/chrome/browser/policy/asynchronous_policy_loader_unittest.cc
index 44ab3c2..b3e4534 100644
--- a/chrome/browser/policy/asynchronous_policy_loader_unittest.cc
+++ b/chrome/browser/policy/asynchronous_policy_loader_unittest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/policy/asynchronous_policy_provider.h"
#include "chrome/browser/policy/asynchronous_policy_test_base.h"
#include "chrome/browser/policy/mock_configuration_policy_provider.h"
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "testing/gmock/include/gmock/gmock.h"
using ::testing::_;
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.cc b/chrome/browser/policy/asynchronous_policy_test_base.cc
new file mode 100644
index 0000000..eadf41f
--- /dev/null
+++ b/chrome/browser/policy/asynchronous_policy_test_base.cc
@@ -0,0 +1,31 @@
+// Copyright (c) 2011 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.
+
+#include "chrome/browser/policy/asynchronous_policy_test_base.h"
+
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
+
+namespace policy {
+
+ProviderDelegateMock::ProviderDelegateMock()
+ : AsynchronousPolicyProvider::Delegate() {}
+
+ProviderDelegateMock::~ProviderDelegateMock() {}
+
+AsynchronousPolicyTestBase::AsynchronousPolicyTestBase()
+ : ui_thread_(BrowserThread::UI, &loop_),
+ file_thread_(BrowserThread::FILE, &loop_) {}
+
+AsynchronousPolicyTestBase::~AsynchronousPolicyTestBase() {}
+
+void AsynchronousPolicyTestBase::SetUp() {
+ delegate_.reset(new ProviderDelegateMock());
+ store_.reset(new MockConfigurationPolicyStore);
+}
+
+void AsynchronousPolicyTestBase::TearDown() {
+ loop_.RunAllPending();
+}
+
+} // namespace policy
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.h b/chrome/browser/policy/asynchronous_policy_test_base.h
index 0281afd..f567f63 100644
--- a/chrome/browser/policy/asynchronous_policy_test_base.h
+++ b/chrome/browser/policy/asynchronous_policy_test_base.h
@@ -9,17 +9,18 @@
#include "base/message_loop.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/policy/asynchronous_policy_provider.h"
-#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
+class MockConfigurationPolicyStore;
+
// A delegate for testing that can feed arbitrary information to the loader.
class ProviderDelegateMock : public AsynchronousPolicyProvider::Delegate {
public:
- ProviderDelegateMock() : AsynchronousPolicyProvider::Delegate() {}
- virtual ~ProviderDelegateMock() {}
+ ProviderDelegateMock();
+ virtual ~ProviderDelegateMock();
MOCK_METHOD0(Load, DictionaryValue*());
@@ -29,20 +30,12 @@ class ProviderDelegateMock : public AsynchronousPolicyProvider::Delegate {
class AsynchronousPolicyTestBase : public testing::Test {
public:
- AsynchronousPolicyTestBase()
- : ui_thread_(BrowserThread::UI, &loop_),
- file_thread_(BrowserThread::FILE, &loop_) {}
-
- virtual ~AsynchronousPolicyTestBase() {}
-
- virtual void SetUp() {
- delegate_.reset(new ProviderDelegateMock());
- store_.reset(new MockConfigurationPolicyStore);
- }
+ AsynchronousPolicyTestBase();
+ virtual ~AsynchronousPolicyTestBase();
- virtual void TearDown() {
- loop_.RunAllPending();
- }
+ // testing::Test:
+ virtual void SetUp();
+ virtual void TearDown();
protected:
MessageLoop loop_;
diff --git a/chrome/browser/policy/file_based_policy_provider_unittest.cc b/chrome/browser/policy/file_based_policy_provider_unittest.cc
index 2948f5f..d5d0811 100644
--- a/chrome/browser/policy/file_based_policy_provider_unittest.cc
+++ b/chrome/browser/policy/file_based_policy_provider_unittest.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/policy/configuration_policy_store_interface.h"
#include "chrome/browser/policy/file_based_policy_provider.h"
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "policy/policy_constants.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/policy/mock_device_management_backend.cc b/chrome/browser/policy/mock_device_management_backend.cc
new file mode 100644
index 0000000..c817c60
--- /dev/null
+++ b/chrome/browser/policy/mock_device_management_backend.cc
@@ -0,0 +1,13 @@
+// Copyright (c) 2011 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.
+
+#include "chrome/browser/policy/mock_device_management_backend.h"
+
+namespace policy {
+
+MockDeviceManagementBackend::MockDeviceManagementBackend() {}
+
+MockDeviceManagementBackend::~MockDeviceManagementBackend() {}
+
+} // namespace policy
diff --git a/chrome/browser/policy/mock_device_management_backend.h b/chrome/browser/policy/mock_device_management_backend.h
index 83323de..a684e4f 100644
--- a/chrome/browser/policy/mock_device_management_backend.h
+++ b/chrome/browser/policy/mock_device_management_backend.h
@@ -22,11 +22,10 @@ namespace em = enterprise_management;
// Useful for unit testing when a server-based backend isn't
// available. Simulates both successful and failed requests to the device
// management server.
-class MockDeviceManagementBackend
- : public DeviceManagementBackend {
+class MockDeviceManagementBackend : public DeviceManagementBackend {
public:
- MockDeviceManagementBackend() {}
- virtual ~MockDeviceManagementBackend() {}
+ MockDeviceManagementBackend();
+ virtual ~MockDeviceManagementBackend();
// DeviceManagementBackend method overrides:
MOCK_METHOD4(ProcessRegisterRequest, void(