mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
use assert_raise
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a2845a44ff
commit
068f312a7c
14 changed files with 81 additions and 77 deletions
|
@ -6,15 +6,15 @@ end
|
||||||
module Fiddle
|
module Fiddle
|
||||||
class TestClosure < Fiddle::TestCase
|
class TestClosure < Fiddle::TestCase
|
||||||
def test_argument_errors
|
def test_argument_errors
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Closure.new(TYPE_INT, TYPE_INT)
|
Closure.new(TYPE_INT, TYPE_INT)
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Closure.new('foo', [TYPE_INT])
|
Closure.new('foo', [TYPE_INT])
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Closure.new(TYPE_INT, ['meow!'])
|
Closure.new(TYPE_INT, ['meow!'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -60,7 +60,7 @@ module Fiddle
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_undefined_ctype
|
def test_undefined_ctype
|
||||||
assert_raises(DLError) { parse_ctype('DWORD') }
|
assert_raise(DLError) { parse_ctype('DWORD') }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_undefined_ctype_with_type_alias
|
def test_undefined_ctype_with_type_alias
|
||||||
|
@ -92,7 +92,7 @@ module Fiddle
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_struct_undefined
|
def test_struct_undefined
|
||||||
assert_raises(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
|
assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_struct_undefined_with_type_alias
|
def test_struct_undefined_with_type_alias
|
||||||
|
|
|
@ -12,7 +12,7 @@ module Fiddle
|
||||||
|
|
||||||
def test_syscall_with_tainted_string
|
def test_syscall_with_tainted_string
|
||||||
f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT)
|
f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT)
|
||||||
assert_raises(SecurityError) do
|
assert_raise(SecurityError) do
|
||||||
Thread.new {
|
Thread.new {
|
||||||
$SAFE = 1
|
$SAFE = 1
|
||||||
f.call("uname -rs".taint)
|
f.call("uname -rs".taint)
|
||||||
|
|
|
@ -23,15 +23,15 @@ module Fiddle
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_argument_errors
|
def test_argument_errors
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
|
Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Function.new(@libm['sin'], ['foo'], TYPE_DOUBLE)
|
Function.new(@libm['sin'], ['foo'], TYPE_DOUBLE)
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raises(TypeError) do
|
assert_raise(TypeError) do
|
||||||
Function.new(@libm['sin'], [TYPE_DOUBLE], 'foo')
|
Function.new(@libm['sin'], [TYPE_DOUBLE], 'foo')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -49,10 +49,10 @@ module Fiddle
|
||||||
}.new(TYPE_INT, [TYPE_INT])
|
}.new(TYPE_INT, [TYPE_INT])
|
||||||
func = Function.new(closure, [TYPE_INT], TYPE_INT)
|
func = Function.new(closure, [TYPE_INT], TYPE_INT)
|
||||||
|
|
||||||
assert_raises(ArgumentError) do
|
assert_raise(ArgumentError) do
|
||||||
func.call(1,2,3)
|
func.call(1,2,3)
|
||||||
end
|
end
|
||||||
assert_raises(ArgumentError) do
|
assert_raise(ArgumentError) do
|
||||||
func.call
|
func.call
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,8 +15,8 @@ module Fiddle
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_static_sym_unknown
|
def test_static_sym_unknown
|
||||||
assert_raises(DLError) { Fiddle::Handle.sym('fooo') }
|
assert_raise(DLError) { Fiddle::Handle.sym('fooo') }
|
||||||
assert_raises(DLError) { Fiddle::Handle['fooo'] }
|
assert_raise(DLError) { Fiddle::Handle['fooo'] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_static_sym
|
def test_static_sym
|
||||||
|
@ -41,20 +41,20 @@ module Fiddle
|
||||||
def test_sym_closed_handle
|
def test_sym_closed_handle
|
||||||
handle = Fiddle::Handle.new(LIBC_SO)
|
handle = Fiddle::Handle.new(LIBC_SO)
|
||||||
handle.close
|
handle.close
|
||||||
assert_raises(DLError) { handle.sym("calloc") }
|
assert_raise(DLError) { handle.sym("calloc") }
|
||||||
assert_raises(DLError) { handle["calloc"] }
|
assert_raise(DLError) { handle["calloc"] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_sym_unknown
|
def test_sym_unknown
|
||||||
handle = Fiddle::Handle.new(LIBC_SO)
|
handle = Fiddle::Handle.new(LIBC_SO)
|
||||||
assert_raises(DLError) { handle.sym('fooo') }
|
assert_raise(DLError) { handle.sym('fooo') }
|
||||||
assert_raises(DLError) { handle['fooo'] }
|
assert_raise(DLError) { handle['fooo'] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_sym_with_bad_args
|
def test_sym_with_bad_args
|
||||||
handle = Handle.new(LIBC_SO)
|
handle = Handle.new(LIBC_SO)
|
||||||
assert_raises(TypeError) { handle.sym(nil) }
|
assert_raise(TypeError) { handle.sym(nil) }
|
||||||
assert_raises(TypeError) { handle[nil] }
|
assert_raise(TypeError) { handle[nil] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_sym
|
def test_sym
|
||||||
|
@ -71,7 +71,7 @@ module Fiddle
|
||||||
def test_handle_close_twice
|
def test_handle_close_twice
|
||||||
handle = Handle.new(LIBC_SO)
|
handle = Handle.new(LIBC_SO)
|
||||||
handle.close
|
handle.close
|
||||||
assert_raises(DLError) do
|
assert_raise(DLError) do
|
||||||
handle.close
|
handle.close
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -44,7 +44,7 @@ module Fiddle
|
||||||
|
|
||||||
class TestImport < TestCase
|
class TestImport < TestCase
|
||||||
def test_ensure_call_dlload
|
def test_ensure_call_dlload
|
||||||
err = assert_raises(RuntimeError) do
|
err = assert_raise(RuntimeError) do
|
||||||
Class.new do
|
Class.new do
|
||||||
extend Importer
|
extend Importer
|
||||||
extern "void *strcpy(char*, char*)"
|
extern "void *strcpy(char*, char*)"
|
||||||
|
|
|
@ -105,7 +105,7 @@ module Fiddle
|
||||||
ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
|
ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
|
||||||
assert_equal ptr, ptr2
|
assert_equal ptr, ptr2
|
||||||
|
|
||||||
assert_raises(Fiddle::DLError) do
|
assert_raise(Fiddle::DLError) do
|
||||||
Pointer.to_ptr Struct.new(:to_ptr).new(nil)
|
Pointer.to_ptr Struct.new(:to_ptr).new(nil)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -65,10 +65,10 @@ class TestJSON < Test::Unit::TestCase
|
||||||
assert_equal([23], parse('[23]'))
|
assert_equal([23], parse('[23]'))
|
||||||
assert_equal([0.23], parse('[0.23]'))
|
assert_equal([0.23], parse('[0.23]'))
|
||||||
assert_equal([0.0], parse('[0e0]'))
|
assert_equal([0.0], parse('[0e0]'))
|
||||||
assert_raises(JSON::ParserError) { parse('[+23.2]') }
|
assert_raise(JSON::ParserError) { parse('[+23.2]') }
|
||||||
assert_raises(JSON::ParserError) { parse('[+23]') }
|
assert_raise(JSON::ParserError) { parse('[+23]') }
|
||||||
assert_raises(JSON::ParserError) { parse('[.23]') }
|
assert_raise(JSON::ParserError) { parse('[.23]') }
|
||||||
assert_raises(JSON::ParserError) { parse('[023]') }
|
assert_raise(JSON::ParserError) { parse('[023]') }
|
||||||
assert_equal_float [3.141], parse('[3.141]')
|
assert_equal_float [3.141], parse('[3.141]')
|
||||||
assert_equal_float [-3.141], parse('[-3.141]')
|
assert_equal_float [-3.141], parse('[-3.141]')
|
||||||
assert_equal_float [3.141], parse('[3141e-3]')
|
assert_equal_float [3.141], parse('[3141e-3]')
|
||||||
|
@ -77,11 +77,11 @@ class TestJSON < Test::Unit::TestCase
|
||||||
assert_equal_float [3.141], parse('[3141.0E-3]')
|
assert_equal_float [3.141], parse('[3141.0E-3]')
|
||||||
assert_equal_float [-3.141], parse('[-3141.0e-3]')
|
assert_equal_float [-3.141], parse('[-3141.0e-3]')
|
||||||
assert_equal_float [-3.141], parse('[-3141e-3]')
|
assert_equal_float [-3.141], parse('[-3141e-3]')
|
||||||
assert_raises(ParserError) { parse('[NaN]') }
|
assert_raise(ParserError) { parse('[NaN]') }
|
||||||
assert parse('[NaN]', :allow_nan => true).first.nan?
|
assert parse('[NaN]', :allow_nan => true).first.nan?
|
||||||
assert_raises(ParserError) { parse('[Infinity]') }
|
assert_raise(ParserError) { parse('[Infinity]') }
|
||||||
assert_equal [1.0/0], parse('[Infinity]', :allow_nan => true)
|
assert_equal [1.0/0], parse('[Infinity]', :allow_nan => true)
|
||||||
assert_raises(ParserError) { parse('[-Infinity]') }
|
assert_raise(ParserError) { parse('[-Infinity]') }
|
||||||
assert_equal [-1.0/0], parse('[-Infinity]', :allow_nan => true)
|
assert_equal [-1.0/0], parse('[-Infinity]', :allow_nan => true)
|
||||||
assert_equal([""], parse('[""]'))
|
assert_equal([""], parse('[""]'))
|
||||||
assert_equal(["foobar"], parse('["foobar"]'))
|
assert_equal(["foobar"], parse('["foobar"]'))
|
||||||
|
@ -95,7 +95,7 @@ class TestJSON < Test::Unit::TestCase
|
||||||
assert_equal({ "a" => nil }, parse('{"a":null}'))
|
assert_equal({ "a" => nil }, parse('{"a":null}'))
|
||||||
assert_equal({ "a" => false }, parse('{ "a" : false } '))
|
assert_equal({ "a" => false }, parse('{ "a" : false } '))
|
||||||
assert_equal({ "a" => false }, parse('{"a":false}'))
|
assert_equal({ "a" => false }, parse('{"a":false}'))
|
||||||
assert_raises(JSON::ParserError) { parse('{false}') }
|
assert_raise(JSON::ParserError) { parse('{false}') }
|
||||||
assert_equal({ "a" => true }, parse('{"a":true}'))
|
assert_equal({ "a" => true }, parse('{"a":true}'))
|
||||||
assert_equal({ "a" => true }, parse(' { "a" : true } '))
|
assert_equal({ "a" => true }, parse(' { "a" : true } '))
|
||||||
assert_equal({ "a" => -23 }, parse(' { "a" : -23 } '))
|
assert_equal({ "a" => -23 }, parse(' { "a" : -23 } '))
|
||||||
|
@ -380,7 +380,7 @@ EOT
|
||||||
* comment */
|
* comment */
|
||||||
}
|
}
|
||||||
EOT
|
EOT
|
||||||
assert_raises(ParserError) { parse(json) }
|
assert_raise(ParserError) { parse(json) }
|
||||||
json = <<EOT
|
json = <<EOT
|
||||||
{
|
{
|
||||||
"key1":"value1" /* multi line
|
"key1":"value1" /* multi line
|
||||||
|
@ -389,7 +389,7 @@ EOT
|
||||||
and again, throw an Error */
|
and again, throw an Error */
|
||||||
}
|
}
|
||||||
EOT
|
EOT
|
||||||
assert_raises(ParserError) { parse(json) }
|
assert_raise(ParserError) { parse(json) }
|
||||||
json = <<EOT
|
json = <<EOT
|
||||||
{
|
{
|
||||||
"key1":"value1" /*/*/
|
"key1":"value1" /*/*/
|
||||||
|
@ -425,32 +425,32 @@ EOT
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_wrong_inputs
|
def test_wrong_inputs
|
||||||
assert_raises(ParserError) { JSON.parse('"foo"') }
|
assert_raise(ParserError) { JSON.parse('"foo"') }
|
||||||
assert_raises(ParserError) { JSON.parse('123') }
|
assert_raise(ParserError) { JSON.parse('123') }
|
||||||
assert_raises(ParserError) { JSON.parse('[] bla') }
|
assert_raise(ParserError) { JSON.parse('[] bla') }
|
||||||
assert_raises(ParserError) { JSON.parse('[] 1') }
|
assert_raise(ParserError) { JSON.parse('[] 1') }
|
||||||
assert_raises(ParserError) { JSON.parse('[] []') }
|
assert_raise(ParserError) { JSON.parse('[] []') }
|
||||||
assert_raises(ParserError) { JSON.parse('[] {}') }
|
assert_raise(ParserError) { JSON.parse('[] {}') }
|
||||||
assert_raises(ParserError) { JSON.parse('{} []') }
|
assert_raise(ParserError) { JSON.parse('{} []') }
|
||||||
assert_raises(ParserError) { JSON.parse('{} {}') }
|
assert_raise(ParserError) { JSON.parse('{} {}') }
|
||||||
assert_raises(ParserError) { JSON.parse('[NULL]') }
|
assert_raise(ParserError) { JSON.parse('[NULL]') }
|
||||||
assert_raises(ParserError) { JSON.parse('[FALSE]') }
|
assert_raise(ParserError) { JSON.parse('[FALSE]') }
|
||||||
assert_raises(ParserError) { JSON.parse('[TRUE]') }
|
assert_raise(ParserError) { JSON.parse('[TRUE]') }
|
||||||
assert_raises(ParserError) { JSON.parse('[07] ') }
|
assert_raise(ParserError) { JSON.parse('[07] ') }
|
||||||
assert_raises(ParserError) { JSON.parse('[0a]') }
|
assert_raise(ParserError) { JSON.parse('[0a]') }
|
||||||
assert_raises(ParserError) { JSON.parse('[1.]') }
|
assert_raise(ParserError) { JSON.parse('[1.]') }
|
||||||
assert_raises(ParserError) { JSON.parse(' ') }
|
assert_raise(ParserError) { JSON.parse(' ') }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_nesting
|
def test_nesting
|
||||||
assert_raises(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 }
|
assert_raise(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 }
|
||||||
assert_raises(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse }
|
assert_raise(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse }
|
||||||
assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2)
|
assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2)
|
||||||
too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
|
too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
|
||||||
too_deep_ary = eval too_deep
|
too_deep_ary = eval too_deep
|
||||||
assert_raises(JSON::NestingError) { JSON.parse too_deep }
|
assert_raise(JSON::NestingError) { JSON.parse too_deep }
|
||||||
assert_raises(JSON::NestingError) { JSON.parser.new(too_deep).parse }
|
assert_raise(JSON::NestingError) { JSON.parser.new(too_deep).parse }
|
||||||
assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 }
|
assert_raise(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 }
|
||||||
ok = JSON.parse too_deep, :max_nesting => 101
|
ok = JSON.parse too_deep, :max_nesting => 101
|
||||||
assert_equal too_deep_ary, ok
|
assert_equal too_deep_ary, ok
|
||||||
ok = JSON.parse too_deep, :max_nesting => nil
|
ok = JSON.parse too_deep, :max_nesting => nil
|
||||||
|
@ -459,10 +459,10 @@ EOT
|
||||||
assert_equal too_deep_ary, ok
|
assert_equal too_deep_ary, ok
|
||||||
ok = JSON.parse too_deep, :max_nesting => 0
|
ok = JSON.parse too_deep, :max_nesting => 0
|
||||||
assert_equal too_deep_ary, ok
|
assert_equal too_deep_ary, ok
|
||||||
assert_raises(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 }
|
assert_raise(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 }
|
||||||
assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2)
|
assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2)
|
||||||
assert_raises(JSON::NestingError) { JSON.generate too_deep_ary }
|
assert_raise(JSON::NestingError) { JSON.generate too_deep_ary }
|
||||||
assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
|
assert_raise(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
|
||||||
ok = JSON.generate too_deep_ary, :max_nesting => 101
|
ok = JSON.generate too_deep_ary, :max_nesting => 101
|
||||||
assert_equal too_deep, ok
|
assert_equal too_deep, ok
|
||||||
ok = JSON.generate too_deep_ary, :max_nesting => nil
|
ok = JSON.generate too_deep_ary, :max_nesting => nil
|
||||||
|
@ -505,8 +505,8 @@ EOT
|
||||||
too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
|
too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
|
||||||
assert_equal too_deep, JSON.dump(eval(too_deep))
|
assert_equal too_deep, JSON.dump(eval(too_deep))
|
||||||
assert_kind_of String, Marshal.dump(eval(too_deep))
|
assert_kind_of String, Marshal.dump(eval(too_deep))
|
||||||
assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 100) }
|
assert_raise(ArgumentError) { JSON.dump(eval(too_deep), 100) }
|
||||||
assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
|
assert_raise(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
|
||||||
assert_equal too_deep, JSON.dump(eval(too_deep), 101)
|
assert_equal too_deep, JSON.dump(eval(too_deep), 101)
|
||||||
assert_kind_of String, Marshal.dump(eval(too_deep), 101)
|
assert_kind_of String, Marshal.dump(eval(too_deep), 101)
|
||||||
output = StringIO.new
|
output = StringIO.new
|
||||||
|
|
|
@ -112,7 +112,7 @@ class TestJSONAddition < Test::Unit::TestCase
|
||||||
c = C.new
|
c = C.new
|
||||||
assert !C.json_creatable?
|
assert !C.json_creatable?
|
||||||
json = generate(c)
|
json = generate(c)
|
||||||
assert_raises(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) }
|
assert_raise(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_raw_strings
|
def test_raw_strings
|
||||||
|
@ -151,7 +151,7 @@ class TestJSONAddition < Test::Unit::TestCase
|
||||||
assert_equal s, JSON(JSON(s), :create_additions => true)
|
assert_equal s, JSON(JSON(s), :create_additions => true)
|
||||||
struct = Struct.new :foo, :bar
|
struct = Struct.new :foo, :bar
|
||||||
s = struct.new 4711, 'foot'
|
s = struct.new 4711, 'foot'
|
||||||
assert_raises(JSONError) { JSON(s) }
|
assert_raise(JSONError) { JSON(s) }
|
||||||
begin
|
begin
|
||||||
raise TypeError, "test me"
|
raise TypeError, "test me"
|
||||||
rescue TypeError => e
|
rescue TypeError => e
|
||||||
|
|
|
@ -59,7 +59,7 @@ class TestJSONEncoding < Test::Unit::TestCase
|
||||||
assert_equal @generated, JSON.generate(@utf_16_data, :ascii_only => true)
|
assert_equal @generated, JSON.generate(@utf_16_data, :ascii_only => true)
|
||||||
else
|
else
|
||||||
# XXX checking of correct utf8 data is not as strict (yet?) without :ascii_only
|
# XXX checking of correct utf8 data is not as strict (yet?) without :ascii_only
|
||||||
assert_raises(JSON::GeneratorError) { JSON.generate(@utf_16_data, :ascii_only => true) }
|
assert_raise(JSON::GeneratorError) { JSON.generate(@utf_16_data, :ascii_only => true) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,7 +26,7 @@ class TestJSONFixtures < Test::Unit::TestCase
|
||||||
|
|
||||||
def test_failing
|
def test_failing
|
||||||
for name, source in @failed
|
for name, source in @failed
|
||||||
assert_raises(JSON::ParserError, JSON::NestingError,
|
assert_raise(JSON::ParserError, JSON::NestingError,
|
||||||
"Did not fail for fixture '#{name}': #{source.inspect}") do
|
"Did not fail for fixture '#{name}': #{source.inspect}") do
|
||||||
JSON.parse(source)
|
JSON.parse(source)
|
||||||
end
|
end
|
||||||
|
|
|
@ -123,12 +123,12 @@ EOT
|
||||||
assert s[:check_circular?]
|
assert s[:check_circular?]
|
||||||
h = { 1=>2 }
|
h = { 1=>2 }
|
||||||
h[3] = h
|
h[3] = h
|
||||||
assert_raises(JSON::NestingError) { generate(h) }
|
assert_raise(JSON::NestingError) { generate(h) }
|
||||||
assert_raises(JSON::NestingError) { generate(h, s) }
|
assert_raise(JSON::NestingError) { generate(h, s) }
|
||||||
s = JSON.state.new
|
s = JSON.state.new
|
||||||
a = [ 1, 2 ]
|
a = [ 1, 2 ]
|
||||||
a << a
|
a << a
|
||||||
assert_raises(JSON::NestingError) { generate(a, s) }
|
assert_raise(JSON::NestingError) { generate(a, s) }
|
||||||
assert s.check_circular?
|
assert s.check_circular?
|
||||||
assert s[:check_circular?]
|
assert s[:check_circular?]
|
||||||
end
|
end
|
||||||
|
@ -185,34 +185,34 @@ EOT
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_allow_nan
|
def test_allow_nan
|
||||||
assert_raises(GeneratorError) { generate([JSON::NaN]) }
|
assert_raise(GeneratorError) { generate([JSON::NaN]) }
|
||||||
assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
|
assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
|
||||||
assert_raises(GeneratorError) { fast_generate([JSON::NaN]) }
|
assert_raise(GeneratorError) { fast_generate([JSON::NaN]) }
|
||||||
assert_raises(GeneratorError) { pretty_generate([JSON::NaN]) }
|
assert_raise(GeneratorError) { pretty_generate([JSON::NaN]) }
|
||||||
assert_equal "[\n NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
|
assert_equal "[\n NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
|
||||||
assert_raises(GeneratorError) { generate([JSON::Infinity]) }
|
assert_raise(GeneratorError) { generate([JSON::Infinity]) }
|
||||||
assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
|
assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
|
||||||
assert_raises(GeneratorError) { fast_generate([JSON::Infinity]) }
|
assert_raise(GeneratorError) { fast_generate([JSON::Infinity]) }
|
||||||
assert_raises(GeneratorError) { pretty_generate([JSON::Infinity]) }
|
assert_raise(GeneratorError) { pretty_generate([JSON::Infinity]) }
|
||||||
assert_equal "[\n Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
|
assert_equal "[\n Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
|
||||||
assert_raises(GeneratorError) { generate([JSON::MinusInfinity]) }
|
assert_raise(GeneratorError) { generate([JSON::MinusInfinity]) }
|
||||||
assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
|
assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
|
||||||
assert_raises(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
|
assert_raise(GeneratorError) { fast_generate([JSON::MinusInfinity]) }
|
||||||
assert_raises(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
|
assert_raise(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
|
||||||
assert_equal "[\n -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
|
assert_equal "[\n -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_depth
|
def test_depth
|
||||||
ary = []; ary << ary
|
ary = []; ary << ary
|
||||||
assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
|
assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
|
||||||
assert_raises(JSON::NestingError) { JSON.generate(ary) }
|
assert_raise(JSON::NestingError) { JSON.generate(ary) }
|
||||||
assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
|
assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
|
||||||
assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
|
assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
|
||||||
assert_raises(JSON::NestingError) { JSON.pretty_generate(ary) }
|
assert_raise(JSON::NestingError) { JSON.pretty_generate(ary) }
|
||||||
assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
|
assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
|
||||||
s = JSON.state.new
|
s = JSON.state.new
|
||||||
assert_equal 0, s.depth
|
assert_equal 0, s.depth
|
||||||
assert_raises(JSON::NestingError) { ary.to_json(s) }
|
assert_raise(JSON::NestingError) { ary.to_json(s) }
|
||||||
assert_equal 100, s.depth
|
assert_equal 100, s.depth
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -95,6 +95,10 @@ module Test
|
||||||
flunk(message(msg) {"#{mu_pp(exp)} expected but nothing was raised"})
|
flunk(message(msg) {"#{mu_pp(exp)} expected but nothing was raised"})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def assert_raises(*exp, &b)
|
||||||
|
raise NoMethodError, "use assert_raise", caller
|
||||||
|
end
|
||||||
|
|
||||||
# :call-seq:
|
# :call-seq:
|
||||||
# assert_raise_with_message(exception, expected, msg = nil, &block)
|
# assert_raise_with_message(exception, expected, msg = nil, &block)
|
||||||
#
|
#
|
||||||
|
|
|
@ -506,7 +506,7 @@ class TestHash < Test::Unit::TestCase
|
||||||
assert_equal(4, res.length)
|
assert_equal(4, res.length)
|
||||||
assert_equal %w( three two one nil ), res
|
assert_equal %w( three two one nil ), res
|
||||||
|
|
||||||
assert_raises KeyError do
|
assert_raise KeyError do
|
||||||
@h.fetch_values(3, 'invalid')
|
@h.fetch_values(3, 'invalid')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue