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

Side by Side Diff: chrome/test/mini_installer_test/test.cc

Issue 125165: Enabling the tests after sgk reverted CL18441. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "base/platform_thread.h" 4 #include "base/platform_thread.h"
5 #include "base/win_util.h" 5 #include "base/win_util.h"
6 #include "chrome/installer/util/install_util.h" 6 #include "chrome/installer/util/install_util.h"
7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" 7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 #include "chrome_mini_installer.h" 10 #include "chrome_mini_installer.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 installer.InstallStandaloneInstaller(); 92 installer.InstallStandaloneInstaller();
93 } 93 }
94 94
95 // This test doesn't make sense. Disabling for now. 95 // This test doesn't make sense. Disabling for now.
96 TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) { 96 TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) {
97 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 97 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
98 mini_installer_constants::kDevChannelBuild); 98 mini_installer_constants::kDevChannelBuild);
99 installer.OverInstall(); 99 installer.OverInstall();
100 } 100 }
101 101
102 TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) { 102 TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
103 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 103 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
104 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall, 104 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall,
105 mini_installer_constants::kDevChannelBuild); 105 mini_installer_constants::kDevChannelBuild);
106 installer.Install(); 106 installer.Install();
107 } 107 }
108 } 108 }
109 109
110 TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) { 110 TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
111 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 111 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
112 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 112 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
113 mini_installer_constants::kDevChannelBuild); 113 mini_installer_constants::kDevChannelBuild);
114 installer.Install(); 114 installer.Install();
115 } 115 }
116 } 116 }
117 117
118 TEST_F(MiniInstallTest, StableChromeInstallerOverChromeMetaInstallerTest) { 118 TEST_F(MiniInstallTest, StableChromeInstallerOverChromeMetaInstallerTest) {
119 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 119 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
120 mini_installer_constants::kStableChannelBuild); 120 mini_installer_constants::kStableChannelBuild);
121 installer.OverInstall(); 121 installer.OverInstall();
122 } 122 }
123 123
124 TEST_F(MiniInstallTest, DevChromeInstallerOverChromeMetaInstallerTest) { 124 TEST_F(MiniInstallTest, DevChromeInstallerOverChromeMetaInstallerTest) {
125 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 125 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
126 mini_installer_constants::kDevChannelBuild); 126 mini_installer_constants::kDevChannelBuild);
127 installer.OverInstall(); 127 installer.OverInstall();
128 } 128 }
129 129
130 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) { 130 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) {
131 // We run the tests on all supported OSes. 131 // We run the tests on all supported OSes.
132 // Make sure the code agrees. 132 // Make sure the code agrees.
133 EXPECT_TRUE(InstallUtil::IsOSSupported()); 133 EXPECT_TRUE(InstallUtil::IsOSSupported());
134 } 134 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698