diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-14 08:20:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-14 08:20:26 +0000 |
commit | 48826abbb4740bbc02b8516e23ab498543ea513b (patch) | |
tree | 630348515e1f28eac5865d28f67d1539774e1cbe /test/optparse | |
parent | 44cb4079c4e49bb6e0ed28709066e3c2a1f6dd53 (diff) | |
download | ruby-48826abbb4740bbc02b8516e23ab498543ea513b.tar.gz |
optparse.rb: hyphenize
* lib/optparse.rb (make_switch, parse_in_order): unify underscores
to hyphens.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/optparse')
-rw-r--r-- | test/optparse/test_noarg.rb | 21 | ||||
-rw-r--r-- | test/optparse/test_optarg.rb | 13 | ||||
-rw-r--r-- | test/optparse/test_placearg.rb | 13 | ||||
-rw-r--r-- | test/optparse/test_reqarg.rb | 17 |
4 files changed, 64 insertions, 0 deletions
diff --git a/test/optparse/test_noarg.rb b/test/optparse/test_noarg.rb index 8f9be29ab8..8f20519408 100644 --- a/test/optparse/test_noarg.rb +++ b/test/optparse/test_noarg.rb @@ -2,6 +2,12 @@ require_relative 'test_optparse' module TestOptionParser::NoArg + def setup + super + @opt.def_option "--with_underscore" do |x| @flag = x end + @opt.def_option "--with-hyphen" do |x| @flag = x end + end + class Def1 < TestOptionParser include NoArg def setup @@ -55,4 +61,19 @@ module TestOptionParser::NoArg assert_equal(%w"", no_error {@opt.parse!(%w"--opt")}) assert_equal(true, @flag) end + + def test_hyphenize + @flag = nil + assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore")}) + assert_equal(true, @flag) + @flag = nil + assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore")}) + assert_equal(true, @flag) + @flag = nil + assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen")}) + assert_equal(true, @flag) + @flag = nil + assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen")}) + assert_equal(true, @flag) + end end diff --git a/test/optparse/test_optarg.rb b/test/optparse/test_optarg.rb index b7436fb74c..14584f7e89 100644 --- a/test/optparse/test_optarg.rb +++ b/test/optparse/test_optarg.rb @@ -7,6 +7,8 @@ class TestOptionParser::OptArg < TestOptionParser @opt.def_option("-x[VAL]") {|x| @flag = x} @opt.def_option("--option[=VAL]") {|x| @flag = x} @opt.def_option("--regexp[=REGEXP]", Regexp) {|x| @reopt = x} + @opt.def_option "--with_underscore[=VAL]" do |x| @flag = x end + @opt.def_option "--with-hyphen[=VAL]" do |x| @flag = x end @reopt = nil end @@ -44,4 +46,15 @@ class TestOptionParser::OptArg < TestOptionParser assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt foo")}) assert_equal(nil, @flag) end + + def test_hyphenize + assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore=foo1")}) + assert_equal("foo1", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore=foo2")}) + assert_equal("foo2", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen=foo3")}) + assert_equal("foo3", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen=foo4")}) + assert_equal("foo4", @flag) + end end diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb index 90b2b97a63..8acfdb2161 100644 --- a/test/optparse/test_placearg.rb +++ b/test/optparse/test_placearg.rb @@ -11,6 +11,8 @@ class TestOptionParser::PlaceArg < TestOptionParser @opt.def_option("-n") {} @opt.def_option("--regexp [REGEXP]", Regexp) {|x| @reopt = x} @reopt = nil + @opt.def_option "--with_underscore=VAL" do |x| @flag = x end + @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end end def test_short @@ -48,6 +50,17 @@ class TestOptionParser::PlaceArg < TestOptionParser assert_equal("bar", @flag) end + def test_hyphenize + assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore=foo1")}) + assert_equal("foo1", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore=foo2")}) + assert_equal("foo2", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen=foo3")}) + assert_equal("foo3", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen=foo4")}) + assert_equal("foo4", @flag) + end + def test_conv assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")}) assert_nil(@topt) diff --git a/test/optparse/test_reqarg.rb b/test/optparse/test_reqarg.rb index 1904f46154..b2e4755f80 100644 --- a/test/optparse/test_reqarg.rb +++ b/test/optparse/test_reqarg.rb @@ -2,6 +2,12 @@ require_relative 'test_optparse' module TestOptionParser::ReqArg + def setup + super + @opt.def_option "--with_underscore=VAL" do |x| @flag = x end + @opt.def_option "--with-hyphen=VAL" do |x| @flag = x end + end + class Def1 < TestOptionParser include ReqArg def setup @@ -64,6 +70,17 @@ module TestOptionParser::ReqArg assert_equal("foo", @flag) end + def test_hyphenize + assert_equal(%w"", no_error {@opt.parse!(%w"--with_underscore foo1")}) + assert_equal("foo1", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-underscore foo2")}) + assert_equal("foo2", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with-hyphen foo3")}) + assert_equal("foo3", @flag) + assert_equal(%w"", no_error {@opt.parse!(%w"--with_hyphen foo4")}) + assert_equal("foo4", @flag) + end + class TestOptionParser::WithPattern < TestOptionParser def test_pattern pat = num = nil |