summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 00:29:17 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 00:29:17 +0000
commit2c921642bf98d54fa4bd272a06c3fb77d7280cf9 (patch)
tree715ebc90dda5ba61d187bbfd97c2c0b8b3c5eb55 /chrome/installer/setup
parent19aad64511d3fad539184abfe5af5ff6264e630c (diff)
downloadchromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.zip
chromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.tar.gz
chromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.tar.bz2
Trying to re-land r17758 (http://codereview.chromium.org/118247) but with name installer_util_unittests instead of util_unittests.
BUG=12849 Review URL: http://codereview.chromium.org/119322 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/main.cc33
-rw-r--r--chrome/installer/setup/run_all_unittests.cc9
-rw-r--r--chrome/installer/setup/setup.vcproj8
-rw-r--r--chrome/installer/setup/setup_util.cc36
-rw-r--r--chrome/installer/setup/setup_util.h19
-rw-r--r--chrome/installer/setup/setup_util_unittest.cc70
6 files changed, 144 insertions, 31 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc
index f1e38ad..d840982 100644
--- a/chrome/installer/setup/main.cc
+++ b/chrome/installer/setup/main.cc
@@ -17,6 +17,7 @@
#include "base/win_util.h"
#include "chrome/installer/setup/setup.h"
#include "chrome/installer/setup/setup_constants.h"
+#include "chrome/installer/setup/setup_util.h"
#include "chrome/installer/setup/uninstall.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/delete_tree_work_item.h"
@@ -154,36 +155,6 @@ DWORD UnPackArchive(const std::wstring& archive, bool system_install,
}
-// Find the version of Chrome from an install source directory.
-// Chrome_path should contain a complete and unpacked install package (i.e.
-// a Chrome directory under which there is a version folder).
-// Returns the version or NULL if no version is found.
-installer::Version* GetVersionFromDir(const std::wstring& chrome_path) {
- LOG(INFO) << "Looking for Chrome version folder under " << chrome_path;
- std::wstring root_path(chrome_path);
- file_util::AppendToPath(&root_path, L"*");
-
- WIN32_FIND_DATA find_file_data;
- HANDLE file_handle = FindFirstFile(root_path.c_str(), &find_file_data);
- BOOL ret = TRUE;
- installer::Version *version = NULL;
- // Here we are assuming that the installer we have is really valid so there
- // can not be two version directories. We exit as soon as we find a valid
- // version directory.
- while (ret) {
- if (find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- LOG(INFO) << "directory found: " << find_file_data.cFileName;
- version =
- installer::Version::GetVersionFromString(find_file_data.cFileName);
- if (version) break;
- }
- ret = FindNextFile(file_handle, &find_file_data);
- }
- FindClose(file_handle);
-
- return version;
-}
-
// This function is called when --rename-chrome-exe option is specified on
// setup.exe command line. This function assumes an in-use update has happened
// for Chrome so there should be a file called new_chrome.exe on the file
@@ -385,7 +356,7 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
file_util::AppendToPath(&src_path,
std::wstring(installer::kInstallSourceChromeDir));
scoped_ptr<installer::Version>
- installer_version(GetVersionFromDir(src_path));
+ installer_version(setup_util::GetVersionFromDir(src_path));
if (!installer_version.get()) {
LOG(ERROR) << "Did not find any valid version in installer.";
install_status = installer_util::INVALID_ARCHIVE;
diff --git a/chrome/installer/setup/run_all_unittests.cc b/chrome/installer/setup/run_all_unittests.cc
new file mode 100644
index 0000000..b5fc4a6
--- /dev/null
+++ b/chrome/installer/setup/run_all_unittests.cc
@@ -0,0 +1,9 @@
+// Copyright (c) 2009 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.
+
+#include "base/test_suite.h"
+
+int main(int argc, char** argv) {
+ return TestSuite(argc, argv).Run();
+}
diff --git a/chrome/installer/setup/setup.vcproj b/chrome/installer/setup/setup.vcproj
index 4afb42f..00792ce 100644
--- a/chrome/installer/setup/setup.vcproj
+++ b/chrome/installer/setup/setup.vcproj
@@ -108,6 +108,14 @@
>
</File>
<File
+ RelativePath=".\setup_util.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\setup_util.h"
+ >
+ </File>
+ <File
RelativePath=".\setup_constants.cc"
>
</File>
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
new file mode 100644
index 0000000..7356ecf
--- /dev/null
+++ b/chrome/installer/setup/setup_util.cc
@@ -0,0 +1,36 @@
+// Copyright (c) 2009 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.
+//
+// This file declares util functions for setup project.
+
+#include "chrome/installer/setup/setup_util.h"
+
+#include "base/file_util.h"
+#include "base/logging.h"
+
+installer::Version* setup_util::GetVersionFromDir(
+ const std::wstring& chrome_path) {
+ LOG(INFO) << "Looking for Chrome version folder under " << chrome_path;
+ std::wstring root_path(chrome_path);
+ file_util::AppendToPath(&root_path, L"*");
+
+ WIN32_FIND_DATA find_data;
+ HANDLE file_handle = FindFirstFile(root_path.c_str(), &find_data);
+ BOOL ret = TRUE;
+ installer::Version *version = NULL;
+ // Here we are assuming that the installer we have is really valid so there
+ // can not be two version directories. We exit as soon as we find a valid
+ // version directory.
+ while (ret) {
+ if (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ LOG(INFO) << "directory found: " << find_data.cFileName;
+ version = installer::Version::GetVersionFromString(find_data.cFileName);
+ if (version) break;
+ }
+ ret = FindNextFile(file_handle, &find_data);
+ }
+ FindClose(file_handle);
+
+ return version;
+}
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
new file mode 100644
index 0000000..c9e067f
--- /dev/null
+++ b/chrome/installer/setup/setup_util.h
@@ -0,0 +1,19 @@
+// Copyright (c) 2009 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.
+//
+// This file declares util functions for setup project.
+
+#ifndef CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
+#define CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
+
+#include "chrome/installer/util/version.h"
+
+namespace setup_util {
+ // Find the version of Chrome from an install source directory.
+ // Chrome_path should contain a version folder.
+ // Returns the first version found or NULL if no version is found.
+ installer::Version* GetVersionFromDir(const std::wstring& chrome_path);
+} // namespace setup_util
+
+#endif // CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
new file mode 100644
index 0000000..42cecdf
--- /dev/null
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -0,0 +1,70 @@
+// Copyright (c) 2009 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.
+
+#include <windows.h>
+
+#include <fstream>
+#include <iostream>
+
+#include "base/base_paths.h"
+#include "base/file_util.h"
+#include "base/path_service.h"
+#include "base/process_util.h"
+#include "base/string_util.h"
+#include "chrome/installer/setup/setup_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+ class SetupUtilTest : public testing::Test {
+ protected:
+ virtual void SetUp() {
+ // Name a subdirectory of the user temp directory.
+ ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
+ test_dir_ = test_dir_.AppendASCII("SetupUtilTest");
+
+ // Create a fresh, empty copy of this test directory.
+ file_util::Delete(test_dir_, true);
+ file_util::CreateDirectory(test_dir_);
+ ASSERT_TRUE(file_util::PathExists(test_dir_));
+ }
+
+ virtual void TearDown() {
+ // Clean up test directory
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
+ ASSERT_FALSE(file_util::PathExists(test_dir_));
+ }
+
+ // the path to temporary directory used to contain the test operations
+ FilePath test_dir_;
+ };
+};
+
+// Test that we are parsing Chrome version correctly.
+TEST_F(SetupUtilTest, GetVersionFromDirTest) {
+ // Create a version dir
+ std::wstring chrome_dir(test_dir_.value());
+ file_util::AppendToPath(&chrome_dir, L"1.0.0.0");
+ CreateDirectory(chrome_dir.c_str(), NULL);
+ ASSERT_TRUE(file_util::PathExists(chrome_dir));
+ scoped_ptr<installer::Version> version(
+ setup_util::GetVersionFromDir(test_dir_.value()));
+ ASSERT_TRUE(version->GetString() == L"1.0.0.0");
+
+ file_util::Delete(chrome_dir, true);
+ ASSERT_FALSE(file_util::PathExists(chrome_dir));
+ ASSERT_TRUE(setup_util::GetVersionFromDir(test_dir_.value()) == NULL);
+
+ chrome_dir = test_dir_.value();
+ file_util::AppendToPath(&chrome_dir, L"ABC");
+ CreateDirectory(chrome_dir.c_str(), NULL);
+ ASSERT_TRUE(file_util::PathExists(chrome_dir));
+ ASSERT_TRUE(setup_util::GetVersionFromDir(test_dir_.value()) == NULL);
+
+ chrome_dir = test_dir_.value();
+ file_util::AppendToPath(&chrome_dir, L"2.3.4.5");
+ CreateDirectory(chrome_dir.c_str(), NULL);
+ ASSERT_TRUE(file_util::PathExists(chrome_dir));
+ version.reset(setup_util::GetVersionFromDir(test_dir_.value()));
+ ASSERT_TRUE(version->GetString() == L"2.3.4.5");
+}
generated by cgit v1.1 at 2025-03-01 08:03:43 +0000