test/tc/noqae.rb in rio-0.3.4 vs test/tc/noqae.rb in rio-0.3.6

@@ -38,16 +38,23 @@
               rio('f1') < (0..1).map { |i| "L#{i}:d0/d1/d2/f1\n" }
             }
           }
           rio('f1') < (0..1).map { |i| "L#{i}:d0/f1\n" }
           rio('f2') < (0..1).map { |i| "L#{i}:d0/f2\n" }
-          rio('x1').symlink('n1')
-          rio('x2').symlink('n2')
-          rio('f1').symlink('l1')
-          rio('f2').symlink('l2')
-          rio('d1').symlink('c1')
-          rio('d2').symlink('c2')
+          if $supports_symlink
+            rio('x1').symlink('n1')
+            rio('x2').symlink('n2')
+            rio('f1').symlink('l1')
+            rio('f2').symlink('l2')
+            rio('d1').symlink('c1')
+            rio('d2').symlink('c2')
+          else
+            rio('f1') > rio('l1')
+            rio('f2') > rio('l2')
+            rio('d1') > rio('c1')
+            rio('d2') > rio('c2')
+          end
         }
 
         rio('d1').mkpath.chdir {
           rio('d1').mkpath.chdir {
             rio('f1') < (0..1).map { |i| "L#{i}:d1/d1/f1\n" }
@@ -70,14 +77,16 @@
         }
 
       end
     end
   end
-
+  def all()
+    all = ['d0/d1','d0/d2','d0/c1','d0/c2','d0/f1','d0/f2','d0/l1','d0/l2']
+    all += ['d0/n1','d0/n2'] if $supports_symlink
+    all
+  end
   def test_noqae_fs
-    return unless $supports_symlink
-    all = ['d0/d1','d0/d2','d0/c1','d0/c2','d0/f1','d0/f2','d0/n1','d0/n2','d0/l1','d0/l2']
     rio('qp/noqae').chdir do
       begin
 
         begin
           ans = []
@@ -185,14 +194,11 @@
       end
     end
   end
 
   def test_noqae_fs_de
-    return unless $supports_symlink
-    all = ['d0/d1','d0/d2','d0/c1','d0/c2','d0/f1','d0/f2','d0/n1','d0/n2','d0/l1','d0/l2']
-    wd = ::Dir.getwd
-    rio('qp/noqae').chdir
+    @@tdir.abs.chdir
     begin
       begin
         ans = []
         rio('d0').dirs.each { |el| 
           assert(el.directory?)
@@ -210,10 +216,11 @@
           assert!(el.file?)
         }
         rio('d0').skipfiles('*').each { |el| 
           assert(el.file?)
         }
+        return unless $supports_symlink
         begin
           exp = all.select { |el| el =~ /[lnc]\d\Z/ }
           ans = []
           rio('d0').entries(:symlink?).each { |el| 
             assert(el.symlink?)
@@ -270,16 +277,15 @@
           }
           assert_equal(exp.sort,smap(ans).sort)
         end
       end
     end
-    rio(wd).chdir
+    #rio(wd).chdir
   end
   def test_noqae_fs_re
-    return unless $supports_symlink
-    all = ['d0/d1','d0/d2','d0/c1','d0/c2','d0/f1','d0/f2','d0/n1','d0/n2','d0/l1','d0/l2']
-    rio('qp/noqae').chdir do
+    
+    @@tdir.abs.chdir do
       begin
 
         begin
           ere = /1/
           exp = all.reject { |el| el =~ ere }
@@ -307,13 +313,15 @@
         
         begin
           dre = /1/
           exp = all.select { |el| el =~ /[d]2$/ }
           ans = []
-          rio('d0').skipdirs(dre,:symlink?).each { |el| ans << el }
-          assert_equal(exp.sort,smap(ans).sort)
-          ans = rio('d0').skipdirs[dre,:symlink?]
-          assert_equal(exp.sort,smap(ans).sort)
+          if $supports_symlink
+            rio('d0').skipdirs(dre,:symlink?).each { |el| ans << el }
+            assert_equal(exp.sort,smap(ans).sort)
+            ans = rio('d0').skipdirs[dre,:symlink?]
+            assert_equal(exp.sort,smap(ans).sort)
+          end
         end
         
         begin
           fre = /2/
           exp = all.select { |el| el =~ /[fl]1$/ }