Skip to content

Commit 1b16a82

Browse files
committed
Add missing assert_deprecated_warning
1 parent eeb4efc commit 1b16a82

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

test/json/json_common_interface_test.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ def test_load_file_with_bad_default_external_encoding
212212
end
213213

214214
def test_deprecated_dump_default_options
215-
assert JSON.dump_default_options
215+
assert_deprecated_warning(/dump_default_options/) do
216+
JSON.dump_default_options
217+
end
216218
end
217219

218220
private

test/json/json_generator_test.rb

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,17 @@ def test_generate_custom
136136
end
137137

138138
def test_fast_generate
139-
json = fast_generate(@hash)
140-
assert_equal(parse(@json2), parse(json))
141-
parsed_json = parse(json)
142-
assert_equal(@hash, parsed_json)
143-
json = fast_generate({1=>2})
144-
assert_equal('{"1":2}', json)
145-
parsed_json = parse(json)
146-
assert_equal({"1"=>2}, parsed_json)
147-
assert_equal '666', fast_generate(666)
139+
assert_deprecated_warning(/fast_generate/) do
140+
json = fast_generate(@hash)
141+
assert_equal(parse(@json2), parse(json))
142+
parsed_json = parse(json)
143+
assert_equal(@hash, parsed_json)
144+
json = fast_generate({1=>2})
145+
assert_equal('{"1":2}', json)
146+
parsed_json = parse(json)
147+
assert_equal({"1"=>2}, parsed_json)
148+
assert_equal '666', fast_generate(666)
149+
end
148150
end
149151

150152
def test_own_state
@@ -219,24 +221,26 @@ def test_state_defaults
219221
end
220222

221223
def test_allow_nan
222-
error = assert_raise(GeneratorError) { generate([JSON::NaN]) }
223-
assert_same JSON::NaN, error.invalid_object
224-
assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
225-
assert_raise(GeneratorError) { fast_generate([JSON::NaN]) }
226-
assert_raise(GeneratorError) { pretty_generate([JSON::NaN]) }
227-
assert_equal "[\n NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
228-
error = assert_raise(GeneratorError) { generate([JSON::Infinity]) }
229-
assert_same JSON::Infinity, error.invalid_object
230-
assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
231-
assert_raise(GeneratorError) { fast_generate([JSON::Infinity]) }
232-
assert_raise(GeneratorError) { pretty_generate([JSON::Infinity]) }
233-
assert_equal "[\n Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
234-
error = assert_raise(GeneratorError) { generate([JSON::MinusInfinity]) }
235-
assert_same JSON::MinusInfinity, error.invalid_object
236-
assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
237-
assert_raise(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
238-
assert_raise(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
239-
assert_equal "[\n -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
224+
assert_deprecated_warning(/fast_generate/) do
225+
error = assert_raise(GeneratorError) { generate([JSON::NaN]) }
226+
assert_same JSON::NaN, error.invalid_object
227+
assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
228+
assert_raise(GeneratorError) { fast_generate([JSON::NaN]) }
229+
assert_raise(GeneratorError) { pretty_generate([JSON::NaN]) }
230+
assert_equal "[\n NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
231+
error = assert_raise(GeneratorError) { generate([JSON::Infinity]) }
232+
assert_same JSON::Infinity, error.invalid_object
233+
assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
234+
assert_raise(GeneratorError) { fast_generate([JSON::Infinity]) }
235+
assert_raise(GeneratorError) { pretty_generate([JSON::Infinity]) }
236+
assert_equal "[\n Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
237+
error = assert_raise(GeneratorError) { generate([JSON::MinusInfinity]) }
238+
assert_same JSON::MinusInfinity, error.invalid_object
239+
assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
240+
assert_raise(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
241+
assert_raise(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
242+
assert_equal "[\n -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
243+
end
240244
end
241245

242246
def test_depth

0 commit comments

Comments
 (0)