diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 05:20:14 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 05:20:14 +0000 |
| commit | c944a1e065f1778aa9de126ebdda1514c21634ae (patch) | |
| tree | 35292e05abca32e25e48900d8da2cf646f2b181b /chrome/installer | |
| parent | 747e5512174b7c24d256f93f867cb02db0430298 (diff) | |
| download | chromium_src-c944a1e065f1778aa9de126ebdda1514c21634ae.zip chromium_src-c944a1e065f1778aa9de126ebdda1514c21634ae.tar.gz chromium_src-c944a1e065f1778aa9de126ebdda1514c21634ae.tar.bz2 | |
Add string resources to installer unit tests binary.
BUG=9637
Review URL: http://codereview.chromium.org/60086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
4 files changed, 97 insertions, 4 deletions
diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc index 6abfe38..bd13cdc 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -227,8 +227,8 @@ TEST_F(GoogleChromeDistributionTest, TestExtractUninstallMetrics) { &uninstall_metrics_string)); EXPECT_EQ(expected_url_string, uninstall_metrics_string); } +#endif -#else // The distribution strings should not be empty. The unit tests are not linking // with the chrome resources so we cannot test official build. TEST(BrowserDistribution, StringsTest) { @@ -253,7 +253,6 @@ TEST(BrowserDistribution, AlternateAndNormalShortcutName) { EXPECT_FALSE(normal_name.empty()); EXPECT_FALSE(alternate_name.empty()); } -#endif TEST(MasterPreferences, ParseDistroParams) { std::wstring prefs; diff --git a/chrome/installer/util/installer_unittests.rc b/chrome/installer/util/installer_unittests.rc new file mode 100644 index 0000000..0df7619 --- /dev/null +++ b/chrome/installer/util/installer_unittests.rc @@ -0,0 +1,68 @@ +// Microsoft Visual C++ generated resource script.
+//
+#include "installer_unittests_resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////////////////////////////// +// +// String Table +// +#include "installer_util_strings.rc" + +
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/chrome/installer/util/installer_unittests.vcproj b/chrome/installer/util/installer_unittests.vcproj index 8078508..99aa3b1 100644 --- a/chrome/installer/util/installer_unittests.vcproj +++ b/chrome/installer/util/installer_unittests.vcproj @@ -17,7 +17,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)\tools\build\win\unit_test.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)\tools\build\win\unit_test.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)installer\util\using_util.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)\tools\build\win\unit_test.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)\tools\build\win\unit_test.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)installer\util\using_util.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -141,6 +141,18 @@ </References> <Files> <Filter + Name="resources" + > + <File + RelativePath="installer_unittests.rc" + > + </File> + <File + RelativePath="installer_unittests_resource.h" + > + </File> + </Filter> + <Filter Name="support" > <File diff --git a/chrome/installer/util/installer_unittests_resource.h b/chrome/installer/util/installer_unittests_resource.h new file mode 100644 index 0000000..c5979f7 --- /dev/null +++ b/chrome/installer/util/installer_unittests_resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by installer_unittests.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
|