summaryrefslogtreecommitdiffhomepage
path: root/test/assert.rb
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-07-30 14:41:09 +0900
committerGitHub <[email protected]>2019-07-30 14:41:09 +0900
commit7dae0ec74c75b59b68451f16a0757149b0de49d2 (patch)
tree3de187cc5f7b2ee2f6ea09544179abc1fb4699af /test/assert.rb
parent428e34abba4dccedbe3abc2e180716317a9d4c52 (diff)
parent44381f0a0c306a8c778f546926d3febfdf981b45 (diff)
downloadmruby-7dae0ec74c75b59b68451f16a0757149b0de49d2.tar.gz
mruby-7dae0ec74c75b59b68451f16a0757149b0de49d2.zip
Merge pull request #4606 from shuujii/refine-message-to-skip-in-nested-assert
Refine message to `skip` in nested `assert`
Diffstat (limited to 'test/assert.rb')
-rw-r--r--test/assert.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/assert.rb b/test/assert.rb
index a63e626cf..32dd4ddc6 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -76,7 +76,7 @@ end
# iso : The ISO reference code of the feature
# which will be tested by this
# assertion
-def assert(str = 'Assertion failed', iso = '')
+def assert(str = 'assert', iso = '')
t_print(str, (iso != '' ? " [#{iso}]" : ''), ' : ') if $mrbtest_verbose
begin
$mrbtest_child_noassert ||= [0]
@@ -99,10 +99,10 @@ def assert(str = 'Assertion failed', iso = '')
yield
if $mrbtest_assert.size > 0
if $mrbtest_assert.size == $mrbtest_child_noassert[-1]
- $asserts.push(assertion_string('Info: ', str, iso))
+ $asserts.push(assertion_string('Skip: ', str, iso))
$mrbtest_child_noassert[-2] += 1
- $ok_test += 1
- t_print('.')
+ $skip_test += 1
+ t_print('?')
else
$asserts.push(assertion_string('Fail: ', str, iso))
$ko_test += 1