summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-13 06:29:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-13 06:29:02 +0000
commitdd3851d2786412de019350a11e749c56fa5a07cc (patch)
tree737a1505da0612cdfecada8037f87a982e185912
parent1032f093ccd7d67553737d7a7686973291730d0e (diff)
Rename test classes to allow stable test count when running test-all -j
[Fix GH-1763] From: MSP-Greg <MSP-Greg@users.noreply.github.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/-ext-/array/test_resize.rb2
-rw-r--r--test/-ext-/bignum/test_big2str.rb2
-rw-r--r--test/-ext-/bignum/test_bigzero.rb2
-rw-r--r--test/-ext-/bignum/test_div.rb2
-rw-r--r--test/-ext-/bignum/test_mul.rb2
-rw-r--r--test/-ext-/bignum/test_pack.rb2
-rw-r--r--test/-ext-/bignum/test_str2big.rb2
-rw-r--r--test/-ext-/exception/test_data_error.rb2
-rw-r--r--test/-ext-/exception/test_enc_raise.rb2
-rw-r--r--test/-ext-/exception/test_ensured.rb2
-rw-r--r--test/-ext-/exception/test_exception_at_throwing.rb2
-rw-r--r--test/-ext-/hash/test_delete.rb2
-rw-r--r--test/-ext-/integer/test_integer.rb2
-rw-r--r--test/-ext-/integer/test_my_integer.rb2
-rw-r--r--test/-ext-/method/test_arity.rb2
-rw-r--r--test/-ext-/proc/test_bmethod.rb4
-rw-r--r--test/-ext-/test_notimplement.rb2
-rw-r--r--test/erb/test_erb_m17n.rb2
-rw-r--r--test/fileutils/test_dryrun.rb2
-rw-r--r--test/fileutils/test_nowrite.rb2
-rw-r--r--test/fileutils/test_verbose.rb2
-rw-r--r--test/fileutils/visibility_tests.rb4
-rw-r--r--test/rexml/test_martin_fowler.rb2
-rw-r--r--test/ruby/test_ifunless.rb2
-rw-r--r--test/ruby/test_not.rb2
-rw-r--r--test/ruby/test_weakmap.rb2
-rw-r--r--test/win32ole/test_thread.rb2
27 files changed, 29 insertions, 29 deletions
diff --git a/test/-ext-/array/test_resize.rb b/test/-ext-/array/test_resize.rb
index f6a368cb755..c7a57f3cf18 100644
--- a/test/-ext-/array/test_resize.rb
+++ b/test/-ext-/array/test_resize.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require '-test-/array/resize'
-class TestArray < Test::Unit::TestCase
+class Test_Array < Test::Unit::TestCase
class TestResize < Test::Unit::TestCase
def test_expand
feature = '[ruby-dev:42912]'
diff --git a/test/-ext-/bignum/test_big2str.rb b/test/-ext-/bignum/test_big2str.rb
index 296a5a9c495..cc28d97ce5c 100644
--- a/test/-ext-/bignum/test_big2str.rb
+++ b/test/-ext-/bignum/test_big2str.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestBig2str < Test::Unit::TestCase
SIZEOF_BDIGIT = Integer::SIZEOF_BDIGIT
diff --git a/test/-ext-/bignum/test_bigzero.rb b/test/-ext-/bignum/test_bigzero.rb
index 43a99b01a3a..cf34964acd5 100644
--- a/test/-ext-/bignum/test_bigzero.rb
+++ b/test/-ext-/bignum/test_bigzero.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestBigZero < Test::Unit::TestCase
def test_equal_0
bug8204 = '[ruby-core:53893] [Bug #8204]'
diff --git a/test/-ext-/bignum/test_div.rb b/test/-ext-/bignum/test_div.rb
index c53332630a9..4e4bd3fa3e8 100644
--- a/test/-ext-/bignum/test_div.rb
+++ b/test/-ext-/bignum/test_div.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestDiv < Test::Unit::TestCase
SIZEOF_BDIGIT = Integer::SIZEOF_BDIGIT
diff --git a/test/-ext-/bignum/test_mul.rb b/test/-ext-/bignum/test_mul.rb
index fa974ab55db..5de046a8048 100644
--- a/test/-ext-/bignum/test_mul.rb
+++ b/test/-ext-/bignum/test_mul.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestMul < Test::Unit::TestCase
SIZEOF_BDIGIT = Integer::SIZEOF_BDIGIT
diff --git a/test/-ext-/bignum/test_pack.rb b/test/-ext-/bignum/test_pack.rb
index 04bf3e02de1..5d553435fe6 100644
--- a/test/-ext-/bignum/test_pack.rb
+++ b/test/-ext-/bignum/test_pack.rb
@@ -4,7 +4,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestPack < Test::Unit::TestCase
MSWORD_FIRST = Integer::INTEGER_PACK_MSWORD_FIRST
diff --git a/test/-ext-/bignum/test_str2big.rb b/test/-ext-/bignum/test_str2big.rb
index c14811d9c44..6886e4a968a 100644
--- a/test/-ext-/bignum/test_str2big.rb
+++ b/test/-ext-/bignum/test_str2big.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/bignum"
-class TestBignum < Test::Unit::TestCase
+class Test_Bignum < Test::Unit::TestCase
class TestStr2big < Test::Unit::TestCase
SIZEOF_BDIGIT = Integer::SIZEOF_BDIGIT
diff --git a/test/-ext-/exception/test_data_error.rb b/test/-ext-/exception/test_data_error.rb
index d33d8ca43fd..0fec4ac1ecb 100644
--- a/test/-ext-/exception/test_data_error.rb
+++ b/test/-ext-/exception/test_data_error.rb
@@ -2,7 +2,7 @@
require 'test/unit'
module Bug
- class TestException < Test::Unit::TestCase
+ class Test_ExceptionDE < Test::Unit::TestCase
def test_cleanup_data_error
bug9167 = '[ruby-core:58643] [Bug #9167]'
assert_normal_exit(<<-'end;', bug9167) # do
diff --git a/test/-ext-/exception/test_enc_raise.rb b/test/-ext-/exception/test_enc_raise.rb
index 2bc7f024135..706f0e27720 100644
--- a/test/-ext-/exception/test_enc_raise.rb
+++ b/test/-ext-/exception/test_enc_raise.rb
@@ -3,7 +3,7 @@ require 'test/unit'
require '-test-/exception'
module Bug
- class TestException < Test::Unit::TestCase
+ class Test_ExceptionER < Test::Unit::TestCase
def test_enc_raise
feature5650 = '[ruby-core:41160]'
Encoding.list.each do |enc|
diff --git a/test/-ext-/exception/test_ensured.rb b/test/-ext-/exception/test_ensured.rb
index 858245868b3..c250e46bab4 100644
--- a/test/-ext-/exception/test_ensured.rb
+++ b/test/-ext-/exception/test_ensured.rb
@@ -5,7 +5,7 @@ module Bug
class Bug7802 < RuntimeError
end
- class TestException < Test::Unit::TestCase
+ class Test_ExceptionE < Test::Unit::TestCase
def test_ensured
assert_separately([], <<-'end;') # do
diff --git a/test/-ext-/exception/test_exception_at_throwing.rb b/test/-ext-/exception/test_exception_at_throwing.rb
index aba26079ebe..4bce348a258 100644
--- a/test/-ext-/exception/test_exception_at_throwing.rb
+++ b/test/-ext-/exception/test_exception_at_throwing.rb
@@ -2,7 +2,7 @@
require 'test/unit'
module Bug
- class TestException < Test::Unit::TestCase
+ class Test_ExceptionAT < Test::Unit::TestCase
def test_exception_at_throwing
assert_separately(%w[-r-test-/exception], "#{<<-"begin;"}\n#{<<-"end;"}")
begin;
diff --git a/test/-ext-/hash/test_delete.rb b/test/-ext-/hash/test_delete.rb
index e2ad3cbdbc0..91e6ff67cb6 100644
--- a/test/-ext-/hash/test_delete.rb
+++ b/test/-ext-/hash/test_delete.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require '-test-/hash'
-class TestHash < Test::Unit::TestCase
+class Test_Hash < Test::Unit::TestCase
class TestDelete < Test::Unit::TestCase
def test_delete
hash = Bug::Hash.new
diff --git a/test/-ext-/integer/test_integer.rb b/test/-ext-/integer/test_integer.rb
index 320237791ad..cdabb5403ba 100644
--- a/test/-ext-/integer/test_integer.rb
+++ b/test/-ext-/integer/test_integer.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require '-test-/integer'
-class TestInteger < Test::Unit::TestCase
+class Test_Integer < Test::Unit::TestCase
FIXNUM_MIN = RbConfig::LIMITS['FIXNUM_MIN']
FIXNUM_MAX = RbConfig::LIMITS['FIXNUM_MAX']
diff --git a/test/-ext-/integer/test_my_integer.rb b/test/-ext-/integer/test_my_integer.rb
index 260986d2031..1b6f8489f84 100644
--- a/test/-ext-/integer/test_my_integer.rb
+++ b/test/-ext-/integer/test_my_integer.rb
@@ -2,7 +2,7 @@
require 'test/unit'
require "-test-/integer"
-class TestIntegerExt < Test::Unit::TestCase
+class Test_MyInteger < Test::Unit::TestCase
def test_my_integer_to_f
assert_raise(NotImplementedError) do
Bug::Integer::MyInteger.new.to_f
diff --git a/test/-ext-/method/test_arity.rb b/test/-ext-/method/test_arity.rb
index 2ba73c8d4c9..cb8549e7c9d 100644
--- a/test/-ext-/method/test_arity.rb
+++ b/test/-ext-/method/test_arity.rb
@@ -2,7 +2,7 @@
require '-test-/method'
require 'test/unit'
-class TestMethod < Test::Unit::TestCase
+class Test_Method < Test::Unit::TestCase
class TestArity < Test::Unit::TestCase
class A
def foo0()
diff --git a/test/-ext-/proc/test_bmethod.rb b/test/-ext-/proc/test_bmethod.rb
index 344f9757559..403d99bfd18 100644
--- a/test/-ext-/proc/test_bmethod.rb
+++ b/test/-ext-/proc/test_bmethod.rb
@@ -2,12 +2,12 @@
require 'test/unit'
require '-test-/proc'
-class TestProc < Test::Unit::TestCase
+class Test_Proc < Test::Unit::TestCase
class TestBMethod < Test::Unit::TestCase
end
end
-class TestProc::TestBMethod
+class Test_Proc::TestBMethod
class Base
def foo(*a)
a
diff --git a/test/-ext-/test_notimplement.rb b/test/-ext-/test_notimplement.rb
index 0eba7bdaf8c..80757313ca8 100644
--- a/test/-ext-/test_notimplement.rb
+++ b/test/-ext-/test_notimplement.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
require '-test-/notimplement'
-class TestNotImplement < Test::Unit::TestCase
+class Test_NotImplement < Test::Unit::TestCase
def test_funcall_notimplement
bug3662 = '[ruby-dev:41953]'
assert_raise(NotImplementedError, bug3662) {
diff --git a/test/erb/test_erb_m17n.rb b/test/erb/test_erb_m17n.rb
index a7840c9605d..2fd9e700f3f 100644
--- a/test/erb/test_erb_m17n.rb
+++ b/test/erb/test_erb_m17n.rb
@@ -3,7 +3,7 @@
require 'test/unit'
require 'erb'
-class TestERB < Test::Unit::TestCase
+class TestERBEncoding < Test::Unit::TestCase
def test_result_encoding
erb = ERB.new("hello")
assert_equal __ENCODING__, erb.result.encoding
diff --git a/test/fileutils/test_dryrun.rb b/test/fileutils/test_dryrun.rb
index 97d72fcdf9d..fd8a7805eca 100644
--- a/test/fileutils/test_dryrun.rb
+++ b/test/fileutils/test_dryrun.rb
@@ -8,7 +8,7 @@ require_relative 'visibility_tests'
class TestFileUtilsDryRun < Test::Unit::TestCase
include FileUtils::DryRun
- include TestFileUtils::Visibility
+ include TestFileUtilsInc::Visibility
def setup
super
diff --git a/test/fileutils/test_nowrite.rb b/test/fileutils/test_nowrite.rb
index b8044985251..543fa39f5a6 100644
--- a/test/fileutils/test_nowrite.rb
+++ b/test/fileutils/test_nowrite.rb
@@ -8,7 +8,7 @@ require_relative 'visibility_tests'
class TestFileUtilsNoWrite < Test::Unit::TestCase
include FileUtils::NoWrite
- include TestFileUtils::Visibility
+ include TestFileUtilsInc::Visibility
def setup
super
diff --git a/test/fileutils/test_verbose.rb b/test/fileutils/test_verbose.rb
index 00199463933..cf65be8e03e 100644
--- a/test/fileutils/test_verbose.rb
+++ b/test/fileutils/test_verbose.rb
@@ -8,7 +8,7 @@ require_relative 'visibility_tests'
class TestFileUtilsVerbose < Test::Unit::TestCase
include FileUtils::Verbose
- include TestFileUtils::Visibility
+ include TestFileUtilsInc::Visibility
def setup
super
diff --git a/test/fileutils/visibility_tests.rb b/test/fileutils/visibility_tests.rb
index 0ce00d5f2c1..4c02c9d207d 100644
--- a/test/fileutils/visibility_tests.rb
+++ b/test/fileutils/visibility_tests.rb
@@ -2,14 +2,14 @@
require 'test/unit'
require 'fileutils'
-class TestFileUtils < Test::Unit::TestCase
+class TestFileUtilsInc < Test::Unit::TestCase
end
##
# These tests are reused in the FileUtils::Verbose, FileUtils::NoWrite and
# FileUtils::DryRun tests
-module TestFileUtils::Visibility
+module TestFileUtilsInc::Visibility
FileUtils::METHODS.each do |m|
define_method "test_singleton_visibility_#{m}" do
diff --git a/test/rexml/test_martin_fowler.rb b/test/rexml/test_martin_fowler.rb
index da685a80ec1..add3c827233 100644
--- a/test/rexml/test_martin_fowler.rb
+++ b/test/rexml/test_martin_fowler.rb
@@ -3,7 +3,7 @@ require 'test/unit'
require 'rexml/document'
module REXMLTests
- class OrderTester < Test::Unit::TestCase
+ class OrderTesterMF < Test::Unit::TestCase
DOC = <<END
<paper>
<title>Remove this element and figs order differently</title>
diff --git a/test/ruby/test_ifunless.rb b/test/ruby/test_ifunless.rb
index d533e155bc1..f68e5154a23 100644
--- a/test/ruby/test_ifunless.rb
+++ b/test/ruby/test_ifunless.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
require 'test/unit'
-class TestIfunless < Test::Unit::TestCase
+class TestIfUnless < Test::Unit::TestCase
def test_if_unless
x = 'test';
assert(if x == x then true else false end)
diff --git a/test/ruby/test_not.rb b/test/ruby/test_not.rb
index 721f868a5a1..12e4c4b696f 100644
--- a/test/ruby/test_not.rb
+++ b/test/ruby/test_not.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
require 'test/unit'
-class TestIfunless < Test::Unit::TestCase
+class TestNot < Test::Unit::TestCase
def test_not_with_grouped_expression
assert_equal(false, (not (true)))
assert_equal(true, (not (false)))
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index cde186c5f39..35025c8201a 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -39,7 +39,7 @@ class TestWeakMap < Test::Unit::TestCase
x = nil
end
GC.start
- skip # TODO: failure introduced from r60440
+ # skip('TODO: failure introduced from r60440')
assert_not_send([@wm, m, k])
end
alias test_member? test_include?
diff --git a/test/win32ole/test_thread.rb b/test/win32ole/test_thread.rb
index f1cdfe32b0f..cb34693064b 100644
--- a/test/win32ole/test_thread.rb
+++ b/test/win32ole/test_thread.rb
@@ -6,7 +6,7 @@ end
require 'test/unit'
if defined?(WIN32OLE)
- class TestThread < Test::Unit::TestCase
+ class TestWIN32OLE_THREAD < Test::Unit::TestCase
#
# test for Bug #2618(ruby-core:27634)
#