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

Side by Side Diff: Source/core/testing/DictionaryTest.cpp

Issue 1057453002: bindings: Throw TypeError when required dictionary member is undefined (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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 | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionaryDerived.idl » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "DictionaryTest.h" 6 #include "DictionaryTest.h"
7 7
8 #include "core/testing/InternalDictionary.h" 8 #include "core/testing/InternalDictionary.h"
9 #include "core/testing/InternalDictionaryDerived.h" 9 #include "core/testing/InternalDictionaryDerived.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 DictionaryTest::DictionaryTest() 13 DictionaryTest::DictionaryTest()
14 : m_requiredBooleanMember(false)
14 { 15 {
15 } 16 }
16 17
17 DictionaryTest::~DictionaryTest() 18 DictionaryTest::~DictionaryTest()
18 { 19 {
19 } 20 }
20 21
21 void DictionaryTest::set(const InternalDictionary& testingDictionary) 22 void DictionaryTest::set(const InternalDictionary& testingDictionary)
22 { 23 {
23 reset(); 24 reset();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 result.setElementOrNullMember(m_elementOrNullMember); 99 result.setElementOrNullMember(m_elementOrNullMember);
99 result.setObjectMember(m_objectMember); 100 result.setObjectMember(m_objectMember);
100 result.setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault); 101 result.setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault);
101 if (!m_doubleOrStringMember.isNull()) 102 if (!m_doubleOrStringMember.isNull())
102 result.setDoubleOrStringMember(m_doubleOrStringMember); 103 result.setDoubleOrStringMember(m_doubleOrStringMember);
103 result.setEventTargetOrNullMember(m_eventTargetOrNullMember); 104 result.setEventTargetOrNullMember(m_eventTargetOrNullMember);
104 } 105 }
105 106
106 void DictionaryTest::setDerived(const InternalDictionaryDerived& derived) 107 void DictionaryTest::setDerived(const InternalDictionaryDerived& derived)
107 { 108 {
109 ASSERT(derived.hasRequiredBooleanMember());
108 set(derived); 110 set(derived);
109 if (derived.hasDerivedStringMember()) 111 if (derived.hasDerivedStringMember())
110 m_derivedStringMember = derived.derivedStringMember(); 112 m_derivedStringMember = derived.derivedStringMember();
111 m_derivedStringMemberWithDefault = derived.derivedStringMemberWithDefault(); 113 m_derivedStringMemberWithDefault = derived.derivedStringMemberWithDefault();
114 m_requiredBooleanMember = derived.requiredBooleanMember();
112 } 115 }
113 116
114 void DictionaryTest::getDerived(InternalDictionaryDerived& result) 117 void DictionaryTest::getDerived(InternalDictionaryDerived& result)
115 { 118 {
116 get(result); 119 get(result);
117 result.setDerivedStringMember(m_derivedStringMember); 120 result.setDerivedStringMember(m_derivedStringMember);
118 result.setDerivedStringMemberWithDefault(m_derivedStringMemberWithDefault); 121 result.setDerivedStringMemberWithDefault(m_derivedStringMemberWithDefault);
122 result.setRequiredBooleanMember(m_requiredBooleanMember);
119 } 123 }
120 124
121 void DictionaryTest::reset() 125 void DictionaryTest::reset()
122 { 126 {
123 m_longMember = nullptr; 127 m_longMember = nullptr;
124 m_longMemberWithClamp = nullptr; 128 m_longMemberWithClamp = nullptr;
125 m_longMemberWithEnforceRange = nullptr; 129 m_longMemberWithEnforceRange = nullptr;
126 m_longMemberWithDefault = -1; // This value should not be returned. 130 m_longMemberWithDefault = -1; // This value should not be returned.
127 m_longOrNullMember = nullptr; 131 m_longOrNullMember = nullptr;
128 m_longOrNullMemberWithDefault = nullptr; 132 m_longOrNullMemberWithDefault = nullptr;
129 m_booleanMember = nullptr; 133 m_booleanMember = nullptr;
130 m_doubleMember = nullptr; 134 m_doubleMember = nullptr;
131 m_unrestrictedDoubleMember = nullptr; 135 m_unrestrictedDoubleMember = nullptr;
132 m_stringMember = String(); 136 m_stringMember = String();
133 m_stringMemberWithDefault = String("Should not be returned"); 137 m_stringMemberWithDefault = String("Should not be returned");
134 m_stringSequenceMember = nullptr; 138 m_stringSequenceMember = nullptr;
135 m_stringSequenceOrNullMember = nullptr; 139 m_stringSequenceOrNullMember = nullptr;
136 m_enumMember = String(); 140 m_enumMember = String();
137 m_enumMemberWithDefault = String(); 141 m_enumMemberWithDefault = String();
138 m_enumOrNullMember = String(); 142 m_enumOrNullMember = String();
139 m_elementMember = nullptr; 143 m_elementMember = nullptr;
140 m_elementOrNullMember = nullptr; 144 m_elementOrNullMember = nullptr;
141 m_objectMember = ScriptValue(); 145 m_objectMember = ScriptValue();
142 m_objectOrNullMemberWithDefault = ScriptValue(); 146 m_objectOrNullMemberWithDefault = ScriptValue();
143 m_doubleOrStringMember = DoubleOrString(); 147 m_doubleOrStringMember = DoubleOrString();
144 m_eventTargetOrNullMember = nullptr; 148 m_eventTargetOrNullMember = nullptr;
145 m_derivedStringMember = String(); 149 m_derivedStringMember = String();
146 m_derivedStringMemberWithDefault = String(); 150 m_derivedStringMemberWithDefault = String();
151 m_requiredBooleanMember = false;
147 } 152 }
148 153
149 DEFINE_TRACE(DictionaryTest) 154 DEFINE_TRACE(DictionaryTest)
150 { 155 {
151 visitor->trace(m_elementMember); 156 visitor->trace(m_elementMember);
152 visitor->trace(m_elementOrNullMember); 157 visitor->trace(m_elementOrNullMember);
153 visitor->trace(m_eventTargetOrNullMember); 158 visitor->trace(m_eventTargetOrNullMember);
154 } 159 }
155 160
156 } 161 }
OLDNEW
« no previous file with comments | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionaryDerived.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698