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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 966643002: Add [TypeChecking=Unrestricted] to InternalDictionary (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix test expectations Created 5 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
« no previous file with comments | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionary.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
(...skipping 20 matching lines...) Expand all
31 if (testingDictionary.hasLongOrNullMember()) 31 if (testingDictionary.hasLongOrNullMember())
32 m_longOrNullMember = testingDictionary.longOrNullMember(); 32 m_longOrNullMember = testingDictionary.longOrNullMember();
33 // |longOrNullMemberWithDefault| has a default value but can be null, so 33 // |longOrNullMemberWithDefault| has a default value but can be null, so
34 // we need to check availability. 34 // we need to check availability.
35 if (testingDictionary.hasLongOrNullMemberWithDefault()) 35 if (testingDictionary.hasLongOrNullMemberWithDefault())
36 m_longOrNullMemberWithDefault = testingDictionary.longOrNullMemberWithDe fault(); 36 m_longOrNullMemberWithDefault = testingDictionary.longOrNullMemberWithDe fault();
37 if (testingDictionary.hasBooleanMember()) 37 if (testingDictionary.hasBooleanMember())
38 m_booleanMember = testingDictionary.booleanMember(); 38 m_booleanMember = testingDictionary.booleanMember();
39 if (testingDictionary.hasDoubleMember()) 39 if (testingDictionary.hasDoubleMember())
40 m_doubleMember = testingDictionary.doubleMember(); 40 m_doubleMember = testingDictionary.doubleMember();
41 if (testingDictionary.hasUnrestrictedDoubleMember())
42 m_unrestrictedDoubleMember = testingDictionary.unrestrictedDoubleMember( );
41 m_stringMember = testingDictionary.stringMember(); 43 m_stringMember = testingDictionary.stringMember();
42 m_stringMemberWithDefault = testingDictionary.stringMemberWithDefault(); 44 m_stringMemberWithDefault = testingDictionary.stringMemberWithDefault();
43 m_byteStringMember = testingDictionary.byteStringMember(); 45 m_byteStringMember = testingDictionary.byteStringMember();
44 m_usvStringMember = testingDictionary.usvStringMember(); 46 m_usvStringMember = testingDictionary.usvStringMember();
45 if (testingDictionary.hasStringSequenceMember()) 47 if (testingDictionary.hasStringSequenceMember())
46 m_stringSequenceMember = testingDictionary.stringSequenceMember(); 48 m_stringSequenceMember = testingDictionary.stringSequenceMember();
47 if (testingDictionary.hasStringSequenceOrNullMember()) 49 if (testingDictionary.hasStringSequenceOrNullMember())
48 m_stringSequenceOrNullMember = testingDictionary.stringSequenceOrNullMem ber(); 50 m_stringSequenceOrNullMember = testingDictionary.stringSequenceOrNullMem ber();
49 m_enumMember = testingDictionary.enumMember(); 51 m_enumMember = testingDictionary.enumMember();
50 m_enumMemberWithDefault = testingDictionary.enumMemberWithDefault(); 52 m_enumMemberWithDefault = testingDictionary.enumMemberWithDefault();
(...skipping 19 matching lines...) Expand all
70 result.setLongMemberWithEnforceRange(m_longMemberWithEnforceRange.get()) ; 72 result.setLongMemberWithEnforceRange(m_longMemberWithEnforceRange.get()) ;
71 result.setLongMemberWithDefault(m_longMemberWithDefault); 73 result.setLongMemberWithDefault(m_longMemberWithDefault);
72 if (m_longOrNullMember) 74 if (m_longOrNullMember)
73 result.setLongOrNullMember(m_longOrNullMember.get()); 75 result.setLongOrNullMember(m_longOrNullMember.get());
74 if (m_longOrNullMemberWithDefault) 76 if (m_longOrNullMemberWithDefault)
75 result.setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get( )); 77 result.setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get( ));
76 if (m_booleanMember) 78 if (m_booleanMember)
77 result.setBooleanMember(m_booleanMember.get()); 79 result.setBooleanMember(m_booleanMember.get());
78 if (m_doubleMember) 80 if (m_doubleMember)
79 result.setDoubleMember(m_doubleMember.get()); 81 result.setDoubleMember(m_doubleMember.get());
82 if (m_unrestrictedDoubleMember)
83 result.setUnrestrictedDoubleMember(m_unrestrictedDoubleMember.get());
80 result.setStringMember(m_stringMember); 84 result.setStringMember(m_stringMember);
81 result.setStringMemberWithDefault(m_stringMemberWithDefault); 85 result.setStringMemberWithDefault(m_stringMemberWithDefault);
82 result.setByteStringMember(m_byteStringMember); 86 result.setByteStringMember(m_byteStringMember);
83 result.setUsvStringMember(m_usvStringMember); 87 result.setUsvStringMember(m_usvStringMember);
84 if (m_stringSequenceMember) 88 if (m_stringSequenceMember)
85 result.setStringSequenceMember(m_stringSequenceMember.get()); 89 result.setStringSequenceMember(m_stringSequenceMember.get());
86 if (m_stringSequenceOrNullMember) 90 if (m_stringSequenceOrNullMember)
87 result.setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get()) ; 91 result.setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get()) ;
88 result.setEnumMember(m_enumMember); 92 result.setEnumMember(m_enumMember);
89 result.setEnumMemberWithDefault(m_enumMemberWithDefault); 93 result.setEnumMemberWithDefault(m_enumMemberWithDefault);
(...skipping 27 matching lines...) Expand all
117 void DictionaryTest::reset() 121 void DictionaryTest::reset()
118 { 122 {
119 m_longMember = nullptr; 123 m_longMember = nullptr;
120 m_longMemberWithClamp = nullptr; 124 m_longMemberWithClamp = nullptr;
121 m_longMemberWithEnforceRange = nullptr; 125 m_longMemberWithEnforceRange = nullptr;
122 m_longMemberWithDefault = -1; // This value should not be returned. 126 m_longMemberWithDefault = -1; // This value should not be returned.
123 m_longOrNullMember = nullptr; 127 m_longOrNullMember = nullptr;
124 m_longOrNullMemberWithDefault = nullptr; 128 m_longOrNullMemberWithDefault = nullptr;
125 m_booleanMember = nullptr; 129 m_booleanMember = nullptr;
126 m_doubleMember = nullptr; 130 m_doubleMember = nullptr;
131 m_unrestrictedDoubleMember = nullptr;
127 m_stringMember = String(); 132 m_stringMember = String();
128 m_stringMemberWithDefault = String("Should not be returned"); 133 m_stringMemberWithDefault = String("Should not be returned");
129 m_stringSequenceMember = nullptr; 134 m_stringSequenceMember = nullptr;
130 m_stringSequenceOrNullMember = nullptr; 135 m_stringSequenceOrNullMember = nullptr;
131 m_enumMember = String(); 136 m_enumMember = String();
132 m_enumMemberWithDefault = String(); 137 m_enumMemberWithDefault = String();
133 m_enumOrNullMember = String(); 138 m_enumOrNullMember = String();
134 m_elementMember = nullptr; 139 m_elementMember = nullptr;
135 m_elementOrNullMember = nullptr; 140 m_elementOrNullMember = nullptr;
136 m_objectMember = ScriptValue(); 141 m_objectMember = ScriptValue();
137 m_objectOrNullMemberWithDefault = ScriptValue(); 142 m_objectOrNullMemberWithDefault = ScriptValue();
138 m_doubleOrStringMember = DoubleOrString(); 143 m_doubleOrStringMember = DoubleOrString();
139 m_eventTargetOrNullMember = nullptr; 144 m_eventTargetOrNullMember = nullptr;
140 m_derivedStringMember = String(); 145 m_derivedStringMember = String();
141 m_derivedStringMemberWithDefault = String(); 146 m_derivedStringMemberWithDefault = String();
142 } 147 }
143 148
144 DEFINE_TRACE(DictionaryTest) 149 DEFINE_TRACE(DictionaryTest)
145 { 150 {
146 visitor->trace(m_elementMember); 151 visitor->trace(m_elementMember);
147 visitor->trace(m_elementOrNullMember); 152 visitor->trace(m_elementOrNullMember);
148 visitor->trace(m_eventTargetOrNullMember); 153 visitor->trace(m_eventTargetOrNullMember);
149 } 154 }
150 155
151 } 156 }
OLDNEW
« no previous file with comments | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionary.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698