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

Side by Side Diff: tools/json_schema_compiler/test/crossref_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 "tools/json_schema_compiler/test/crossref.h" 5 #include "tools/json_schema_compiler/test/crossref.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "tools/json_schema_compiler/test/simple_api.h" 11 #include "tools/json_schema_compiler/test/simple_api.h"
12 12
13 using namespace test::api; 13 using namespace test::api;
14 14
15 namespace { 15 namespace {
16 16
17 std::unique_ptr<base::DictionaryValue> CreateTestTypeValue() { 17 std::unique_ptr<base::DictionaryValue> CreateTestTypeValue() {
18 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 18 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
19 value->Set("number", new base::FundamentalValue(1.1)); 19 value->Set("number", new base::Value(1.1));
20 value->Set("integer", new base::FundamentalValue(4)); 20 value->Set("integer", new base::Value(4));
21 value->Set("string", new base::StringValue("bling")); 21 value->Set("string", new base::StringValue("bling"));
22 value->Set("boolean", new base::FundamentalValue(true)); 22 value->Set("boolean", new base::Value(true));
23 return value; 23 return value;
24 } 24 }
25 25
26 } // namespace 26 } // namespace
27 27
28 TEST(JsonSchemaCompilerCrossrefTest, CrossrefTypePopulateAndToValue) { 28 TEST(JsonSchemaCompilerCrossrefTest, CrossrefTypePopulateAndToValue) {
29 base::DictionaryValue crossref_orig; 29 base::DictionaryValue crossref_orig;
30 crossref_orig.Set("testType", CreateTestTypeValue().release()); 30 crossref_orig.Set("testType", CreateTestTypeValue().release());
31 crossref_orig.Set("testEnumRequired", new base::StringValue("one")); 31 crossref_orig.Set("testEnumRequired", new base::StringValue("one"));
32 crossref_orig.Set("testEnumOptional", new base::StringValue("two")); 32 crossref_orig.Set("testEnumOptional", new base::StringValue("two"));
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 results->GetDictionary(0, &result_dict); 82 results->GetDictionary(0, &result_dict);
83 EXPECT_TRUE(value->Equals(result_dict)); 83 EXPECT_TRUE(value->Equals(result_dict));
84 } 84 }
85 85
86 TEST(JsonSchemaCompilerCrossrefTest, TestTypeInObjectParamsCreate) { 86 TEST(JsonSchemaCompilerCrossrefTest, TestTypeInObjectParamsCreate) {
87 { 87 {
88 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 88 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
89 std::unique_ptr<base::DictionaryValue> param_object_value( 89 std::unique_ptr<base::DictionaryValue> param_object_value(
90 new base::DictionaryValue()); 90 new base::DictionaryValue());
91 param_object_value->Set("testType", CreateTestTypeValue().release()); 91 param_object_value->Set("testType", CreateTestTypeValue().release());
92 param_object_value->Set("boolean", new base::FundamentalValue(true)); 92 param_object_value->Set("boolean", new base::Value(true));
93 params_value->Append(std::move(param_object_value)); 93 params_value->Append(std::move(param_object_value));
94 std::unique_ptr<crossref::TestTypeInObject::Params> params( 94 std::unique_ptr<crossref::TestTypeInObject::Params> params(
95 crossref::TestTypeInObject::Params::Create(*params_value)); 95 crossref::TestTypeInObject::Params::Create(*params_value));
96 EXPECT_TRUE(params.get()); 96 EXPECT_TRUE(params.get());
97 EXPECT_TRUE(params->param_object.test_type.get()); 97 EXPECT_TRUE(params->param_object.test_type.get());
98 EXPECT_TRUE(params->param_object.boolean); 98 EXPECT_TRUE(params->param_object.boolean);
99 EXPECT_TRUE(CreateTestTypeValue()->Equals( 99 EXPECT_TRUE(CreateTestTypeValue()->Equals(
100 params->param_object.test_type->ToValue().get())); 100 params->param_object.test_type->ToValue().get()));
101 } 101 }
102 { 102 {
103 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 103 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
104 std::unique_ptr<base::DictionaryValue> param_object_value( 104 std::unique_ptr<base::DictionaryValue> param_object_value(
105 new base::DictionaryValue()); 105 new base::DictionaryValue());
106 param_object_value->Set("boolean", new base::FundamentalValue(true)); 106 param_object_value->Set("boolean", new base::Value(true));
107 params_value->Append(std::move(param_object_value)); 107 params_value->Append(std::move(param_object_value));
108 std::unique_ptr<crossref::TestTypeInObject::Params> params( 108 std::unique_ptr<crossref::TestTypeInObject::Params> params(
109 crossref::TestTypeInObject::Params::Create(*params_value)); 109 crossref::TestTypeInObject::Params::Create(*params_value));
110 EXPECT_TRUE(params.get()); 110 EXPECT_TRUE(params.get());
111 EXPECT_FALSE(params->param_object.test_type.get()); 111 EXPECT_FALSE(params->param_object.test_type.get());
112 EXPECT_TRUE(params->param_object.boolean); 112 EXPECT_TRUE(params->param_object.boolean);
113 } 113 }
114 { 114 {
115 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 115 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
116 std::unique_ptr<base::DictionaryValue> param_object_value( 116 std::unique_ptr<base::DictionaryValue> param_object_value(
117 new base::DictionaryValue()); 117 new base::DictionaryValue());
118 param_object_value->Set("testType", new base::StringValue("invalid")); 118 param_object_value->Set("testType", new base::StringValue("invalid"));
119 param_object_value->Set("boolean", new base::FundamentalValue(true)); 119 param_object_value->Set("boolean", new base::Value(true));
120 params_value->Append(std::move(param_object_value)); 120 params_value->Append(std::move(param_object_value));
121 std::unique_ptr<crossref::TestTypeInObject::Params> params( 121 std::unique_ptr<crossref::TestTypeInObject::Params> params(
122 crossref::TestTypeInObject::Params::Create(*params_value)); 122 crossref::TestTypeInObject::Params::Create(*params_value));
123 EXPECT_FALSE(params.get()); 123 EXPECT_FALSE(params.get());
124 } 124 }
125 { 125 {
126 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 126 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
127 std::unique_ptr<base::DictionaryValue> param_object_value( 127 std::unique_ptr<base::DictionaryValue> param_object_value(
128 new base::DictionaryValue()); 128 new base::DictionaryValue());
129 param_object_value->Set("testType", CreateTestTypeValue().release()); 129 param_object_value->Set("testType", CreateTestTypeValue().release());
130 params_value->Append(std::move(param_object_value)); 130 params_value->Append(std::move(param_object_value));
131 std::unique_ptr<crossref::TestTypeInObject::Params> params( 131 std::unique_ptr<crossref::TestTypeInObject::Params> params(
132 crossref::TestTypeInObject::Params::Create(*params_value)); 132 crossref::TestTypeInObject::Params::Create(*params_value));
133 EXPECT_FALSE(params.get()); 133 EXPECT_FALSE(params.get());
134 } 134 }
135 } 135 }
OLDNEW
« no previous file with comments | « tools/json_schema_compiler/test/choices_unittest.cc ('k') | tools/json_schema_compiler/test/error_generation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698