summaryrefslogtreecommitdiffstats
path: root/chrome/test/mini_installer_test/test.cc
diff options
context:
space:
mode:
authoranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 00:53:05 +0000
committeranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 00:53:05 +0000
commitfbb0ed4c0054edf1bbfcb56f7d5a10754eac2757 (patch)
treedf5d19f383b5a224860f8a68774285f94bd7ea5a /chrome/test/mini_installer_test/test.cc
parent9dea9e1fea04be579e34c634cb3be1b6654ef506 (diff)
downloadchromium_src-fbb0ed4c0054edf1bbfcb56f7d5a10754eac2757.zip
chromium_src-fbb0ed4c0054edf1bbfcb56f7d5a10754eac2757.tar.gz
chromium_src-fbb0ed4c0054edf1bbfcb56f7d5a10754eac2757.tar.bz2
Added a test for checking system install.
Review URL: http://codereview.chromium.org/18131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/mini_installer_test/test.cc')
-rw-r--r--chrome/test/mini_installer_test/test.cc24
1 files changed, 16 insertions, 8 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 145e2ca..221684d 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -3,13 +3,18 @@
// found in the LICENSE file.
#include "chrome_mini_installer.h"
+#include "mini_installer_test_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
class MiniInstallTest : public testing::Test {
protected:
virtual void SetUp() {
- // Currently no setup required
+ ChromeMiniInstaller userinstall(mini_installer_constants::kUserInstall);
+ userinstall.UnInstall();
+ ChromeMiniInstaller systeminstall(
+ mini_installer_constants::kSystemInstall);
+ systeminstall.UnInstall();
}
virtual void TearDown() {
@@ -18,15 +23,18 @@ class MiniInstallTest : public testing::Test {
};
};
-TEST_F(MiniInstallTest, MiniInstallerCleanInstallTest) {
- ChromeMiniInstaller installer;
+TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
+ ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
+ installer.OverInstall();
+}
+
+TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
+ ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall);
installer.InstallMiniInstaller();
- installer.UnInstall();
}
-TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
- ChromeMiniInstaller installer;
- installer.OverInstall();
- installer.UnInstall();
+TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
+ ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
+ installer.InstallMiniInstaller();
}