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

Side by Side Diff: base/file_version_info_unittest.cc

Issue 1218243002: Fix some clang warnings with -Wmissing-braces in base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | base/files/memory_mapped_file_win.cc » ('j') | base/third_party/nspr/prtime.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_version_info.h" 5 #include "base/file_version_info.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 18 matching lines...) Expand all
29 #endif 29 #endif
30 30
31 } // namespace 31 } // namespace
32 32
33 #if defined(OS_WIN) 33 #if defined(OS_WIN)
34 TEST(FileVersionInfoTest, HardCodedProperties) { 34 TEST(FileVersionInfoTest, HardCodedProperties) {
35 const wchar_t* kDLLNames[] = { 35 const wchar_t* kDLLNames[] = {
36 L"FileVersionInfoTest1.dll" 36 L"FileVersionInfoTest1.dll"
37 }; 37 };
38 38
39 const wchar_t* kExpectedValues[1][15] = { 39 const wchar_t* kExpectedValues[1][15] = {{
Nico 2015/07/01 18:40:48 nit: const wchar_t* const
dcheng 2015/07/01 21:26:38 Done.
dcheng 2015/07/01 21:26:38 Done.
40 // FileVersionInfoTest.dll 40 // FileVersionInfoTest.dll
41 L"Goooooogle", // company_name 41 L"Goooooogle", // company_name
42 L"Google", // company_short_name 42 L"Google", // company_short_name
43 L"This is the product name", // product_name 43 L"This is the product name", // product_name
44 L"This is the product short name", // product_short_name 44 L"This is the product short name", // product_short_name
45 L"The Internal Name", // internal_name 45 L"The Internal Name", // internal_name
46 L"4.3.2.1", // product_version 46 L"4.3.2.1", // product_version
47 L"Private build property", // private_build 47 L"Private build property", // private_build
48 L"Special build property", // special_build 48 L"Special build property", // special_build
49 L"This is a particularly interesting comment", // comments 49 L"This is a particularly interesting comment", // comments
50 L"This is the original filename", // original_filename 50 L"This is the original filename", // original_filename
51 L"This is my file description", // file_description 51 L"This is my file description", // file_description
52 L"1.2.3.4", // file_version 52 L"1.2.3.4", // file_version
53 L"This is the legal copyright", // legal_copyright 53 L"This is the legal copyright", // legal_copyright
54 L"This is the legal trademarks", // legal_trademarks 54 L"This is the legal trademarks", // legal_trademarks
55 L"This is the last change", // last_change 55 L"This is the last change", // last_change
56 }; 56 }};
57 57
58 for (int i = 0; i < arraysize(kDLLNames); ++i) { 58 for (int i = 0; i < arraysize(kDLLNames); ++i) {
Nico 2015/07/01 18:40:49 nit: Since arraysize(kDLLNames) is 1, maybe get ri
59 FilePath dll_path = GetTestDataPath(); 59 FilePath dll_path = GetTestDataPath();
60 dll_path = dll_path.Append(kDLLNames[i]); 60 dll_path = dll_path.Append(kDLLNames[i]);
61 61
62 scoped_ptr<FileVersionInfo> version_info( 62 scoped_ptr<FileVersionInfo> version_info(
63 FileVersionInfo::CreateFileVersionInfo(dll_path)); 63 FileVersionInfo::CreateFileVersionInfo(dll_path));
64 64
65 int j = 0; 65 int j = 0;
66 EXPECT_EQ(kExpectedValues[i][j++], version_info->company_name()); 66 EXPECT_EQ(kExpectedValues[i][j++], version_info->company_name());
67 EXPECT_EQ(kExpectedValues[i][j++], version_info->company_short_name()); 67 EXPECT_EQ(kExpectedValues[i][j++], version_info->company_short_name());
68 EXPECT_EQ(kExpectedValues[i][j++], version_info->product_name()); 68 EXPECT_EQ(kExpectedValues[i][j++], version_info->product_name());
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str)); 132 EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3", &str));
133 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str); 133 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str);
134 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", 134 EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043",
135 version_info_win->GetStringValue(L"Custom prop 3")); 135 version_info_win->GetStringValue(L"Custom prop 3"));
136 136
137 // Test an non-existing property. 137 // Test an non-existing property.
138 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str)); 138 EXPECT_FALSE(version_info_win->GetValue(L"Unknown property", &str));
139 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property")); 139 EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property"));
140 } 140 }
141 #endif 141 #endif
OLDNEW
« no previous file with comments | « no previous file | base/files/memory_mapped_file_win.cc » ('j') | base/third_party/nspr/prtime.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698