diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:05:43 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:05:43 +0000 |
commit | 19ad6658b510cd0c94fd9cb0cd4137d19a0412d7 (patch) | |
tree | e179d53157f350794c81d2e282f52db24bd89641 /test | |
parent | f2140e9e4e2cd64a17a8db766f19d1ea1f16edfa (diff) |
merges r23286 from trunk into ruby_1_9_1.
--
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
option from non-option argument. [ruby-dev:38333]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/optparse/test_optparse.rb | 2 | ||||
-rw-r--r-- | test/optparse/test_placearg.rb | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb index 9c73399f5b..6aa8fac757 100644 --- a/test/optparse/test_optparse.rb +++ b/test/optparse/test_optparse.rb @@ -8,6 +8,8 @@ class TestOptionParser < Test::Unit::TestCase end def no_error(*args) assert_nothing_raised(*args) {return yield} + ensure + $!.backtrace.delete_if {|e| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}/o =~ e} if $! end def test_permute diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb index f4fd249b7f..ea5810cbc5 100644 --- a/test/optparse/test_placearg.rb +++ b/test/optparse/test_placearg.rb @@ -5,6 +5,7 @@ class TestOptionParser::PlaceArg < TestOptionParser super @opt.def_option("-x [VAL]") {|x| @flag = x} @opt.def_option("--option [VAL]") {|x| @flag = x} + @opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x} @opt.def_option("-n") {} end @@ -42,4 +43,11 @@ class TestOptionParser::PlaceArg < TestOptionParser assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")}) assert_equal("bar", @flag) end + + def test_conv + assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")}) + assert_nil(@topt) + assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T1 te.rb")}) + assert_equal(1, @topt) + end end |