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

Unified Diff: sandbox/tests/integration_tests/integration_tests_test.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 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 side-by-side diff with in-line comments
Download patch
Index: sandbox/tests/integration_tests/integration_tests_test.cc
diff --git a/sandbox/tests/integration_tests/integration_tests_test.cc b/sandbox/tests/integration_tests/integration_tests_test.cc
deleted file mode 100644
index b610681406d4d9119cd6ace82b429ef2052ac2bc..0000000000000000000000000000000000000000
--- a/sandbox/tests/integration_tests/integration_tests_test.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// Some tests for the framework itself.
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "sandbox/src/sandbox.h"
-#include "sandbox/src/target_services.h"
-#include "sandbox/src/sandbox_factory.h"
-#include "sandbox/tests/common/controller.h"
-
-namespace sandbox {
-
-// Returns the current process state.
-SBOX_TESTS_COMMAND int IntegrationTestsTest_state(int argc, wchar_t **argv) {
- if (!SandboxFactory::GetTargetServices()->GetState()->InitCalled())
- return BEFORE_INIT;
-
- if (!SandboxFactory::GetTargetServices()->GetState()->RevertedToSelf())
- return BEFORE_REVERT;
-
- return AFTER_REVERT;
-}
-
-// Returns the current process state, keeping track of it.
-SBOX_TESTS_COMMAND int IntegrationTestsTest_state2(int argc, wchar_t **argv) {
- static SboxTestsState state = MIN_STATE;
- if (!SandboxFactory::GetTargetServices()->GetState()->InitCalled()) {
- if (MIN_STATE == state)
- state = BEFORE_INIT;
- return state;
- }
-
- if (!SandboxFactory::GetTargetServices()->GetState()->RevertedToSelf()) {
- if (BEFORE_INIT == state)
- state = BEFORE_REVERT;
- return state;
- }
-
- if (BEFORE_REVERT == state)
- state = AFTER_REVERT;
- return state;
-}
-
-// Returns the number of arguments
-SBOX_TESTS_COMMAND int IntegrationTestsTest_args(int argc, wchar_t **argv) {
- for (int i = 0; i < argc; i++) {
- wchar_t argument[20];
- size_t argument_bytes = wcslen(argv[i]) * sizeof(wchar_t);
- memcpy(argument, argv[i], __min(sizeof(argument), argument_bytes));
- }
-
- return argc;
-}
-
-TEST(IntegrationTestsTest, CallsBeforeInit) {
- TestRunner runner;
- runner.SetTimeout(2000);
- runner.SetTestState(BEFORE_INIT);
- ASSERT_EQ(BEFORE_INIT, runner.RunTest(L"IntegrationTestsTest_state"));
-}
-
-TEST(IntegrationTestsTest, CallsBeforeRevert) {
- TestRunner runner;
- runner.SetTimeout(2000);
- runner.SetTestState(BEFORE_REVERT);
- ASSERT_EQ(BEFORE_REVERT, runner.RunTest(L"IntegrationTestsTest_state"));
-}
-
-TEST(IntegrationTestsTest, CallsAfterRevert) {
- TestRunner runner;
- runner.SetTimeout(2000);
- runner.SetTestState(AFTER_REVERT);
- ASSERT_EQ(AFTER_REVERT, runner.RunTest(L"IntegrationTestsTest_state"));
-}
-
-TEST(IntegrationTestsTest, CallsEveryState) {
- TestRunner runner;
- runner.SetTimeout(2000);
- runner.SetTestState(EVERY_STATE);
- ASSERT_EQ(AFTER_REVERT, runner.RunTest(L"IntegrationTestsTest_state2"));
-}
-
-TEST(IntegrationTestsTest, ForwardsArguments) {
- TestRunner runner;
- runner.SetTimeout(2000);
- runner.SetTestState(BEFORE_INIT);
- ASSERT_EQ(1, runner.RunTest(L"IntegrationTestsTest_args first"));
- ASSERT_EQ(4, runner.RunTest(L"IntegrationTestsTest_args first second third "
- L"fourth"));
-}
-
-} // namespace sandbox
« no previous file with comments | « sandbox/tests/integration_tests/integration_tests.cc ('k') | sandbox/tests/integration_tests/sbox_integration_tests.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698