rfs 0.1

data/lib/test/test_helper.rb

@@ -0,0 +1,147 @@
+$TESTING ||= true
+#require 'innate/tracerequire'
+require 'innate/debug'
+require 'innate/reload'
+require 'pp'
+require 'test/unit'
+$:.unshift '../lib'
+require 'renamer'
+require 'cursor/indexed'
+
+
+class RenamerMock < Renamer
+  attr_reader :renames
+  
+  def run(name, options, &block)
+    @onrename = block
+    @renames = []
+    @yielded = true
+    p = options[:file_provider]
+    if p.methods.include? "on_after"
+      p.on_after do
+        unless @onrename and @yielded
+          @onrename.call :result => @result, :result_type => @result_type, :result_path => @result_path, :result_file => @result_file
+          @yielded = true
+        end
+      end
+    end
+    super(name, options) do |rtype, result, path, file|
+      @result = result
+      @result_type = rtype
+      @result_path = path
+      @result_file = file
+      @yielded = false
+    end
+  end
+
+  def rename(path, oldfn, newfn, full_path = false)
+    super
+    if @onrename
+      r = @onrename.call(:path => path,
+                   :oldfn => oldfn,
+                   :newfn => newfn,
+                   :full_path => full_path,
+                   :result => @result,
+                   :result_type => @result_type, 
+                   :result_path => @result_path, 
+                   :result_file => @result_file,
+                   :confirm => @confirm)
+      @yielded = true
+    end
+  end
+
+  alias actual_rename_orig actual_rename
+  
+  def actual_rename(o, n)
+    @renames << [o, n]
+  end
+
+  alias actual_delete_orig actual_delete
+  
+  def actual_delete(fn)
+    @renames << [fn, :deleted]
+  end
+end
+
+
+module FileProviderTestEvents
+  def self.extended(base)
+    base.class.class_eval do
+      alias_method :each_before_fpte, :each
+    end
+  end
+  
+  def each
+    each_before_fpte do |path, file|
+      before path, file
+      yield path, file
+      after path, file
+    end
+  end
+
+  def on_before &block
+    @on_before = [block]
+  end
+
+  def on_after &block
+    @on_after = [block]
+  end
+
+  def before p, f
+    return unless @on_before
+    @on_before.each do |m|
+      m.call p, f if m
+    end
+  end
+  
+  def after p, f
+    return unless @on_before
+    @on_after.each do |m|
+      m.call p, f if m
+    end
+  end
+end
+
+class BaseTest < Test::Unit::TestCase
+  def setup
+    new_files( %w{ dir/. dir/.. dir/file1 dir/file2 dir/file3 } )
+    @r = RenamerMock.new
+  end
+
+  def new_files(files)
+    @files = Provider::File::Array.new(files)
+    add_file_events
+  end
+
+  def add_file_events
+    @files.extend FileProviderTestEvents
+    @files.on_before do |p, f|
+      @path = p
+      @file = f
+      @full_name = fp File.join(p, f)
+    end
+  end
+
+  def fp(path)
+    File.expand_path path
+  end
+
+  def test_shutup; end
+
+  def r(action, name = :rename_replace, expected_yields = nil, options = {})
+    options[:file_provider] ||= @files
+    options[:action] ||= action
+    options[:filter] = Filter.add options[:filter], Filter.new(/^\.+$/) unless options[:test_r_nofilter]
+    yc = 0
+    @r.run name, options do |h|
+      yc += 1
+      yield h if block_given?
+    end
+    if options[:test_r_count]
+      raise 'exception raised' if expected_yields and expected_yields != yc
+    else
+      assert_equal expected_yields, yc, 'Expected yields from renamer' if expected_yields
+    end
+  end
+end
+

data/tests/test_helper.rb

@@ -0,0 +1,147 @@
+$TESTING ||= true
+#require 'innate/tracerequire'
+require 'innate/debug'
+require 'innate/reload'
+require 'pp'
+require 'test/unit'
+$:.unshift '../lib'
+require 'renamer'
+require 'cursor/indexed'
+
+
+class RenamerMock < Renamer
+  attr_reader :renames
+  
+  def run(name, options, &block)
+    @onrename = block
+    @renames = []
+    @yielded = true
+    p = options[:file_provider]
+    if p.methods.include? "on_after"
+      p.on_after do
+        unless @onrename and @yielded
+          @onrename.call :result => @result, :result_type => @result_type, :result_path => @result_path, :result_file => @result_file
+          @yielded = true
+        end
+      end
+    end
+    super(name, options) do |rtype, result, path, file|
+      @result = result
+      @result_type = rtype
+      @result_path = path
+      @result_file = file
+      @yielded = false
+    end
+  end
+
+  def rename(path, oldfn, newfn, full_path = false)
+    super
+    if @onrename
+      r = @onrename.call(:path => path,
+                   :oldfn => oldfn,
+                   :newfn => newfn,
+                   :full_path => full_path,
+                   :result => @result,
+                   :result_type => @result_type, 
+                   :result_path => @result_path, 
+                   :result_file => @result_file,
+                   :confirm => @confirm)
+      @yielded = true
+    end
+  end
+
+  alias actual_rename_orig actual_rename
+  
+  def actual_rename(o, n)
+    @renames << [o, n]
+  end
+
+  alias actual_delete_orig actual_delete
+  
+  def actual_delete(fn)
+    @renames << [fn, :deleted]
+  end
+end
+
+
+module FileProviderTestEvents
+  def self.extended(base)
+    base.class.class_eval do
+      alias_method :each_before_fpte, :each
+    end
+  end
+  
+  def each
+    each_before_fpte do |path, file|
+      before path, file
+      yield path, file
+      after path, file
+    end
+  end
+
+  def on_before &block
+    @on_before = [block]
+  end
+
+  def on_after &block
+    @on_after = [block]
+  end
+
+  def before p, f
+    return unless @on_before
+    @on_before.each do |m|
+      m.call p, f if m
+    end
+  end
+  
+  def after p, f
+    return unless @on_before
+    @on_after.each do |m|
+      m.call p, f if m
+    end
+  end
+end
+
+class BaseTest < Test::Unit::TestCase
+  def setup
+    new_files( %w{ dir/. dir/.. dir/file1 dir/file2 dir/file3 } )
+    @r = RenamerMock.new
+  end
+
+  def new_files(files)
+    @files = Provider::File::Array.new(files)
+    add_file_events
+  end
+
+  def add_file_events
+    @files.extend FileProviderTestEvents
+    @files.on_before do |p, f|
+      @path = p
+      @file = f
+      @full_name = fp File.join(p, f)
+    end
+  end
+
+  def fp(path)
+    File.expand_path path
+  end
+
+  def test_shutup; end
+
+  def r(action, name = :rename_replace, expected_yields = nil, options = {})
+    options[:file_provider] ||= @files
+    options[:action] ||= action
+    options[:filter] = Filter.add options[:filter], Filter.new(/^\.+$/) unless options[:test_r_nofilter]
+    yc = 0
+    @r.run name, options do |h|
+      yc += 1
+      yield h if block_given?
+    end
+    if options[:test_r_count]
+      raise 'exception raised' if expected_yields and expected_yields != yc
+    else
+      assert_equal expected_yields, yc, 'Expected yields from renamer' if expected_yields
+    end
+  end
+end
+

data/tests/test_rename_functions.rb

@@ -0,0 +1,605 @@
+require 'test/test_helper'
+
+class TestBasics < BaseTest
+  def test_list
+    r :list, :rename_replace, 5, :test_r_nofilter => true do |h|
+      if ['.', '..'].include? @file
+        assert_equal @file + '/', h[:result]
+      else
+        assert_equal @file, h[:result]
+      end
+    end
+  end
+
+  def test_wrong_iterations
+    assert_raise(RuntimeError) {
+      r :list, :rename_replace, 1000, :test_r_count => true do |h|
+        if ['.', '..'].include? @file
+          assert_equal @file + '/', h[:result]
+        else
+          assert_equal @file, h[:result]
+        end
+      end
+    }
+  end
+  
+  def test_bad_action
+    assert_raise(ActionError) {
+      r :no, :rename_replace
+    }
+  end
+
+  def test_bad_method
+    assert_raise(NameError) {
+      r :preview, :foo_bar
+    }
+  end
+
+  def test_missing_option
+    assert_raise(MissingOptionError) {
+      r :preview, :rename_replace
+    }
+  end
+  def test_missing_option1
+    # this doesn't raise MissingOptionError because the error is caught and given as result feedback
+    r :preview, :rename_replace, 3, :search => /file/ do |h|
+      assert_match(/MissingOptionError/, h[:result])
+    end
+  end
+  def test_missing_option2
+    assert_raise(MissingOptionError) {
+      r :preview, :rename_replace, nil, :replace => 'good'
+    }
+  end
+
+  def test_bad_search
+    assert_raise(BadOptionValueError) {
+      r :preview, :rename_replace, nil, :search => 3
+    } 
+  end
+  def test_bad_search1
+    # this doesn't raise BadOptionValueError because the error is caught and given as result feedback
+    r :preview, :rename_replace, 3, :search => /file/, :replace => /aeu/ do |h|
+      assert_match(/BadOptionValueError/, h[:result])
+    end
+  end
+end
+
+
+class TestReplace < BaseTest
+  def rr(expected_yields = nil, options = {}, &b)
+    r :preview, :rename_replace, expected_yields, options, &b
+  end
+  
+  def test_replace
+    rr 0, :search => (/none/)
+    rr 1, :search => (/1/), :replace => '9' do |h|
+      assert_equal 'file9', h[:result]
+    end
+  end
+
+  def test_replace_commit
+    r :commit, :rename_replace, 3, :search => (/file/), :replace => 'boob' do |h|
+      assert_match(/boob[1-3]/, h[:result])
+    end
+    assert_equal  [["dir/file1", "dir/boob1"],
+                   ["dir/file2", "dir/boob2"],
+                   ["dir/file3", "dir/boob3"]], @r.renames
+  end
+
+  def test_replace_cap
+    rr 3, :search => (/(f)ile/), :replace => 'sm' do |h|
+      assert_match(/smile[1-3]/, h[:result])
+    end
+  end
+
+  def test_replace_caps
+    rr 3, :search => (/((f)(i)(l)(e)(\d))/),
+          :replace => '->%6%5%4%3%2<-' do |h|
+      assert_match(/->[1-3]elif<-/, h[:result])
+    end
+  end
+
+  def test_replace_other_cap
+    rr 3, :search => (/((f)(i)(l)(e)(\d))/),
+          :replace => '%6%5%4%3%2',
+          :capture_num => 2 do |h|
+      assert_match(/[1-3]elifile[1-3]/, h[:result])
+    end
+  end
+end
+
+
+class TestFilter < BaseTest
+  def rr(expected_yields = nil, options = {}, &b)
+    r :preview, :rename_replace, expected_yields, options, &b
+  end
+
+  def test_filter
+    rr 2, :search => (/(.*)\d/), :replace => 'new', :filter => Filter.new(/2/) do |h|
+      assert_match(/new[13]/, h[:newfn])
+    end
+  end
+
+  def test_filter2
+    rr(5, :search => (/(.*)\d/), :replace => 'new', :filter => Filter.new(/2/),
+          :verbose => true) do |h|
+      if h[:newfn]
+        assert_match(/new[13]/, h[:newfn])
+      else
+        assert_match(/filtered: (\.\.?|file2)/, h[:result])
+      end
+    end
+  end
+
+  def test_filter3
+    rr(5, :search => (/(.*)\d/), :replace => 'new', :filter => FilterNonMatches.new(/2/),
+       :verbose => true) do |h|
+      if h[:newfn]
+        assert_equal 'new2' , h[:newfn]
+      else
+        assert_match(/filtered: (\.\.?|file[13])/, h[:result])
+      end
+    end
+  end
+end
+
+
+class TestConfirm < BaseTest
+  def rr(expected_yields = nil, options = {}, &b)
+    r :commit, :rename_replace, expected_yields, options, &b
+  end
+
+  def test_confirm_yes
+    confirms = 0
+    rr 3, :confirm => (proc {|path, oldfn, newfn, full_name, exists, default|
+                               confirms += 1
+                               assert_equal 'dir', path
+                               assert_match(/file[1-3]/, oldfn)
+                               assert_match(/new[1-3]/, newfn)
+                               assert_equal false, full_name
+                               assert_equal((oldfn[-1] == ?1) ? :yes : :yes, default)
+                               :yes
+                             }),
+          :search => (/file/), :replace => 'new' do |h|
+      assert_match(/new[123]/, h[:newfn])
+      assert_equal :ok, h[:result_type]
+      assert_equal h[:newfn], h[:result]
+      assert_equal h[:confirm], :yes
+    end
+    assert_equal 3, confirms
+  end
+           
+  def test_confirm_all
+    confirms = 0
+    rr 3, :confirm => (proc {|path, oldfn, newfn, full_name, exists, default|
+                               confirms += 1
+                               assert_equal :yes, default
+                               :all
+                             }),
+          :search => (/file/), :replace => 'new' do |h|
+      assert_match(/new[123]/, h[:newfn])
+      assert_equal :ok, h[:result_type]
+      assert_equal h[:newfn], h[:result]
+      assert_equal h[:confirm], :all
+    end
+    assert_equal 1, confirms
+  end
+
+  def test_confirm_no
+    confirms = 0
+    rr 3, :confirm => (proc {|path, oldfn, newfn, full_name, exists, default|
+                               confirms += 1
+                               assert_equal((oldfn[-1] == ?1) ? :yes : :no, default)
+                               :no
+                             }),
+          :search => (/file/), :replace => 'new' do |h|
+      assert_match(/new[123]/, h[:newfn])
+      assert_equal :skipped, h[:result_type]
+      assert_equal h[:oldfn], h[:result]
+      assert_equal h[:confirm], :no
+    end
+    assert_equal 3, confirms
+  end
+  
+  def test_confirm_cancel
+    confirms = 0
+    rr 0, :confirm => (proc {|path, oldfn, newfn, full_name, exists, default|
+                               confirms += 1
+                               assert_equal :yes, default
+                               :cancel
+                             }),
+          :search => (/file/), :replace => 'new' do |h|
+      fail
+    end
+    assert_equal 1, confirms
+  end
+
+  def test_confirm_exists
+    raise NotImplementedError.new
+  end
+end
+  
+
+class TestFilesTxt < BaseTest
+  def rr(ey, o, &b)
+    r :preview, :rename_name_source, ey, o, &b
+  end
+   
+  def t(s, items, results)
+    rr 3, :search => s,
+          :source => NameStreamSource.new(StringIO.new(items.join("\n"))) do |h|
+      assert_equal results.read1next, h[:newfn]
+    end
+  end
+
+  def test_nocap
+    items = %w{ the_first the_second the_third }
+    results = items.to_cursor
+    t(/.*/, items, results)
+  end
+
+  def test_cap
+    items = %w{ the_first the_second the_third }
+    results = %w{ filethe_first1 filethe_second2 filethe_third3 }.to_cursor
+    t(/file()/, items, results)
+  end
+
+  def test_not_enough
+    items = %w{ the_first the_second }
+    results = ['filethe_first1', 'filethe_second2', 'file--no data--3'].to_cursor
+    assert_raise(EOFError) { 
+      t(/file()/, items, results) 
+    }
+  end
+
+  def test_too_many
+    items = %w{ the_first the_second the_third the_extra }
+    results = %w{ filethe_first1 filethe_second2 filethe_third3 nevergethere }.to_cursor
+    t(/file()/, items, results)
+  end
+
+  def test_real_file
+    raise NotImplementedError.new
+  end
+
+  def test_real_file_recursive
+    raise NotImplementedError.new
+  end
+end
+
+
+class TestAdd < BaseTest
+  def rr(ey = nil, o = {}, &b)
+    r :preview, :rename_add, ey, o, &b
+  end
+
+  def test_add
+    rr 3, :search => (/\d/), :add => 5, :action => :commit do |h|
+      assert_equal h[:oldfn].succ.succ.succ.succ.succ, h[:newfn]
+    end
+    #make sure it went in reverse
+    assert_equal [['dir/file3', 'dir/file8'],
+                  ['dir/file2', 'dir/file7'],
+                  ['dir/file1', 'dir/file6']], @r.renames
+  end
+
+  def test_add_neg
+    c = %w{ file-2 file-1 file0 }.to_cursor
+    rr 3, :search => (/\d/), :add => -3, :action => :commit do |h|
+      assert_equal c.read1next, h[:newfn]
+    end
+    #make sure it went in reverse
+    assert_equal [['dir/file1', 'dir/file-2'],
+                  ['dir/file2', 'dir/file-1'],
+                  ['dir/file3', 'dir/file0']], @r.renames
+  end
+
+  def test_add_cap
+    rr 3, :search => (/(\d)/), :add => 5 do |h|
+      assert_equal h[:oldfn].succ.succ.succ.succ.succ, h[:newfn]
+    end
+  end
+
+  def test_missing_add
+    assert_raise MissingOptionError do
+      rr(3, :search => (/(\d)/)) { |h| fail "shouldn't get here" }
+    end
+    assert_raise BadOptionValueError do
+      rr(3, :search => (/(\d)/), :add => 'something') { |h| fail "shouldn't get here" }
+    end
+  end
+end
+
+
+class TestCount < BaseTest
+  def test_count
+    count = 0
+    r :preview, :rename_count, 3, :search => /()./ do |h|
+      count += 1
+      assert_equal "#{count}#{h[:oldfn]}", h[:newfn]
+    end
+  end
+end
+
+
+class TestFullName < BaseTest
+  def rr(ey = nil, o = {}, &b)
+    r :preview, :rename_from_full_name, ey, o, &b
+  end
+
+  def test_no_cap
+    rr 3, :search => (/file/), :pattern => (/dir/) do |h|
+      assert_match(/dir[1-3]/, h[:newfn], h[:result])
+    end
+  end
+
+  def test_cap
+    rr 3, :search => (/(file)/), :pattern => (/(dir)/) do |h|
+      assert_match(/dir[1-3]/, h[:newfn])
+    end
+  end
+end
+
+
+class TestMoveUp < BaseTest
+  def rr(ey = nil, o = {}, &b)
+    r :preview, :rename_move_up, ey, o, &b
+  end
+
+  def test_match
+    rr 3, :search => (/./) do |h|
+      assert_match(%r{^\./file[1-3]$}, h[:newfn], h[:result])
+    end
+  end
+
+  def test_no_match
+    rr 0, :search => (/nothing/)
+  end
+end
+
+
+class TestRoman < BaseTest
+  def rr(ey, o, &b)
+    r :preview, :rename_roman, ey, o, &b
+  end
+
+  def test_to_roman
+    count = 0
+    rr 3, :search => (/(\d)/) do |h|
+      count += 1
+      rn = 'file' + case count
+        when 1; 'I'
+        when 2; 'II'
+        when 3; 'III'
+      end
+      assert_equal rn, h[:newfn]
+    end
+  end
+
+  def test_from_roman
+    rr 1, :search => (/of (roman)/i), :file_provider => 
+          TestFileProvider.new(['glory/great war of mcmxiv']) do |h|
+      assert_equal 'great war of 1914', h[:result]
+    end
+  end
+end
+
+
+class TestMarkChange < BaseTest
+  def rr(ey, o, &b)
+    r :preview, :rename_mark_change, ey, o, &b
+  end
+  
+  def setup
+    super
+    @changes = %w{ SECTION1.1 SECTION2.1 
+                SECTION3.5 SECTION4.1 }.to_cursor
+    new_files(%w{ section1.1 
+              section1.2 section1.3
+              section2.1 section3.5 hello section3.6 
+              section4.1 section4.2 })
+  end
+  
+  def test_changes    
+    rr 4, :search => (/section(\d)\./), :replace_pattern => (/section/), 
+          :replace_text => 'SECTION' do |h|
+      if h[:newfn]
+        assert_equal @changes.read1next, h[:newfn]
+      end
+    end
+  end
+  
+  def test_changes_rcap
+    rr 4, :search => (/section(\d)\./), :replace_pattern => (/(\w*)\d\./), 
+          :replace_text => 'SECTION' do |h|
+      if h[:newfn]
+        assert_equal @changes.read1next, h[:newfn]
+      end
+    end
+  end
+  
+  def test_changes_rcap_other
+    rr 4, :search => (/section(\d)\./), :replace_pattern => (/()()()(\w*)\d\./), 
+          :replace_text => 'SECTION',
+          :capture_num => 4 do |h|
+      if h[:newfn]
+        assert_equal @changes.read1next, h[:newfn]
+      end
+    end
+  end  
+  
+  def test_changes_no_cap
+    rr 4, :search => (/\d/), :replace_pattern => (/section/), 
+          :replace_text => 'SECTION' do |h|
+      if h[:newfn]
+        assert_equal @changes.read1next, h[:newfn]
+      end
+    end
+  end
+end
+
+
+class TestTapeNumbers < BaseTest
+  def t(r)
+    results = %w{ tape1 tape2 tape3 tape4}.to_cursor
+    new_files(%w{ tape1A tape1B tape2a tape2b })
+    r(:preview, :rename_tape_numbers, 4, :search => r) do |h|
+      assert_equal results.read1next, h[:newfn]
+    end
+  end
+
+  def test_cap
+    t(/tape(..)/)
+  end
+
+  def test_no_cap
+    t(/\d./)
+  end
+end  
+
+
+class TestCapitalize < BaseTest
+  def rr(ey, o, &b)
+    new_files(
+      ['this sentence should be capitalized',
+       'here is another one. the best is to see what will happen! is it good?',
+       'how many more do i need here?  a few.',
+       "i'll have to get this done soon, it may get boring..."])
+    r :preview, :rename_capitalize, ey, o, &b
+  end
+
+  def test_capitalize
+    changes = ['This Sentence Should Be Capitalized',
+       'Here is Another One. The Best is to See What Will Happen! Is it Good?',
+       'How Many More Do I Need Here?  A Few.',
+       "I'll Have to Get This Done Soon, it May Get Boring..."].to_cursor
+    rr 4, :search => (/.*/) do |h|
+      assert_equal changes.read1next, h[:newfn]
+    end
+  end
+end
+
+
+class TestFill < BaseTest
+  def t(re, f, res = nil)
+    new_files(%w{ first1.1 section1.2 section1.3
+              second2.1 third3.5 hello section3.6 
+              fourth4.1 section4.2 })
+    results = res || (%w{ first1.1 first1.2 first1.3
+               second2.1 third3.5 third3.6 
+               fourth4.1 fourth4.2 }).to_cursor
+    r :preview, :rename_fill, 9, :search => re, :fill => f do |h|
+      if h[:newfn]
+        assert_equal results.read1next, h[:newfn]
+      elsif h[:result] == '* No capture to fill * hello'
+        # ok...
+      else
+        assert_equal 'source: ' + results.read1next, h[:result]
+      end
+    end
+  end
+
+  def test_cap_nocap
+    t(/(.*?)\d/, /section/)
+  end
+  def test_nocap_nocap
+    t(/first|second|third|fourth/, /section/)
+  end
+  def test_cap_cap
+    t(/(.*?)\d/, /(section)/)
+  end
+  def test_cap_cap2
+    t(/(.*?)\d/, /section()/, %w{ first1.1 sectionfirst1.2 sectionfirst1.3
+      second2.1 third3.5 sectionthird3.6 
+      fourth4.1 sectionfourth4.2 }.to_cursor)
+  end
+end
+
+
+class TestDelete < BaseTest
+  def teardown
+    super
+    unless File.exists? 'dir'
+      Dir.mkdir 'dir'
+    end
+    %w{file1 file2 file3}.each do |f|
+      fn = File.join('dir', f)
+      unless File.exists? fn
+        File.open(fn, 'w') {|f| f.puts fn }
+      end
+    end
+  end
+
+  def rr(expected_yields = nil, options = {}, &b)
+    r :preview, :rename_remove, expected_yields, options, &b
+  end
+
+  def test_delete_file
+    rr 1, :search => (/^file2$/), :action => :commit do |h|
+      assert_equal [["dir/file2", :deleted]], @r.renames
+      assert_equal :ok, h[:result_type]
+      assert_equal '<<file2>>', h[:result]
+      assert_equal 'dir', h[:result_path]
+      assert_equal 'file2', h[:result_file]
+    end
+  end
+
+  def test_delete_dir_not_empty_sim
+    new_files(%w{ . .. dir })
+    rr 1, :search => (/^dir$/), :action => :commit do |h|
+      assert_equal [["./dir", :deleted]], @r.renames
+      assert_equal :ok, h[:result_type]
+      assert_equal '<<dir>>', h[:result]
+      assert_equal '.', h[:result_path]
+      assert_equal 'dir', h[:result_file]
+    end
+  end
+
+  def test_delete_dir_not_empty_real
+    new_files(%w{ . .. dir })
+    class << @r
+      alias actual_delete actual_delete_orig
+    end
+    rr 1, :search => (/^dir$/), :action => :commit do |h|
+      assert_equal :fileerror, h[:result_type]
+      assert_equal "Errno::ENOTEMPTY: Directory not empty - ./dir", h[:result]
+      assert_equal '.', h[:result_path]
+      assert_equal 'dir', h[:result_file]
+    end
+  end
+
+  def test_delete_dir_not_empty_real
+    new_files(%w{ . .. dir })
+    class << @r
+      alias actual_delete actual_delete_orig
+    end
+    rr 1, :search => (/^dir$/), :action => :commit do |h|
+      assert_equal :fileerror, h[:result_type]
+      assert_equal "Errno::ENOTEMPTY: Directory not empty - ./dir", h[:result]
+      assert_equal '.', h[:result_path]
+      assert_equal 'dir', h[:result_file]
+    end
+  end
+
+  def test_delete_recursive
+    @files = Provider::File::Recursive.new(['.'])
+    add_file_events
+    class << @r
+      #alias actual_delete actual_delete_orig
+    end
+    c = %w{ ./dir/file1 ./dir/file2 ./dir/file3 ./dir }.to_cursor
+    rr 4, :search => (/^(dir|file[1-3])$/), :action => :commit do |h|
+      assert_equal :ok, h[:result_type]
+      p, f = File.split c.read1next
+      assert_equal p, h[:result_path]
+      assert_equal f, h[:result_file]
+    end
+    c.pos = 0
+    @r.renames.each do |a|
+      fn, r = a
+      assert_equal c.read1next, fn
+      assert_equal :deleted, r
+    end
+  end
+end