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

Side by Side Diff: chrome/browser/extensions/api/i18n/i18n_apitest.cc

Issue 2314363002: extensions: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Comment addressed Created 4 years, 3 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
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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "extensions/common/extension.h" 12 #include "extensions/common/extension.h"
13 #include "extensions/test/result_catcher.h" 13 #include "extensions/test/result_catcher.h"
14 #include "net/test/embedded_test_server/embedded_test_server.h" 14 #include "net/test/embedded_test_server/embedded_test_server.h"
15 15
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) { 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) {
17 ASSERT_TRUE(StartEmbeddedTestServer()); 17 ASSERT_TRUE(StartEmbeddedTestServer());
18 ASSERT_TRUE(RunExtensionTest("i18n")) << message_; 18 ASSERT_TRUE(RunExtensionTest("i18n")) << message_;
19 } 19 }
20 20
21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) { 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) {
22 ASSERT_TRUE(embedded_test_server()->Start()); 22 ASSERT_TRUE(embedded_test_server()->Start());
23 // Create an Extension whose messages.json file will be updated. 23 // Create an Extension whose messages.json file will be updated.
24 base::ScopedTempDir extension_dir; 24 base::ScopedTempDir extension_dir;
25 ASSERT_TRUE(extension_dir.CreateUniqueTempDir()); 25 ASSERT_TRUE(extension_dir.CreateUniqueTempDir());
26 base::CopyFile( 26 base::CopyFile(
27 test_data_dir_.AppendASCII("i18nUpdate") 27 test_data_dir_.AppendASCII("i18nUpdate").AppendASCII("manifest.json"),
28 .AppendASCII("manifest.json"), 28 extension_dir.GetPath().AppendASCII("manifest.json"));
29 extension_dir.path().AppendASCII("manifest.json"));
30 base::CopyFile( 29 base::CopyFile(
31 test_data_dir_.AppendASCII("i18nUpdate") 30 test_data_dir_.AppendASCII("i18nUpdate").AppendASCII("contentscript.js"),
32 .AppendASCII("contentscript.js"), 31 extension_dir.GetPath().AppendASCII("contentscript.js"));
33 extension_dir.path().AppendASCII("contentscript.js"));
34 base::CopyDirectory( 32 base::CopyDirectory(
35 test_data_dir_.AppendASCII("i18nUpdate") 33 test_data_dir_.AppendASCII("i18nUpdate").AppendASCII("_locales"),
36 .AppendASCII("_locales"), 34 extension_dir.GetPath().AppendASCII("_locales"), true);
37 extension_dir.path().AppendASCII("_locales"),
38 true);
39 35
40 const extensions::Extension* extension = LoadExtension(extension_dir.path()); 36 const extensions::Extension* extension =
37 LoadExtension(extension_dir.GetPath());
41 38
42 extensions::ResultCatcher catcher; 39 extensions::ResultCatcher catcher;
43 40
44 // Test that the messages.json file is loaded and the i18n message is loaded. 41 // Test that the messages.json file is loaded and the i18n message is loaded.
45 ui_test_utils::NavigateToURL( 42 ui_test_utils::NavigateToURL(
46 browser(), 43 browser(),
47 embedded_test_server()->GetURL("/extensions/test_file.html")); 44 embedded_test_server()->GetURL("/extensions/test_file.html"));
48 EXPECT_TRUE(catcher.GetNextResult()); 45 EXPECT_TRUE(catcher.GetNextResult());
49 46
50 base::string16 title; 47 base::string16 title;
51 ui_test_utils::GetCurrentTabTitle(browser(), &title); 48 ui_test_utils::GetCurrentTabTitle(browser(), &title);
52 EXPECT_EQ(std::string("FIRSTMESSAGE"), base::UTF16ToUTF8(title)); 49 EXPECT_EQ(std::string("FIRSTMESSAGE"), base::UTF16ToUTF8(title));
53 50
54 // Change messages.json file and reload extension. 51 // Change messages.json file and reload extension.
55 base::CopyFile( 52 base::CopyFile(
56 test_data_dir_.AppendASCII("i18nUpdate") 53 test_data_dir_.AppendASCII("i18nUpdate").AppendASCII("messages2.json"),
57 .AppendASCII("messages2.json"), 54 extension_dir.GetPath().AppendASCII("_locales/en/messages.json"));
58 extension_dir.path().AppendASCII("_locales/en/messages.json"));
59 ReloadExtension(extension->id()); 55 ReloadExtension(extension->id());
60 56
61 // Check that the i18n message is also changed. 57 // Check that the i18n message is also changed.
62 ui_test_utils::NavigateToURL( 58 ui_test_utils::NavigateToURL(
63 browser(), 59 browser(),
64 embedded_test_server()->GetURL("/extensions/test_file.html")); 60 embedded_test_server()->GetURL("/extensions/test_file.html"));
65 EXPECT_TRUE(catcher.GetNextResult()); 61 EXPECT_TRUE(catcher.GetNextResult());
66 62
67 ui_test_utils::GetCurrentTabTitle(browser(), &title); 63 ui_test_utils::GetCurrentTabTitle(browser(), &title);
68 EXPECT_EQ(std::string("SECONDMESSAGE"), base::UTF16ToUTF8(title)); 64 EXPECT_EQ(std::string("SECONDMESSAGE"), base::UTF16ToUTF8(title));
69 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698