Skip to content

Commit 820ab79

Browse files
committed
test_yamatanooroti: change console condepage on legacy conhost
omit if changing codepage failed because of console input (using ansi codepage) that has coderange out of console codepage is useless
1 parent 2bd2020 commit 820ab79

1 file changed

Lines changed: 36 additions & 6 deletions

File tree

test/reline/yamatanooroti/test_rendering.rb

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ def test_autowrap
8989
end
9090

9191
def test_fullwidth
92-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
92+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
93+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
94+
else
95+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.', codepage: 932)
96+
omit "codepage 932 not supported" if !codepage_success?
97+
end
9398
write(":あ\n")
9499
assert_screen(<<~EOC)
95100
Multiline REPL.
@@ -101,7 +106,12 @@ def test_fullwidth
101106
end
102107

103108
def test_two_fullwidth
104-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
109+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
110+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
111+
else
112+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.', codepage: 932)
113+
omit "codepage 932 not supported" if !codepage_success?
114+
end
105115
write(":あい\n")
106116
assert_screen(<<~EOC)
107117
Multiline REPL.
@@ -377,7 +387,12 @@ def test_clear_multiline_and_autowrap
377387
end
378388

379389
def test_nearest_cursor
380-
start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
390+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
391+
start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
392+
else
393+
start_terminal(10, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.', codepage: 932)
394+
omit "codepage 932 not supported" if !codepage_success?
395+
end
381396
write("def ああ\n :いい\nend\C-pbb\C-pcc")
382397
assert_screen(<<~EOC)
383398
Multiline REPL.
@@ -718,7 +733,12 @@ def test_auto_indent_when_inserting_line
718733
end
719734

720735
def test_auto_indent_multibyte_insert_line
721-
start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
736+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
737+
start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
738+
else
739+
start_terminal(10, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.', codepage: 932)
740+
omit "codepage 932 not supported" if !codepage_success?
741+
end
722742
write "if true\n"
723743
write "あいうえお\n"
724744
4.times { write "\C-b\C-b\C-b\C-b\e\r" }
@@ -763,7 +783,12 @@ def test_suppress_auto_indent_just_after_pasted
763783
end
764784

765785
def test_suppress_auto_indent_for_adding_newlines_in_pasting
766-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
786+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
787+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.')
788+
else
789+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.', codepage: 932)
790+
omit "codepage 932 not supported" if !codepage_success?
791+
end
767792
write("<<~Q\n")
768793
write("{\n #\n}")
769794
write("#")
@@ -854,7 +879,12 @@ def test_meta_key
854879
end
855880

856881
def test_not_meta_key
857-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
882+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
883+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
884+
else
885+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.', codepage: 932)
886+
omit "codepage 932 not supported" if !codepage_success?
887+
end
858888
write("おだんご") # "だ" in UTF-8 contains "\xA0"
859889
assert_screen(<<~EOC)
860890
Multiline REPL.

0 commit comments

Comments
 (0)