1 files changed, 27 insertions, 3 deletions
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index 8d09e0f28b..ff334009a6 100644
--- a/test/optparse/test_optparse.rb
+++ b/test/optparse/test_optparse.rb
@@ -74,6 +74,7 @@ class TestOptionParser < Test::Unit::TestCase
     @opt.def_option "-v", "--verbose" do @verbose = true end
     @opt.def_option "-q", "--quiet" do @quiet = true end
     @opt.def_option "-o", "--option [OPT]" do |opt| @option = opt end
+    @opt.def_option "-a", "--array [VAL]", Array do |val| val end
     result = {}
     @opt.parse %w(--host localhost --port 8000 -v), into: result
     assert_equal({host: "localhost", port: 8000, verbose: true}, result)
@@ -84,6 +85,18 @@ class TestOptionParser < Test::Unit::TestCase
     result = {}
     @opt.parse %w(--option OPTION -v), into: result
     assert_equal({verbose: true, option: "OPTION"}, result)
+    result = {}
+    @opt.parse %w(-a b,c,d), into: result
+    assert_equal({array: %w(b c d)}, result)
+    result = {}
+    @opt.parse %w(--array b,c,d), into: result
+    assert_equal({array: %w(b c d)}, result)
+    result = {}
+    @opt.parse %w(-a b), into: result
+    assert_equal({array: %w(b)}, result)
+    result = {}
+    @opt.parse %w(--array b), into: result
+    assert_equal({array: %w(b)}, result)
   end
 
   def test_require_exact
@@ -171,10 +184,9 @@ class TestOptionParser < Test::Unit::TestCase
       File.open(File.join(dir, "options.rb"), "w") do |f|
         f.puts "#{<<~"begin;"}\n#{<<~'end;'}"
         begin;
-          stdout = STDOUT.dup
+          stdout = $stdout.dup
           def stdout.tty?; true; end
-          Object.__send__(:remove_const, :STDOUT)
-          STDOUT = stdout
+          $stdout = stdout
           ARGV.options do |opt|
           end;
           100.times {|i| f.puts "  opt.on('--opt-#{i}') {}"}
@@ -204,4 +216,16 @@ class TestOptionParser < Test::Unit::TestCase
       end
     end
   end
+
+  def test_program_name
+    program = $0
+    $0 = "rdbg3.5"
+    assert_equal "rdbg3.5", OptionParser.new.program_name
+    RbConfig::CONFIG["EXECUTABLE_EXTS"]&.split(" ") do |ext|
+      $0 = "rdbg3.5" + ext
+      assert_equal "rdbg3.5", OptionParser.new.program_name
+    end
+  ensure
+    $0 = program
+  end
 end