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

Unified Diff: goopdate/app_unittest_base.h

Issue 624713003: Keep only base/extractor.[cc|h]. (Closed) Base URL: https://chromium.googlesource.com/external/omaha.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « goopdate/app_unittest.cc ('k') | goopdate/app_version.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: goopdate/app_unittest_base.h
diff --git a/goopdate/app_unittest_base.h b/goopdate/app_unittest_base.h
deleted file mode 100644
index 16ecc5ab1b0078877763aac176ee97a171442034..0000000000000000000000000000000000000000
--- a/goopdate/app_unittest_base.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2010 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================================================================
-
-// Provides a base framework for unit tests that need an App object.
-
-#ifndef OMAHA_GOOPDATE_APP_UNITTEST_BASE_H_
-#define OMAHA_GOOPDATE_APP_UNITTEST_BASE_H_
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include "base/scoped_ptr.h"
-#include "omaha/base/app_util.h"
-#include "omaha/goopdate/app_manager.h"
-#include "omaha/goopdate/app_bundle_state_initialized.h"
-#include "omaha/goopdate/model.h"
-#include "omaha/goopdate/resource_manager.h"
-#include "omaha/goopdate/worker_mock.h"
-#include "omaha/testing/unit_test.h"
-
-using ::testing::Return;
-
-namespace omaha {
-
-// Overrides the registry.
-class AppTestBase : public testing::Test {
- protected:
- AppTestBase(bool is_machine, bool use_strict_mock)
- : is_machine_(is_machine),
- use_strict_mock_(use_strict_mock) {
- }
-
- virtual void SetUp() {
- EXPECT_SUCCEEDED(AppManager::CreateInstance(is_machine_));
-
- // Needed for error strings.
- EXPECT_SUCCEEDED(ResourceManager::Create(
- is_machine_,
- app_util::GetCurrentModuleDirectory(),
- _T("en")));
-
- if (use_strict_mock_) {
- mock_worker_.reset(new testing::StrictMock<MockWorker>);
- } else {
- mock_worker_.reset(new testing::NiceMock<MockWorker>);
- }
-
- EXPECT_CALL(*mock_worker_, Lock()).WillRepeatedly(Return(2));
- EXPECT_CALL(*mock_worker_, Unlock()).WillRepeatedly(Return(1));
-
- model_.reset(new Model(mock_worker_.get()));
-
- app_bundle_ = model_->CreateAppBundle(is_machine_);
- ASSERT_TRUE(app_bundle_.get());
-
- EXPECT_SUCCEEDED(app_bundle_->put_displayName(CComBSTR(_T("Test Bundle"))));
- EXPECT_SUCCEEDED(app_bundle_->put_displayLanguage(CComBSTR(_T("en"))));
- EXPECT_SUCCEEDED(app_bundle_->put_installSource(CComBSTR(_T("unittest"))));
- // TODO(omaha3): Address with the TODO in AppBundleInitializedTest::SetUp()
- // then remove app_bundle_state_initialized.h above.
- if (is_machine_) {
- SetAppBundleStateForUnitTest(app_bundle_.get(),
- new fsm::AppBundleStateInitialized);
- } else {
- EXPECT_SUCCEEDED(app_bundle_->initialize());
- }
- }
-
- virtual void TearDown() {
- ResourceManager::Delete();
- AppManager::DeleteInstance();
- }
-
- const bool is_machine_;
- const bool use_strict_mock_;
-
- CString hive_override_key_name_;
-
- scoped_ptr<MockWorker> mock_worker_;
- scoped_ptr<Model> model_;
-
- shared_ptr<AppBundle> app_bundle_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AppTestBase);
-};
-
-class AppTestBaseWithRegistryOverride : public AppTestBase {
- protected:
- AppTestBaseWithRegistryOverride(bool is_machine, bool use_strict_mock)
- : AppTestBase(is_machine, use_strict_mock),
- hive_override_key_name_(kRegistryHiveOverrideRoot) {}
-
- // Override the registry after initializing the AppBundle so that the latter
- // has the correct network configuration in the event there are pings to send.
- // TODO(omaha3): Ideally we would not send pings from tests: http://b/2911608.
- virtual void SetUp() {
- AppTestBase::SetUp();
-
- RegKey::DeleteKey(hive_override_key_name_);
- OverrideRegistryHives(hive_override_key_name_);
- }
-
- virtual void TearDown() {
- RestoreRegistryHives();
- RegKey::DeleteKey(hive_override_key_name_);
-
- AppTestBase::TearDown();
- }
-
- CString hive_override_key_name_;
-};
-
-} // namespace omaha
-
-#endif // OMAHA_GOOPDATE_APP_UNITTEST_BASE_H_
« no previous file with comments | « goopdate/app_unittest.cc ('k') | goopdate/app_version.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698