| OLD | NEW |
| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 TEST_F(MiniInstallTest, DISABLED_StandaloneInstallerTest) { | 46 TEST_F(MiniInstallTest, DISABLED_StandaloneInstallerTest) { |
| 47 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); | 47 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); |
| 48 installer.InstallStandaloneIntaller(); | 48 installer.InstallStandaloneIntaller(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) { | 51 TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) { |
| 52 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); | 52 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); |
| 53 installer.OverInstall(); | 53 installer.OverInstall(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) { | 56 TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) { |
| 57 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { | 57 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { |
| 58 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall); | 58 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall); |
| 59 installer.Install(); | 59 installer.Install(); |
| 60 } | 60 } |
| 61 } | 61 } |
| 62 | 62 |
| 63 TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) { | 63 TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) { |
| 64 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); | 64 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); |
| 65 installer.Install(); | 65 installer.Install(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) { | 68 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) { |
| 69 // We run the tests on all supported OSes. | 69 // We run the tests on all supported OSes. |
| 70 // Make sure the code agrees. | 70 // Make sure the code agrees. |
| 71 EXPECT_TRUE(InstallUtil::IsOSSupported()); | 71 EXPECT_TRUE(InstallUtil::IsOSSupported()); |
| 72 } | 72 } |
| OLD | NEW |