rake 10.0.4 → 10.1.0

data/test/test_rake_clean.rb

@@ -2,13 +2,45 @@ require File.expand_path('../helper', __FILE__)
 require 'rake/clean'
 
 class TestRakeClean < Rake::TestCase
-  include Rake
   def test_clean
     load 'rake/clean.rb', true
 
-    assert Task['clean'], "Should define clean"
-    assert Task['clobber'], "Should define clobber"
-    assert Task['clobber'].prerequisites.include?("clean"),
+    assert Rake::Task['clean'], "Should define clean"
+    assert Rake::Task['clobber'], "Should define clobber"
+    assert Rake::Task['clobber'].prerequisites.include?("clean"),
       "Clobber should require clean"
   end
+
+  def test_cleanup
+    file_name = create_undeletable_file
+
+    out, _ = capture_io do
+      Rake::Cleaner.cleanup(file_name, verbose: false)
+    end
+    assert_match(/failed to remove/i, out)
+
+  ensure
+    remove_undeletable_file
+  end
+
+  private
+
+  def create_undeletable_file
+    dir_name = File.join(@tempdir, "deletedir")
+    file_name = File.join(dir_name, "deleteme")
+    FileUtils.mkdir(dir_name)
+    FileUtils.touch(file_name)
+    FileUtils.chmod(0, file_name)
+    FileUtils.chmod(0, dir_name)
+    file_name
+  end
+
+  def remove_undeletable_file
+    dir_name = File.join(@tempdir, "deletedir")
+    file_name = File.join(dir_name, "deleteme")
+    FileUtils.chmod(0777, dir_name)
+    FileUtils.chmod(0777, file_name)
+    Rake::Cleaner.cleanup(file_name, verbose: false)
+    Rake::Cleaner.cleanup(dir_name, verbose: false)
+  end
 end

data/test/test_rake_definitions.rb

@@ -34,12 +34,12 @@ class TestRakeDefinitions < Rake::TestCase
     t = Task[n1]
     assert Task === t, "Should be a Task"
     assert_equal n1.to_s, t.name
-    assert_equal [n2.to_s], t.prerequisites.collect{|n| n.to_s}
+    assert_equal [n2.to_s], t.prerequisites.map { |n| n.to_s }
     t.invoke
     t2 = Task[n2]
     assert_equal FileList[], t2.prerequisites
     t3 = Task[n3]
-    assert_equal [n1.to_s, n2.to_s], t3.prerequisites.collect{|n|n.to_s}
+    assert_equal [n1.to_s, n2.to_s], t3.prerequisites.map { |n| n.to_s }
   end
 
   def test_incremental_definitions
@@ -77,4 +77,3 @@ class TestRakeDefinitions < Rake::TestCase
   end
 
 end
-

data/test/test_rake_file_creation_task.rb

@@ -21,7 +21,7 @@ class TestRakeFileCreationTask < Rake::TestCase
     FileUtils.rm_rf fc_task.name
     assert fc_task.needed?, "file should be needed"
     FileUtils.mkdir fc_task.name
-    assert_equal nil, fc_task.prerequisites.collect{|n| Task[n].timestamp}.max
+    assert_equal nil, fc_task.prerequisites.map { |n| Task[n].timestamp }.max
     assert ! fc_task.needed?, "file should not be needed"
   end
 
@@ -51,6 +51,6 @@ class TestRakeFileCreationTask < Rake::TestCase
   def test_very_early_timestamp
     t1 = Rake.application.intern(FileCreationTask, OLDFILE)
     assert t1.timestamp < Time.now
-    assert t1.timestamp < Time.now - 1000000
+    assert t1.timestamp < Time.now - 1_000_000
   end
 end

data/test/test_rake_file_list.rb

@@ -166,7 +166,7 @@ class TestRakeFileList < Rake::TestCase
   def test_excluding_via_block
     fl = FileList['a.c', 'b.c', 'xyz.c']
     fl.exclude { |fn| fn.pathmap('%n') == 'xyz' }
-    assert fl.exclude?("xyz.c"), "Should exclude xyz.c"
+    assert fl.excluded_from_list?("xyz.c"), "Should exclude xyz.c"
     assert_equal ['a.c', 'b.c'], fl
   end
 
@@ -404,24 +404,24 @@ class TestRakeFileList < Rake::TestCase
 
   def test_exclude_with_alternate_file_seps
     fl = FileList.new
-    assert fl.exclude?("x/CVS/y")
-    assert fl.exclude?("x\\CVS\\y")
-    assert fl.exclude?("x/.svn/y")
-    assert fl.exclude?("x\\.svn\\y")
-    assert fl.exclude?("x/core")
-    assert fl.exclude?("x\\core")
+    assert fl.excluded_from_list?("x/CVS/y")
+    assert fl.excluded_from_list?("x\\CVS\\y")
+    assert fl.excluded_from_list?("x/.svn/y")
+    assert fl.excluded_from_list?("x\\.svn\\y")
+    assert fl.excluded_from_list?("x/core")
+    assert fl.excluded_from_list?("x\\core")
   end
 
   def test_add_default_exclude_list
     fl = FileList.new
     fl.exclude(/~\d+$/)
-    assert fl.exclude?("x/CVS/y")
-    assert fl.exclude?("x\\CVS\\y")
-    assert fl.exclude?("x/.svn/y")
-    assert fl.exclude?("x\\.svn\\y")
-    assert fl.exclude?("x/core")
-    assert fl.exclude?("x\\core")
-    assert fl.exclude?("x/abc~1")
+    assert fl.excluded_from_list?("x/CVS/y")
+    assert fl.excluded_from_list?("x\\CVS\\y")
+    assert fl.excluded_from_list?("x/.svn/y")
+    assert fl.excluded_from_list?("x\\.svn\\y")
+    assert fl.excluded_from_list?("x/core")
+    assert fl.excluded_from_list?("x\\core")
+    assert fl.excluded_from_list?("x/abc~1")
   end
 
   def test_basic_array_functions
@@ -482,12 +482,12 @@ class TestRakeFileList < Rake::TestCase
     a = ['b', 'a']
     b = ['b', 'b']
     c = ['b', 'c']
-    assert_equal( 1,  fl <=> a )
-    assert_equal( 0,  fl <=> b )
-    assert_equal( -1, fl <=> c )
-    assert_equal( -1, a <=> fl )
-    assert_equal( 0,  b <=> fl )
-    assert_equal( 1,  c <=> fl )
+    assert_equal(1,  fl <=> a)
+    assert_equal(0,  fl <=> b)
+    assert_equal(-1, fl <=> c)
+    assert_equal(-1, a <=> fl)
+    assert_equal(0,  b <=> fl)
+    assert_equal(1,  c <=> fl)
   end
 
   def test_array_equality
@@ -503,7 +503,7 @@ class TestRakeFileList < Rake::TestCase
 
   def test_enumeration_methods
     a = FileList['a', 'b']
-    b = a.collect { |it| it.upcase }
+    b = a.map { |it| it.upcase }
     assert_equal ['A', 'B'], b
     assert_equal FileList,  b.class
 
@@ -519,7 +519,7 @@ class TestRakeFileList < Rake::TestCase
     assert_equal ['a', 'b'], b
     assert_equal FileList,  b.class
 
-    b = a.find_all { |it| it == 'b'}
+    b = a.select { |it| it == 'b' }
     assert_equal ['b'], b
     assert_equal FileList,  b.class
 
@@ -609,7 +609,7 @@ class TestRakeFileList < Rake::TestCase
     assert_equal FileList, r.class
 
     f = FileList['a', 'b', 'c', 'd']
-    r = f.values_at(1,3)
+    r = f.values_at(1, 3)
     assert_equal ['b', 'd'], r
     assert_equal FileList, r.class
   end
@@ -625,4 +625,3 @@ class TestRakeFileList < Rake::TestCase
   end
 
 end
-

data/test/test_rake_file_task.rb

@@ -26,7 +26,7 @@ class TestRakeFileTask < Rake::TestCase
 
     open(ftask.name, "w") { |f| f.puts "HI" }
 
-    assert_equal nil, ftask.prerequisites.collect{|n| Task[n].timestamp}.max
+    assert_equal nil, ftask.prerequisites.map { |n| Task[n].timestamp }.max
     assert ! ftask.needed?, "file should not be needed"
   ensure
     File.delete(ftask.name) rescue nil
@@ -61,10 +61,10 @@ class TestRakeFileTask < Rake::TestCase
   def test_file_times_old_depends_on_new
     create_timed_files(OLDFILE, NEWFILE)
 
-    t1 = Rake.application.intern(FileTask,OLDFILE).enhance([NEWFILE])
+    t1 = Rake.application.intern(FileTask, OLDFILE).enhance([NEWFILE])
     t2 = Rake.application.intern(FileTask, NEWFILE)
     assert ! t2.needed?, "Should not need to build new file"
-    preq_stamp = t1.prerequisites.collect{|t| Task[t].timestamp}.max
+    preq_stamp = t1.prerequisites.map { |t| Task[t].timestamp }.max
     assert_equal t2.timestamp, preq_stamp
     assert t1.timestamp < preq_stamp, "T1 should be older"
     assert t1.needed?, "Should need to rebuild old file because of new"
@@ -112,7 +112,7 @@ class TestRakeFileTask < Rake::TestCase
       Task[NEWFILE].invoke
     rescue Exception
     end
-    assert( ! File.exist?(NEWFILE), "NEWFILE should be deleted")
+    assert(! File.exist?(NEWFILE), "NEWFILE should be deleted")
   end
 
   def load_phony

data/test/test_rake_file_utils.rb

@@ -44,15 +44,19 @@ class TestRakeFileUtils < Rake::TestCase
   class BadLink
     include Rake::FileUtilsExt
     attr_reader :cp_args
+
     def initialize(klass)
       @failure_class = klass
     end
+
     def cp(*args)
       @cp_args = args
     end
+
     def ln(*args)
       fail @failure_class, "ln not supported"
     end
+
     public :safe_ln
   end
 
@@ -94,7 +98,7 @@ class TestRakeFileUtils < Rake::TestCase
     assert_equal true, nowrite
     nowrite false
     assert_equal false, nowrite
-    nowrite(true){
+    nowrite(true) {
       assert_equal true, nowrite
     }
     assert_equal false, nowrite
@@ -250,7 +254,7 @@ class TestRakeFileUtils < Rake::TestCase
     assert_equal ['..', 'a', 'b'], Rake::FileUtilsExt.split_all('../a/b')
   end
 
-  def command name, text
+  def command(name, text)
     open name, 'w', 0750 do |io|
       io << text
     end

data/test/test_rake_ftp_file.rb

@@ -5,10 +5,11 @@ require 'rake/contrib/ftptools'
 
 class FakeDate
   def self.today
-    Date.new(2003,10,3)
+    Date.new(2003, 10, 3)
   end
+
   def self.now
-    Time.local(2003,10,3,12,00,00)
+    Time.local(2003, 10, 3, 12, 00, 00)
   end
 end
 
@@ -17,43 +18,57 @@ class TestRakeFtpFile < Rake::TestCase
   def setup
     super
 
-    Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
+    Rake::FtpFile.class_eval {
+      @date_class = FakeDate
+      @time_class = FakeDate
+    }
   end
 
   def test_general
-    file = Rake::FtpFile.new("here", "-rw-r--r--   1 a279376  develop   121770 Mar  6 14:50 wiki.pl")
+    file = Rake::FtpFile.new(
+      "here",
+      "-rw-r--r--   1 a279376  develop   121770 Mar  6 14:50 wiki.pl")
     assert_equal "wiki.pl", file.name
     assert_equal "here/wiki.pl", file.path
     assert_equal "a279376", file.owner
     assert_equal "develop", file.group
     assert_equal 0644, file.mode
-    assert_equal 121770, file.size
-    assert_equal Time.mktime(2003,3,6,14,50,0,0), file.time
+    assert_equal 121_770, file.size
+    assert_equal Time.mktime(2003, 3, 6, 14, 50, 0, 0), file.time
     assert ! file.directory?
     assert ! file.symlink?
   end
 
   def test_far_date
-    file = Rake::FtpFile.new(".", "drwxr-xr-x   3 a279376  develop     4096 Nov 26  2001 vss")
-    assert_equal Time.mktime(2001,11,26,0,0,0,0), file.time
+    file = Rake::FtpFile.new(
+      ".",
+      "drwxr-xr-x   3 a279376  develop     4096 Nov 26  2001 vss")
+    assert_equal Time.mktime(2001, 11, 26, 0, 0, 0, 0), file.time
   end
 
   def test_close_date
-    file = Rake::FtpFile.new(".", "drwxr-xr-x   3 a279376  develop     4096 Nov 26 15:35 vss")
-    assert_equal Time.mktime(2002,11,26,15,35,0,0), file.time
+    file = Rake::FtpFile.new(
+      ".",
+      "drwxr-xr-x   3 a279376  develop     4096 Nov 26 15:35 vss")
+    assert_equal Time.mktime(2002, 11, 26, 15, 35, 0, 0), file.time
   end
 
   def test_directory
-    file = Rake::FtpFile.new(".", "drwxrwxr-x   9 a279376  develop     4096 Mar 13 14:32 working")
+    file = Rake::FtpFile.new(
+      ".",
+      "drwxrwxr-x   9 a279376  develop     4096 Mar 13 14:32 working")
     assert file.directory?
     assert !file.symlink?
   end
 
   def test_symlink
-    file = Rake::FtpFile.new(".", "lrwxrwxrwx   1 a279376  develop       64 Mar 26  2002 xtrac -> /home/a279376/working/ics/development/java/com/fmr/fwp/ics/xtrac")
+    file = Rake::FtpFile.new(
+      ".",
+      "lrwxrwxrwx   1 a279376  develop       64 Mar 26  2002 " +
+      "xtrac -> /home/a279376/working/ics/development/java/" +
+      "com/fmr/fwp/ics/xtrac")
     assert_equal 'xtrac', file.name
     assert file.symlink?
     assert !file.directory?
   end
 end
-

data/test/test_rake_functional.rb

@@ -3,13 +3,11 @@ require 'fileutils'
 require 'open3'
 
 class TestRakeFunctional < Rake::TestCase
+  include RubyRunner
 
   def setup
     super
 
-    @ruby_options = ["-I#{@rake_lib}", "-I."]
-    @verbose = ENV['VERBOSE']
-
     if @verbose
       puts
       puts
@@ -68,7 +66,7 @@ class TestRakeFunctional < Rake::TestCase
 
     rake "--describe"
 
-    assert_match %r{^rake a\n *A / A2 *$}m, @out
+    assert_match %r{^rake a\n *A\n *A2 *$}m, @out
     assert_match %r{^rake b\n *B *$}m, @out
     assert_match %r{^rake d\n *x{80}}m, @out
     refute_match %r{^rake c\n}m, @out
@@ -420,8 +418,10 @@ class TestRakeFunctional < Rake::TestCase
     status = $?
     if @verbose
       puts "    SIG status = #{$?.inspect}"
-      puts "    SIG status.respond_to?(:signaled?) = #{$?.respond_to?(:signaled?).inspect}"
-      puts "    SIG status.signaled? = #{status.signaled?}" if status.respond_to?(:signaled?)
+      puts "    SIG status.respond_to?(:signaled?) = " +
+        "#{$?.respond_to?(:signaled?).inspect}"
+      puts "    SIG status.signaled? = #{status.signaled?}" if
+        status.respond_to?(:signaled?)
     end
     status.respond_to?(:signaled?) && status.signaled?
   end
@@ -463,34 +463,4 @@ class TestRakeFunctional < Rake::TestCase
     RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
   end
 
-  # Run a shell Ruby command with command line options (using the
-  # default test options). Output is captured in @out and @err
-  def ruby(*option_list)
-    run_ruby(@ruby_options + option_list)
-  end
-
-  # Run a command line rake with the give rake options.  Default
-  # command line ruby options are included.  Output is captured in
-  # @out and @err
-  def rake(*rake_options)
-    run_ruby @ruby_options + [@rake_exec] + rake_options
-  end
-
-  # Low level ruby command runner ...
-  def run_ruby(option_list)
-    puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
-
-    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
-    inn.close
-
-    @exit = wait ? wait.value : $?
-    @out = out.read
-    @err = err.read
-
-    puts "OUTPUT:  [#{@out}]" if @verbose
-    puts "ERROR:   [#{@err}]" if @verbose
-    puts "EXIT:    [#{@exit.inspect}]" if @verbose
-    puts "PWD:     [#{Dir.pwd}]" if @verbose
-  end
-
 end

data/test/test_rake_invocation_chain.rb

@@ -1,11 +1,12 @@
 require File.expand_path('../helper', __FILE__)
 
 class TestRakeInvocationChain < Rake::TestCase
+  include Rake
 
   def setup
     super
 
-    @empty = Rake::InvocationChain::EMPTY
+    @empty = InvocationChain.empty
 
     @first_member = "A"
     @second_member = "B"
@@ -13,7 +14,19 @@ class TestRakeInvocationChain < Rake::TestCase
     @two = @one.append(@second_member)
   end
 
-  def test_append
+  def test_conj_on_invocation_chains
+    list = InvocationChain.empty.conj("B").conj("A")
+    assert_equal InvocationChain.make("A", "B"), list
+    assert_equal InvocationChain, list.class
+  end
+
+  def test_make_on_invocation_chains
+    assert_equal @empty, InvocationChain.make()
+    assert_equal @one, InvocationChain.make(@first_member)
+    assert_equal @two, InvocationChain.make(@second_member, @first_member)
+  end
+
+  def test_append_with_one_argument
     chain = @empty.append("A")
 
     assert_equal 'TOP => A', chain.to_s # HACK
@@ -49,4 +62,3 @@ class TestRakeInvocationChain < Rake::TestCase
   end
 
 end
-

data/test/test_rake_linked_list.rb

@@ -0,0 +1,84 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestLinkedList < Rake::TestCase
+  include Rake
+
+  def test_empty_list
+    empty = LinkedList::EMPTY
+    assert empty.empty?, "should be empty"
+  end
+
+  def test_list_with_one_item
+    list = LinkedList.make(:one)
+    assert ! list.empty?, "should not be empty"
+    assert_equal :one, list.head
+    assert_equal LinkedList::EMPTY, list.tail
+  end
+
+  def test_make_with_no_arguments
+    empty = LinkedList.make()
+    assert_equal LinkedList::EMPTY, empty
+  end
+
+  def test_make_with_one_argument
+    list = LinkedList.make(:one)
+    assert ! list.empty?
+    assert_equal :one, list.head
+    assert_equal LinkedList::EMPTY, list.tail
+  end
+
+  def test_make_with_two_arguments
+    list = LinkedList.make(:one, :two)
+    assert ! list.empty?
+    assert_equal :one, list.head
+    assert_equal :two, list.tail.head
+    assert_equal LinkedList::EMPTY, list.tail.tail
+  end
+
+  def test_list_with_several_items
+    list = LinkedList.make(:one, :two, :three)
+
+    assert ! list.empty?, "should not be empty"
+    assert_equal :one, list.head
+    assert_equal :two, list.tail.head
+    assert_equal :three, list.tail.tail.head
+    assert_equal LinkedList::EMPTY, list.tail.tail.tail
+  end
+
+  def test_lists_are_structurally_equivalent
+    list = LinkedList.make(1, 2, 3)
+    same = LinkedList.make(1, 2, 3)
+    diff = LinkedList.make(1, 2, 4)
+    short = LinkedList.make(1, 2)
+
+    assert_equal list, same
+    refute_equal list, diff
+    refute_equal list, short
+    refute_equal short, list
+  end
+
+  def test_converstion_to_string
+    list = LinkedList.make(:one, :two, :three)
+    assert_equal "LL(one, two, three)", list.to_s
+    assert_equal "LL()", LinkedList.make().to_s
+  end
+
+  def test_converstion_with_inspect
+    list = LinkedList.make(:one, :two, :three)
+    assert_equal "LL(:one, :two, :three)", list.inspect
+    assert_equal "LL()", LinkedList.make().inspect
+  end
+
+  def test_lists_are_enumerable
+    list = LinkedList.make(1, 2, 3)
+    new_list = list.map { |item| item + 10 }
+    expected = [11, 12, 13]
+    assert_equal expected, new_list
+  end
+
+  def test_conjunction
+    list = LinkedList.make.conj("C").conj("B").conj("A")
+    assert_equal LinkedList.make("A", "B", "C"), list
+  end
+
+end

data/test/test_rake_makefile_loader.rb

@@ -38,7 +38,9 @@ g\ 0: g1 g\ 2 g\ 3 g4
     assert_equal %w(d1 d2).sort, Task['d'].prerequisites.sort
     assert_equal %w(e1 f1).sort, Task['e'].prerequisites.sort
     assert_equal %w(e1 f1).sort, Task['f'].prerequisites.sort
-    assert_equal ["g1", "g 2", "g 3", "g4"].sort, Task['g 0'].prerequisites.sort
+    assert_equal(
+      ["g1", "g 2", "g 3", "g4"].sort,
+      Task['g 0'].prerequisites.sort)
     assert_equal 7, Task.tasks.size
   end
 end

data/test/test_rake_multi_task.rb

@@ -49,11 +49,10 @@ class TestRakeMultiTask < Rake::TestCase
   end
 
   def test_multitasks_with_parameters
-    task :a, [:arg] do |t,args| add_run(args[:arg]) end
-    multitask :b, [:arg] => [:a] do |t,args| add_run(args[:arg]+'mt') end
+    task :a, [:arg] do |t, args| add_run(args[:arg]) end
+    multitask :b, [:arg] => [:a] do |t, args| add_run(args[:arg] + 'mt') end
     Task[:b].invoke "b"
     assert @runs[0] == "b"
     assert @runs[1] == "bmt"
   end
 end
-

data/test/test_rake_name_space.rb

@@ -38,6 +38,6 @@ class TestRakeNameSpace < Rake::TestCase
 
     assert_equal ["n:nn:z", "n:x", "n:y"],
       ns.tasks.map { |tsk| tsk.name }
-    assert_equal ["n:nn:z"], nns.tasks.map {|t| t.name}
+    assert_equal ["n:nn:z"], nns.tasks.map { |t| t.name }
   end
 end

data/test/test_rake_path_map.rb

@@ -52,7 +52,7 @@ class TestRakePathMap < Rake::TestCase
     assert_equal "", "dir/.depends".pathmap("%x")
   end
 
-  def test_X_returns_everything_but_extension
+  def test_x_returns_everything_but_extension
     assert_equal "abc", "abc".pathmap("%X")
     assert_equal "abc", "abc.rb".pathmap("%X")
     assert_equal "abc.xyz", "abc.xyz.rb".pathmap("%X")
@@ -142,16 +142,27 @@ class TestRakePathMap < Rake::TestCase
 
   def test_complex_patterns
     sep = "".pathmap("%s")
-    assert_equal "dir/abc.rb", "dir/abc.rb".pathmap("%d/%n%x")
-    assert_equal "./abc.rb", "abc.rb".pathmap("%d/%n%x")
-    assert_equal "Your file extension is '.rb'",
-      "dir/abc.rb".pathmap("Your file extension is '%x'")
-    assert_equal "bin/org/onstepback/proj/A.class",
-      "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class")
-    assert_equal "src_work/bin/org/onstepback/proj/A.class",
-      "src_work/src/org/onstepback/proj/A.java".pathmap('%{\bsrc\b,bin}X.class')
-    assert_equal ".depends.bak", ".depends".pathmap("%X.bak")
-    assert_equal "d#{sep}a/b/c#{sep}file.txt", "a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f")
+    assert_equal(
+      "dir/abc.rb",
+      "dir/abc.rb".pathmap("%d/%n%x"))
+    assert_equal(
+      "./abc.rb",
+      "abc.rb".pathmap("%d/%n%x"))
+    assert_equal(
+      "Your file extension is '.rb'",
+      "dir/abc.rb".pathmap("Your file extension is '%x'"))
+    assert_equal(
+      "bin/org/onstepback/proj/A.class",
+      "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class"))
+    assert_equal(
+      "src_work/bin/org/onstepback/proj/A.class",
+      "src_work/src/org/onstepback/proj/A.java"
+        .pathmap('%{\bsrc\b,bin}X.class'))
+    assert_equal(
+      ".depends.bak",
+      ".depends".pathmap("%X.bak"))
+    assert_equal(
+      "d#{sep}a/b/c#{sep}file.txt",
+      "a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f"))
   end
 end
-

data/test/test_rake_rake_test_loader.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 class TestRakeRakeTestLoader < Rake::TestCase
 
   def test_pattern
-    orig_LOADED_FEATURES = $:.dup
+    orig_loaded_features = $:.dup
     FileUtils.touch 'foo.rb'
     FileUtils.touch 'test_a.rb'
     FileUtils.touch 'test_b.rb'
@@ -14,8 +14,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
 
     assert_equal %w[-v], ARGV
   ensure
-    $:.replace orig_LOADED_FEATURES
+    $:.replace orig_loaded_features
   end
 
 end
-

data/test/test_rake_reduce_compat.rb

@@ -2,15 +2,11 @@ require File.expand_path('../helper', __FILE__)
 require 'open3'
 
 class TestRakeReduceCompat < Rake::TestCase
-  # TODO: factor out similar code in test_rake_functional.rb
-  def rake(*args)
-    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, out, _, _|
-      out.read
-    }
-  end
+  include RubyRunner
 
   def invoke_normal(task_name)
     rake task_name.to_s
+    @out
   end
 
   def test_no_deprecated_dsl