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

Side by Side Diff: base/test/test_shortcut_win.cc

Issue 108193019: Installer: adding ResolveShortcutProperties(); updating shortcut icons during shortcut migration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using ValidatePathsAreEqual() to fix tests; removing test code. Created 6 years, 11 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 | « base/test/test_shortcut_win.h ('k') | base/win/shortcut.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4
5 #include "base/test/test_shortcut_win.h" 5 #include "base/test/test_shortcut_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 #include <propkey.h> 9 #include <propkey.h>
10 10
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/win/scoped_comptr.h" 14 #include "base/win/scoped_comptr.h"
15 #include "base/win/scoped_propvariant.h" 15 #include "base/win/scoped_propvariant.h"
16 #include "base/win/windows_version.h" 16 #include "base/win/windows_version.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 namespace base { 19 namespace base {
20 namespace win { 20 namespace win {
21 21
22 namespace {
23
24 // Validates |actual_path|'s LongPathName case-insensitively matches
25 // |expected_path|'s LongPathName.
26 void ValidatePathsAreEqual(const base::FilePath& expected_path, 22 void ValidatePathsAreEqual(const base::FilePath& expected_path,
27 const base::FilePath& actual_path) { 23 const base::FilePath& actual_path) {
28 wchar_t long_expected_path_chars[MAX_PATH] = {0}; 24 wchar_t long_expected_path_chars[MAX_PATH] = {0};
29 wchar_t long_actual_path_chars[MAX_PATH] = {0}; 25 wchar_t long_actual_path_chars[MAX_PATH] = {0};
30 26
31 // If |expected_path| is empty confirm immediately that |actual_path| is also 27 // If |expected_path| is empty confirm immediately that |actual_path| is also
32 // empty. 28 // empty.
33 if (expected_path.empty()) { 29 if (expected_path.empty()) {
34 EXPECT_TRUE(actual_path.empty()); 30 EXPECT_TRUE(actual_path.empty());
35 return; 31 return;
36 } 32 }
37 33
38 // Proceed with LongPathName matching which will also confirm the paths exist. 34 // Proceed with LongPathName matching which will also confirm the paths exist.
39 EXPECT_NE(0U, ::GetLongPathName( 35 EXPECT_NE(0U, ::GetLongPathName(
40 expected_path.value().c_str(), long_expected_path_chars, MAX_PATH)) 36 expected_path.value().c_str(), long_expected_path_chars, MAX_PATH))
41 << "Failed to get LongPathName of " << expected_path.value(); 37 << "Failed to get LongPathName of " << expected_path.value();
42 EXPECT_NE(0U, ::GetLongPathName( 38 EXPECT_NE(0U, ::GetLongPathName(
43 actual_path.value().c_str(), long_actual_path_chars, MAX_PATH)) 39 actual_path.value().c_str(), long_actual_path_chars, MAX_PATH))
44 << "Failed to get LongPathName of " << actual_path.value(); 40 << "Failed to get LongPathName of " << actual_path.value();
45 41
46 base::FilePath long_expected_path(long_expected_path_chars); 42 base::FilePath long_expected_path(long_expected_path_chars);
47 base::FilePath long_actual_path(long_actual_path_chars); 43 base::FilePath long_actual_path(long_actual_path_chars);
48 EXPECT_FALSE(long_expected_path.empty()); 44 EXPECT_FALSE(long_expected_path.empty());
49 EXPECT_FALSE(long_actual_path.empty()); 45 EXPECT_FALSE(long_actual_path.empty());
50 46
51 EXPECT_EQ(long_expected_path, long_actual_path); 47 EXPECT_EQ(long_expected_path, long_actual_path);
52 } 48 }
53 49
54 } // namespace
55
56 void ValidateShortcut(const base::FilePath& shortcut_path, 50 void ValidateShortcut(const base::FilePath& shortcut_path,
57 const ShortcutProperties& properties) { 51 const ShortcutProperties& properties) {
58 ScopedComPtr<IShellLink> i_shell_link; 52 ScopedComPtr<IShellLink> i_shell_link;
59 ScopedComPtr<IPersistFile> i_persist_file; 53 ScopedComPtr<IPersistFile> i_persist_file;
60 54
61 wchar_t read_target[MAX_PATH] = {0}; 55 wchar_t read_target[MAX_PATH] = {0};
62 wchar_t read_working_dir[MAX_PATH] = {0}; 56 wchar_t read_working_dir[MAX_PATH] = {0};
63 wchar_t read_arguments[MAX_PATH] = {0}; 57 wchar_t read_arguments[MAX_PATH] = {0};
64 wchar_t read_description[MAX_PATH] = {0}; 58 wchar_t read_description[MAX_PATH] = {0};
65 wchar_t read_icon[MAX_PATH] = {0}; 59 wchar_t read_icon[MAX_PATH] = {0};
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 break; 146 break;
153 default: 147 default:
154 ADD_FAILURE() << "Unexpected variant type: " << pv_dual_mode.get().vt; 148 ADD_FAILURE() << "Unexpected variant type: " << pv_dual_mode.get().vt;
155 } 149 }
156 } 150 }
157 } 151 }
158 } 152 }
159 153
160 } // namespace win 154 } // namespace win
161 } // namespace base 155 } // namespace base
OLDNEW
« no previous file with comments | « base/test/test_shortcut_win.h ('k') | base/win/shortcut.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698