summaryrefslogtreecommitdiff
path: root/test/optparse
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-26 06:13:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-26 06:13:11 +0000
commita20f1713c3a86422c68ce1a9d93c32d5737328db (patch)
treee638c47d23cc114f975d34fc3300098d8aac1adf /test/optparse
parentcde360334dfb1a40d1919db0dc933ddc0b67f001 (diff)
* 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/trunk@23286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/optparse')
-rw-r--r--test/optparse/test_optparse.rb2
-rw-r--r--test/optparse/test_placearg.rb8
2 files changed, 10 insertions, 0 deletions
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index 9c73399..6aa8fac 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 f4fd249..ea5810c 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