1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assertions.rb: prepare_syntax_check

Browse Source 
* test/lib/test/unit/assertions.rb (prepare_syntax_check): extract
  common preparation of arguments from assert_valid_syntax and
  assert_syntax_error.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-23 03:22:36 +00:00
parent 6b5f927718
commit 2af72edd72
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/lib/test/unit/assertions.rb
View File

@ -455,10 +455,9 @@ EOT
# compatiblity with test-unit # compatiblity with test-unit
alias pend skip alias pend skip
def assert_valid_syntax(code, fname = caller_locations(1, 1)[0], mesg = fname.to_s, verbose: nil) def prepare_syntax_check(code, fname = caller_locations(2, 1)[0], mesg = fname.to_s, verbose: nil)
code = code.dup.force_encoding(Encoding::UTF_8) code = code.dup.force_encoding(Encoding::UTF_8)
verbose, $VERBOSE = $VERBOSE, verbose verbose, $VERBOSE = $VERBOSE, verbose
yield if defined?(yield)
case case
when Array === fname when Array === fname
fname, line = *fname fname, line = *fname
@ -467,32 +466,28 @@ EOT
else else
line = 1 line = 1
end end
assert_nothing_raised(SyntaxError, mesg) do yield(code, fname, line, mesg)
RubyVM::InstructionSequence.compile(code, fname, fname, line)
end
ensure ensure
$VERBOSE = verbose $VERBOSE = verbose
end end
def assert_syntax_error(code, error, fname = caller_locations(1, 1)[0], mesg = fname.to_s) def assert_valid_syntax(code, *args)
code = code.dup.force_encoding(Encoding::US_ASCII) prepare_syntax_check(code, *args) do |src, fname, line, mesg|
verbose, $VERBOSE = $VERBOSE, nil yield if defined?(yield)
yield if defined?(yield) assert_nothing_raised(SyntaxError, mesg) do
case RubyVM::InstructionSequence.compile(src, fname, fname, line)
when Array === fname end
fname, line = *fname
when defined?(fname.path) && defined?(fname.lineno)
fname, line = fname.path, fname.lineno
else
line = 1
end end
e = assert_raise(SyntaxError, mesg) do end
RubyVM::InstructionSequence.compile(code, fname, fname, line)
def assert_syntax_error(code, error, *args)
prepare_syntax_check(code, *args) do |src, fname, line, mesg|
yield if defined?(yield)
e = assert_raise(SyntaxError, mesg) do
RubyVM::InstructionSequence.compile(src, fname, fname, line)
end
assert_match(error, e.message, mesg)
end end
assert_match(error, e.message, mesg)
e
ensure
$VERBOSE = verbose
end end
def assert_normal_exit(testsrc, message = '', child_env: nil, **opt) def assert_normal_exit(testsrc, message = '', child_env: nil, **opt)