8000 Avoid defining the same test class in multiple files · ruby/optparse@4b47d9c · GitHub
[go: up one dir, main page]

Skip to content

Commit 4b47d9c

Browse files
jeremyevanshsbt
authored andcommitted
Avoid defining the same test class in multiple files
Should fix issues with parallel testing sometimes not running all tests. This should be viewed skipping whitespace changes. Fixes [Bug #18731]
1 parent 2bea3b3 commit 4b47d9c

13 files changed

+19
-29
lines changed

test/optparse/test_acceptable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: false
22
require_relative 'test_optparse'
33

4-
class TestOptionParser::Acceptable < TestOptionParser
4+
class TestOptionParserAcceptable < TestOptionParser
55

66
def setup
77
super

test/optparse/test_autoconf.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
require 'test/unit'
33
require 'optparse/ac'
44

5-
class TestOptionParser < Test::Unit::TestCase; end
6-
7-
class TestOptionParser::AutoConf < Test::Unit::TestCase
5+
class TestOptionParserAutoConf < Test::Unit::TestCase
86
def setup
97
@opt = OptionParser::AC.new
108
@foo = @bar = self.class

test/optparse/test_bash_completion.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
require 'test/unit'
33
require 'optparse'
44

5-
class TestOptionParser < Test::Unit::TestCase
6-
end
7-
class TestOptionParser::BashCompletion < Test::Unit::TestCase
5+
class TestOptionParserBashCompletion < Test::Unit::TestCase
86
def setup
97
@opt = OptionParser.new
108
@opt.define("-z", "zzz") {}

test/optparse/test_cclass.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: false
22
require_relative 'test_optparse'
33

4-
class TestOptionParser::CClass < TestOptionParser
4+
class TestOptionParserCClass < TestOptionParser
55
def test_no_argument
66
flags = []
77
@opt.def_option("-[a-z]") {|x| flags << x}

test/optparse/test_did_you_mean.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
return
77
end
88

9-
class TestOptionParser::DidYouMean < TestOptionParser
9+
class TestOptionParserDidYouMean < TestOptionParser
1010
def setup
1111
super
1212
@opt.def_option("--foo", Integer) { |v| @foo = v }

test/optparse/test_getopts.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
require 'test/unit'
33
require 'optparse'
44

5-
class TestOptionParser < Test::Unit::TestCase
6-
end
7-
class TestOptionParser::Getopts < Test::Unit::TestCase
5+
class TestOptionParserGetopts < Test::Unit::TestCase
86
def setup
97
@opt = OptionParser.new
108
end

test/optparse/test_kwargs.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
require 'optparse'
44
require 'optparse/kwargs'
55

6-
class TestOptionParser < Test::Unit::TestCase
7-
end
8-
class TestOptionParser::KwArg < Test::Unit::TestCase
6+
class TestOptionParserKwArg < Test::Unit::TestCase
97
class K
108
def initialize(host:, port: 8080)
119
@host = host

test/optparse/test_noarg.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# frozen_string_literal: false
22
require_relative 'test_optparse'
33

4-
module TestOptionParser::NoArg
4+
module TestOptionParserNoArg
55
def setup
66
super
77
@opt.def_option "--with_underscore" do |x| @flag = x end
88
@opt.def_option "--with-hyphen" do |x| @flag = x end
99
end
1010

1111
class Def1 < TestOptionParser
12-
include NoArg
12+
include TestOptionParserNoArg
1313
def setup
1414
super
1515
@opt.def_option("-x") {|x| @flag = x}
1616
@opt.def_option("--option") {|x| @flag = x}
1717
end
1818
end
1919
class Def2 < TestOptionParser
20-
include NoArg
20+
include TestOptionParserNoArg
2121
def setup
2222
super
2323
@opt.def_option("-x", "--option") {|x| @flag = x}

test/optparse/test_optarg.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: false
22
require_relative 'test_optparse'
33

4-
class TestOptionParser::OptArg < TestOptionParser
4+
class TestOptionParserOptArg < TestOptionParser
55
def setup
66
super
77
@opt.def_option("-x[VAL]") {|x| @flag = x}

test/optparse/test_placearg.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: false
22
require_relative 'test_optparse'
33

4-
class TestOptionParser::PlaceArg < TestOptionParser
4+
class TestOptionParserPlaceArg < TestOptionParser
55
def setup
66
super
77
@opt.def_option("-x [VAL]") {|x| @flag = x}

0 commit comments

Comments
 (0)
0