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

Side by Side Diff: content/browser/webui/web_ui_message_handler_unittest.cc

Issue 2036893002: Remove ListValue::Append(new {Fundamental,String}Value(...)) pattern in //content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | content/child/v8_value_converter_impl_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 "content/public/browser/web_ui_message_handler.h" 5 #include "content/public/browser/web_ui_message_handler.h"
6 6
7 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 TEST(WebUIMessageHandlerTest, ExtractIntegerValue) { 14 TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
15 base::ListValue list; 15 base::ListValue list;
16 int value, zero_value = 0, neg_value = -1234, pos_value = 1234; 16 int value, zero_value = 0, neg_value = -1234, pos_value = 1234;
17 base::string16 zero_string(base::UTF8ToUTF16("0")); 17 base::string16 zero_string(base::UTF8ToUTF16("0"));
18 base::string16 neg_string(base::UTF8ToUTF16("-1234")); 18 base::string16 neg_string(base::UTF8ToUTF16("-1234"));
19 base::string16 pos_string(base::UTF8ToUTF16("1234")); 19 base::string16 pos_string(base::UTF8ToUTF16("1234"));
20 20
21 list.Append(new base::FundamentalValue(zero_value)); 21 list.AppendInteger(zero_value);
22 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 22 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
23 EXPECT_EQ(value, zero_value); 23 EXPECT_EQ(value, zero_value);
24 list.Clear(); 24 list.Clear();
25 25
26 list.Append(new base::FundamentalValue(neg_value)); 26 list.AppendInteger(neg_value);
27 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 27 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
28 EXPECT_EQ(value, neg_value); 28 EXPECT_EQ(value, neg_value);
29 list.Clear(); 29 list.Clear();
30 30
31 list.Append(new base::FundamentalValue(pos_value)); 31 list.AppendInteger(pos_value);
32 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 32 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
33 EXPECT_EQ(value, pos_value); 33 EXPECT_EQ(value, pos_value);
34 list.Clear(); 34 list.Clear();
35 35
36 list.Append(new base::StringValue(zero_string)); 36 list.AppendString(zero_string);
37 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 37 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
38 EXPECT_EQ(value, zero_value); 38 EXPECT_EQ(value, zero_value);
39 list.Clear(); 39 list.Clear();
40 40
41 list.Append(new base::StringValue(neg_string)); 41 list.AppendString(neg_string);
42 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 42 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
43 EXPECT_EQ(value, neg_value); 43 EXPECT_EQ(value, neg_value);
44 list.Clear(); 44 list.Clear();
45 45
46 list.Append(new base::StringValue(pos_string)); 46 list.AppendString(pos_string);
47 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value)); 47 EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
48 EXPECT_EQ(value, pos_value); 48 EXPECT_EQ(value, pos_value);
49 } 49 }
50 50
51 TEST(WebUIMessageHandlerTest, ExtractDoubleValue) { 51 TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
52 base::ListValue list; 52 base::ListValue list;
53 double value, zero_value = 0.0, neg_value = -1234.5, pos_value = 1234.5; 53 double value, zero_value = 0.0, neg_value = -1234.5, pos_value = 1234.5;
54 base::string16 zero_string(base::UTF8ToUTF16("0")); 54 base::string16 zero_string(base::UTF8ToUTF16("0"));
55 base::string16 neg_string(base::UTF8ToUTF16("-1234.5")); 55 base::string16 neg_string(base::UTF8ToUTF16("-1234.5"));
56 base::string16 pos_string(base::UTF8ToUTF16("1234.5")); 56 base::string16 pos_string(base::UTF8ToUTF16("1234.5"));
57 57
58 list.Append(new base::FundamentalValue(zero_value)); 58 list.AppendDouble(zero_value);
59 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 59 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
60 EXPECT_DOUBLE_EQ(value, zero_value); 60 EXPECT_DOUBLE_EQ(value, zero_value);
61 list.Clear(); 61 list.Clear();
62 62
63 list.Append(new base::FundamentalValue(neg_value)); 63 list.AppendDouble(neg_value);
64 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 64 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
65 EXPECT_DOUBLE_EQ(value, neg_value); 65 EXPECT_DOUBLE_EQ(value, neg_value);
66 list.Clear(); 66 list.Clear();
67 67
68 list.Append(new base::FundamentalValue(pos_value)); 68 list.AppendDouble(pos_value);
69 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 69 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
70 EXPECT_DOUBLE_EQ(value, pos_value); 70 EXPECT_DOUBLE_EQ(value, pos_value);
71 list.Clear(); 71 list.Clear();
72 72
73 list.Append(new base::StringValue(zero_string)); 73 list.AppendString(zero_string);
74 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 74 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
75 EXPECT_DOUBLE_EQ(value, zero_value); 75 EXPECT_DOUBLE_EQ(value, zero_value);
76 list.Clear(); 76 list.Clear();
77 77
78 list.Append(new base::StringValue(neg_string)); 78 list.AppendString(neg_string);
79 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 79 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
80 EXPECT_DOUBLE_EQ(value, neg_value); 80 EXPECT_DOUBLE_EQ(value, neg_value);
81 list.Clear(); 81 list.Clear();
82 82
83 list.Append(new base::StringValue(pos_string)); 83 list.AppendString(pos_string);
84 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value)); 84 EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
85 EXPECT_DOUBLE_EQ(value, pos_value); 85 EXPECT_DOUBLE_EQ(value, pos_value);
86 } 86 }
87 87
88 TEST(WebUIMessageHandlerTest, ExtractStringValue) { 88 TEST(WebUIMessageHandlerTest, ExtractStringValue) {
89 base::ListValue list; 89 base::ListValue list;
90 base::string16 in_string(base::UTF8ToUTF16( 90 base::string16 in_string(base::UTF8ToUTF16(
91 "The facts, though interesting, are irrelevant.")); 91 "The facts, though interesting, are irrelevant."));
92 list.Append(new base::StringValue(in_string)); 92 list.AppendString(in_string);
93 base::string16 out_string = WebUIMessageHandler::ExtractStringValue(&list); 93 base::string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
94 EXPECT_EQ(in_string, out_string); 94 EXPECT_EQ(in_string, out_string);
95 } 95 }
96 96
97 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/child/v8_value_converter_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698