test/test_file_find.rb in file-find-0.3.4 vs test/test_file_find.rb in file-find-0.3.5

@@ -20,57 +20,57 @@
 
 include Config
 include FileUtils
 
 class TC_File_Find < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir(File.dirname(File.expand_path(__FILE__)))
+  def self.startup
+    Dir.chdir(File.dirname(File.expand_path(__FILE__)))
 
-      @@windows = CONFIG['host_os'] =~ /windows|mswin/i
-      @@jruby   = RUBY_PLATFORM.match('java')
+    @@windows = CONFIG['host_os'] =~ /win32|mswin|msdos|cygwin|mingw/i
+    @@jruby   = RUBY_PLATFORM.match('java')
 
-      unless @@windows
-         if @@jruby
-            @@loguser = Etc.getpwnam(Etc.getlogin)
-            @@logroup = Etc.getgrgid(@@loguser.gid)
-         else
-            @@loguser = Sys::Admin.get_user(Sys::Admin.get_login)
-            @@logroup = Sys::Admin.get_group(@@loguser.gid)
-         end
+    unless @@windows
+      if @@jruby
+        @@loguser = Etc.getpwnam(Etc.getlogin)
+        @@logroup = Etc.getgrgid(@@loguser.gid)
+      else
+        @@loguser = Sys::Admin.get_user(Sys::Admin.get_login)
+        @@logroup = Sys::Admin.get_group(@@loguser.gid)
       end
-   end
+    end
+  end
 
-   def setup
-      @file_rb    = 'test1.rb'
-      @file_txt1  = 'test1.txt'
-      @file_txt2  = 'foo.txt'
-      @file_doc   = 'foo.doc'
-      @directory1 = 'dir1'
-      @directory2 = 'dir2'
+  def setup
+    @file_rb    = 'test1.rb'
+    @file_txt1  = 'test1.txt'
+    @file_txt2  = 'foo.txt'
+    @file_doc   = 'foo.doc'
+    @directory1 = 'dir1'
+    @directory2 = 'dir2'
 
-      File.open(@file_rb, 'w'){}
-      File.open(@file_txt1, 'w'){}
-      File.open(@file_txt2, 'w'){}
-      File.open(@file_doc, 'w'){}
+    File.open(@file_rb, 'w'){}
+    File.open(@file_txt1, 'w'){}
+    File.open(@file_txt2, 'w'){}
+    File.open(@file_doc, 'w'){}
 
-      unless @@windows
-         @link1 = 'link1'
-         File.symlink(@file_rb, @link1)
-      end
+    unless @@windows
+      @link1 = 'link1'
+      File.symlink(@file_rb, @link1)
+    end
 
-      Dir.mkdir(@directory1) unless File.exists?(@directory1)
-      Dir.mkdir(@directory2) unless File.exists?(@directory2)
+    Dir.mkdir(@directory1) unless File.exists?(@directory1)
+    Dir.mkdir(@directory2) unless File.exists?(@directory2)
 
-      File.open(File.join(@directory1, 'bar.txt'), 'w'){}
-      File.open(File.join(@directory2, 'baz.txt'), 'w'){}
+    File.open(File.join(@directory1, 'bar.txt'), 'w'){}
+    File.open(File.join(@directory2, 'baz.txt'), 'w'){}
 
-      @rule1 = File::Find.new(:name => '*.txt')
-      @rule2 = File::Find.new
-   end
+    @rule1 = File::Find.new(:name => '*.txt')
+    @rule2 = File::Find.new
+  end
 
    def test_version
-      assert_equal('0.3.4', File::Find::VERSION)
+      assert_equal('0.3.5', File::Find::VERSION)
    end
 
    def test_path
       assert_respond_to(@rule1, :path)
       assert_respond_to(@rule1, :path=)
@@ -252,11 +252,14 @@
       
       @rule2.maxdepth = 3
       assert_equal(['a.foo', 'b.foo', 'c.foo'], @rule2.find.map{ |e| File.basename(e) })
       
       @rule2.maxdepth = nil
-      assert_equal(['a.foo', 'b.foo', 'c.foo', 'd.foo', 'e.foo', 'f.foo'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(
+        ['a.foo', 'b.foo', 'c.foo', 'd.foo', 'e.foo', 'f.foo'],
+        @rule2.find.map{ |e| File.basename(e) }.sort
+      )
    end
 
    def test_maxdepth_directory
       mkpath('a/b/c')
       @rule2.pattern = "c"
@@ -288,23 +291,35 @@
       touch('a1/a2/a3/f.min')
       
       @rule2.pattern = "*.min"
 
       @rule2.mindepth = 0
-      assert_equal(['z.min', 'a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(
+        ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min', 'z.min'],
+        @rule2.find.map{ |e| File.basename(e) }.sort
+      )
 
       @rule2.mindepth = 1
-      assert_equal(['z.min', 'a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(
+        ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min', 'z.min'],
+        @rule2.find.map{ |e| File.basename(e) }.sort
+      )
 
       @rule2.mindepth = 2
-      assert_equal(['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(
+        ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min'],
+        @rule2.find.map{ |e| File.basename(e) }.sort
+      )
       
       @rule2.mindepth = 3
-      assert_equal(['b.min', 'c.min', 'd.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(
+        ['b.min', 'c.min', 'd.min', 'e.min', 'f.min'],
+        @rule2.find.map{ |e| File.basename(e) }.sort
+      )
       
       @rule2.mindepth = 4
-      assert_equal(['d.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) })
+      assert_equal(['d.min', 'e.min', 'f.min'], @rule2.find.map{ |e| File.basename(e) }.sort)
 
       @rule2.mindepth = 5
       assert_equal([], @rule2.find.map{ |e| File.basename(e) })
    end
 
@@ -366,10 +381,10 @@
       results2 = File::Find.new(:name => "test1*", :perm => "u=rw").find
 
       assert_equal(1, results1.length)
       assert_equal(2, results2.length)
       assert_equal('test1.rb', File.basename(results1.first))
-      assert_equal(['test1.rb', 'test1.txt'], results2.map{ |e| File.basename(e) })
+      assert_equal(['test1.rb', 'test1.txt'], results2.map{ |e| File.basename(e) }.sort)
    end
 
    def test_prune_basic
       assert_respond_to(@rule1, :prune)
       assert_respond_to(@rule1, :prune=)