|
12 | 12 | end |
13 | 13 |
|
14 | 14 | begin |
15 | | - gem 'minitest', '~> 5.13' |
| 15 | + gem 'test-unit', '~> 3.0' |
16 | 16 | rescue Gem::LoadError |
17 | 17 | end |
18 | 18 |
|
|
41 | 41 |
|
42 | 42 | ENV["MT_NO_PLUGINS"] = "true" |
43 | 43 |
|
44 | | -require 'minitest/autorun' |
| 44 | +require 'test/unit' |
45 | 45 |
|
46 | 46 | ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook |
47 | 47 |
|
@@ -111,7 +111,7 @@ def self.specific_extra_args_hash=(value) |
111 | 111 | # and uninstall gems, fetch remote gems through a stub fetcher and be assured |
112 | 112 | # your normal set of gems is not affected. |
113 | 113 |
|
114 | | -class Gem::TestCase < Minitest::Test |
| 114 | +class Gem::TestCase < Test::Unit::TestCase |
115 | 115 | extend Gem::Deprecate |
116 | 116 |
|
117 | 117 | attr_accessor :fetcher # :nodoc: |
@@ -140,7 +140,7 @@ def assert_activate(expected, *specs) |
140 | 140 | end |
141 | 141 |
|
142 | 142 | def assert_directory_exists(path, msg = nil) |
143 | | - msg = message(msg) { "Expected path '#{path}' to be a directory" } |
| 143 | + msg = build_message(msg, "Expected path '#{path}' to be a directory") |
144 | 144 | assert_path_exists path |
145 | 145 | assert File.directory?(path), msg |
146 | 146 | end |
@@ -262,19 +262,19 @@ def parse_make_command_line(line) |
262 | 262 |
|
263 | 263 | def assert_contains_make_command(target, output, msg = nil) |
264 | 264 | if output.match(/\n/) |
265 | | - msg = message(msg) do |
| 265 | + msg = build_message(msg, |
266 | 266 | "Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT" % [ |
267 | 267 | ('%s %s' % [make_command, target]).rstrip, |
268 | 268 | output, |
269 | 269 | ] |
270 | | - end |
| 270 | + ) |
271 | 271 | else |
272 | | - msg = message(msg) do |
| 272 | + msg = build_message(msg, |
273 | 273 | 'Expected make command "%s": %s' % [ |
274 | 274 | ('%s %s' % [make_command, target]).rstrip, |
275 | 275 | output, |
276 | 276 | ] |
277 | | - end |
| 277 | + ) |
278 | 278 | end |
279 | 279 |
|
280 | 280 | assert scan_make_command_lines(output).any? {|line| |
@@ -1012,6 +1012,7 @@ def util_setup_spec_fetcher(*specs) |
1012 | 1012 |
|
1013 | 1013 | spec_fetcher.specs[@uri] = [] |
1014 | 1014 | all.each do |spec| |
| 1015 | + |
1015 | 1016 | spec_fetcher.specs[@uri] << spec.name_tuple |
1016 | 1017 | end |
1017 | 1018 |
|
|
0 commit comments