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

Side by Side Diff: remoting/base/resources_unittest.cc

Issue 12207034: Linux/ChromeOS Chromium style checker cleanup, remoting/ edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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 | « no previous file | remoting/client/audio_player_unittest.cc » ('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 "remoting/base/resources.h" 5 #include "remoting/base/resources.h"
6 6
7 #include "remoting/base/common_resources.h" 7 #include "remoting/base/common_resources.h"
8 #include "remoting/base/string_resources.h" 8 #include "remoting/base/string_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace remoting { 13 namespace remoting {
14 14
15 // TODO(sergeyu): Resources loading doesn't work yet on OSX. Fix it and enable 15 // TODO(sergeyu): Resources loading doesn't work yet on OSX. Fix it and enable
16 // the test. 16 // the test.
17 #if !defined(OS_MACOSX) 17 #if !defined(OS_MACOSX)
18 #define MAYBE_ProductName ProductName 18 #define MAYBE_ProductName ProductName
19 #define MAYBE_ProductLogo ProductLogo 19 #define MAYBE_ProductLogo ProductLogo
20 #else // !defined(OS_MACOSX) 20 #else // !defined(OS_MACOSX)
21 #define MAYBE_ProductName DISABLED_ProductName 21 #define MAYBE_ProductName DISABLED_ProductName
22 #define MAYBE_ProductLogo DISABLED_ProductLogo 22 #define MAYBE_ProductLogo DISABLED_ProductLogo
23 #endif // defined(OS_MACOSX) 23 #endif // defined(OS_MACOSX)
24 24
25 class ResourcesTest : public testing::Test { 25 class ResourcesTest : public testing::Test {
26 protected: 26 protected:
27 void SetUp() OVERRIDE { 27 virtual void SetUp() OVERRIDE {
28 ASSERT_TRUE(LoadResources("en-US")); 28 ASSERT_TRUE(LoadResources("en-US"));
29 } 29 }
30 30
31 void TearDown() OVERRIDE { 31 virtual void TearDown() OVERRIDE {
32 ui::ResourceBundle::CleanupSharedInstance(); 32 ui::ResourceBundle::CleanupSharedInstance();
33 } 33 }
34 }; 34 };
35 35
36 TEST_F(ResourcesTest, MAYBE_ProductName) { 36 TEST_F(ResourcesTest, MAYBE_ProductName) {
37 #if defined(GOOGLE_CHROME_BUILD) 37 #if defined(GOOGLE_CHROME_BUILD)
38 std::string expected_product_name = "Chrome Remote Desktop"; 38 std::string expected_product_name = "Chrome Remote Desktop";
39 #else // defined(GOOGLE_CHROME_BUILD) 39 #else // defined(GOOGLE_CHROME_BUILD)
40 std::string expected_product_name = "Chromoting"; 40 std::string expected_product_name = "Chromoting";
41 #endif // !defined(GOOGLE_CHROME_BUILD) 41 #endif // !defined(GOOGLE_CHROME_BUILD)
42 EXPECT_EQ(expected_product_name, 42 EXPECT_EQ(expected_product_name,
43 l10n_util::GetStringUTF8(IDR_PRODUCT_NAME)); 43 l10n_util::GetStringUTF8(IDR_PRODUCT_NAME));
44 } 44 }
45 45
46 TEST_F(ResourcesTest, MAYBE_ProductLogo) { 46 TEST_F(ResourcesTest, MAYBE_ProductLogo) {
47 gfx::Image logo16 = ui::ResourceBundle::GetSharedInstance().GetImageNamed( 47 gfx::Image logo16 = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
48 IDR_PRODUCT_LOGO_16); 48 IDR_PRODUCT_LOGO_16);
49 EXPECT_FALSE(logo16.IsEmpty()); 49 EXPECT_FALSE(logo16.IsEmpty());
50 gfx::Image logo32 = ui::ResourceBundle::GetSharedInstance().GetImageNamed( 50 gfx::Image logo32 = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
51 IDR_PRODUCT_LOGO_32); 51 IDR_PRODUCT_LOGO_32);
52 EXPECT_FALSE(logo32.IsEmpty()); 52 EXPECT_FALSE(logo32.IsEmpty());
53 } 53 }
54 54
55 } // namespace remoting 55 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/client/audio_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698