diff --git a/test/yamatanooroti/test_multiplatform.rb b/test/yamatanooroti/test_multiplatform.rb index 7b3a3fe..09b07d4 100644 --- a/test/yamatanooroti/test_multiplatform.rb +++ b/test/yamatanooroti/test_multiplatform.rb @@ -7,13 +7,13 @@ def setup def test_example write(":a\n") - close assert_screen(['prompt> :a', '=> :a', 'prompt>', '', '']) assert_screen(<<~EOC) prompt> :a => :a prompt> EOC + close end def test_result_repeatedly @@ -43,7 +43,6 @@ def test_assert_screen_timeout def test_auto_wrap write("12345678901234567890123\n") - close assert_screen(['prompt> 1234567890123456789012', '3', '=> 12345678901234567890123', 'prompt>', '']) assert_screen(<<~EOC) prompt> 1234567890123456789012 @@ -51,17 +50,18 @@ def test_auto_wrap => 12345678901234567890123 prompt> EOC + close end def test_fullwidth write(":あ\n") - close assert_equal(['prompt> :あ', '=> :あ', 'prompt>', '', ''], result) + close end def test_two_fullwidth write(":あい\n") - close assert_equal(['prompt> :あい', '=> :あい', 'prompt>', '', ''], result) + close end end diff --git a/test/yamatanooroti/test_run_ruby.rb b/test/yamatanooroti/test_run_ruby.rb index 0e69152..276f0e9 100644 --- a/test/yamatanooroti/test_run_ruby.rb +++ b/test/yamatanooroti/test_run_ruby.rb @@ -5,10 +5,10 @@ class Yamatanooroti::TestRunRuby < Yamatanooroti::TestCase def test_winsize start_terminal(5, 30, ['ruby', '-rio/console', '-e', 'puts(IO.console.winsize.inspect)']) sleep 0.5 - close assert_screen(<<~EOC) [5, 30] EOC + close end def test_wait_for_startup_message @@ -18,17 +18,17 @@ def test_wait_for_startup_message # wait_for_startup_message option and close immediately by the close # method at the next line. The next "bbb" after waiting 1 sec more doesn't # be caught because I/O is already closed. - close assert_screen(<<~EOC) aaa EOC + close end def test_move_cursor_and_render start_terminal(5, 30, ['ruby', '-rio/console', '-e', 'STDOUT.puts(?A);STDOUT.goto(2,2);STDOUT.puts(?B)']) assert_screen(/^ B/) - close assert_equal(['A', '', ' B', '', ''], result) + close end def test_meta_key @@ -37,22 +37,22 @@ def test_meta_key write('aaa ccc') write("\M-b") write('bbb ') - close assert_screen(<<~EOC) >>>aaa bbb ccc EOC + close ensure get_out_from_tmpdir end def test_assert_screen_takes_a_message_when_failed start_terminal(5, 30, ['ruby', '-e', 'puts "aaa"']) - close assert_raise_with_message Test::Unit::AssertionFailedError, /\Amessage when failed/ do assert_screen(<<~EOC, 'message when failed') bbb EOC end + close end private