Add tests for previously untested code paths.

Author: RuhmUndAnsehen

test/test_getoptlong.rb

@@ -3,19 +3,23 @@
 
 class TestGetoptLong < Test::Unit::TestCase
 
-  def getoptlong_new(argv)
-    GetoptLong.new(
+  def getoptlong_new(argv: [], env: nil, options: nil)
+    options ||= [
       ['--xxx', '-x', '--aaa', '-a', GetoptLong::REQUIRED_ARGUMENT],
       ['--yyy', '-y', '--bbb', '-b', GetoptLong::OPTIONAL_ARGUMENT],
-      ['--zzz', '-z', '--ccc', '-c', GetoptLong::NO_ARGUMENT],
-      argv:
-    )
+      ['--zzz', '-z', '--ccc', '-c', GetoptLong::NO_ARGUMENT]
+    ]
+    env ||= ENV
+
+    GetoptLong.new(*options, argv:, env:)
+              .tap { |opts| opts.quiet = true }
   end
 
-  def verify(test_argv, expected_remaining_argv, expected_options)
+  def verify(test_argv, expected_remaining_argv, expected_options, env = nil)
     # Define options.
-    opts = getoptlong_new(test_argv)
-    opts.quiet = true
+    opts = getoptlong_new(argv: test_argv, env:)
+    yield opts if block_given?
+
     # Gather options.
     actual_options = []
     opts.each do |opt, arg|
@@ -160,4 +164,120 @@ def test_new_with_invalid_flag
     end
   end
 
+  def test_raise_ambiguous_option
+    e = assert_raise(GetoptLong::AmbiguousOption) do
+      options = [
+        ['--xxx', GetoptLong::REQUIRED_ARGUMENT],
+        ['--xxy', GetoptLong::NO_ARGUMENT]
+      ]
+      getoptlong_new(argv: ['--xx'], options:).each { nil }
+    end
+    assert_match(/ambiguous/, e.message)
+  end
+
+  def test_option_prefix
+    assert_nothing_raised do
+      options = [
+        ['--xxx',   GetoptLong::NO_ARGUMENT],
+        ['--xxx-y', GetoptLong::NO_ARGUMENT],
+        ['--xx',    GetoptLong::NO_ARGUMENT]
+      ]
+      getoptlong_new(argv: ['--xx', '--xxx'], options:).each { nil }
+    end
+  end
+
+  def test_raise_needless_argument
+    e = assert_raise(GetoptLong::NeedlessArgument) do
+      options = [['--x', GetoptLong::NO_ARGUMENT]]
+      getoptlong_new(argv: ['--x=z'], options:).each { nil }
+    end
+    assert_match(/doesn't allow an argument/, e.message)
+  end
+
+  def test_raise_too_many_flags
+    e = assert_raise(ArgumentError) do
+      options = [
+        ['-y', GetoptLong::REQUIRED_ARGUMENT, GetoptLong::NO_ARGUMENT]
+      ]
+      getoptlong_new(options:)
+    end
+    assert_match(/too many/, e.message)
+  end
+
+  def test_raise_option_redefined
+    e = assert_raise(ArgumentError) do
+      options = [
+        ['--xxx', '-x', GetoptLong::REQUIRED_ARGUMENT],
+        ['--exclude', '-x', GetoptLong::NO_ARGUMENT]
+      ]
+      getoptlong_new(options:)
+    end
+    assert_match(/redefined/, e.message)
+  end
+
+  def test_set_ordering_raise
+    e = assert_raise(ArgumentError) do
+      getoptlong_new.ordering = 42
+    end
+    assert_match(/invalid ordering/, e.message)
+  end
+
+  def test_raise_unrecognized_option
+    e = assert_raise(GetoptLong::InvalidOption) do
+      getoptlong_new(argv: ['--asdf']).each { nil }
+    end
+    assert_match(/unrecognized option/, e.message)
+  end
+
+  def test_ordering
+    GetoptLong::ORDERINGS.each do |order|
+      argv = ['foo', '--xxx', 'arg', 'bar']
+
+      expected_options, expected_argv =
+        case order
+        when GetoptLong::REQUIRE_ORDER
+          [[], %w[foo --xxx arg bar]]
+        when GetoptLong::PERMUTE
+          [['--xxx: arg'], %w[foo bar]]
+        when GetoptLong::RETURN_IN_ORDER
+          [[': foo', '--xxx: arg', ': bar'], []]
+        end
+
+      verify(argv, expected_argv, expected_options) do |opts|
+        opts.ordering = order
+      end
+    end
+  end
+
+  def test_env_posixly_correct
+    [{}, { 'POSIXLY_CORRECT' => '1' }].each do |order|
+      argv = ['foo', '--xxx', 'arg', 'bar']
+
+      expected_options, expected_argv =
+        case order
+        when {}
+          [['--xxx: arg'], %w[foo bar]]
+        else
+          [[], %w[foo --xxx arg bar]]
+        end
+
+      verify(argv, expected_argv, expected_options, order)
+    end
+  end
+
+  def test_raise_invalid_option_with_single_hyphen
+    options = [
+      ['-x', GetoptLong::NO_ARGUMENT],
+      ['--x', GetoptLong::NO_ARGUMENT]
+    ]
+    argvs = [%w[-x-x foo], %w[-x- foo]]
+
+    argvs.each do |argv|
+      e = assert_raise(GetoptLong::InvalidOption) do
+        getoptlong_new(argv:, options:).each { nil }
+      end
+      assert_match(/invalid option/, e.message)
+    end
+  end
+
 end