test/ftp/anon_misc.rb in rio-0.3.8 vs test/ftp/anon_misc.rb in rio-0.3.9

@@ -11,17 +11,25 @@
 
 class TC_ftp_anon_misc < Test::RIO::TestCase
   @@once = false
   include Test::RIO::FTP::Const
 
+  ALLENTS = [FTP_RWROOT/'f0',d0=FTP_RWROOT/'d0',d0/'f1',d1=d0/'d1',d1/'f2']
   def self.once
     @@once = true
   end
   def setup
     super
     self.class.once unless @@once
-    FS_RWROOT.entries { |ent| ent.delete! }
+    ALLENTS.reverse.each do |ent|
+      if ent.filename =~ /f/
+        ent.rm
+      else
+        ent.rmdir
+      end
+    end
+    #FS_RWROOT.entries { |ent| ent.delete! }
   end
 
   def test_dir
     ftproot = rio(FTPROOT)
     ftproot.chdir
@@ -31,16 +39,20 @@
     rwdir = rio(FTP_RWROOT).chdir
     assert_equal(FTP_RWROOT,rwdir.cwd)
   end
   def test_mkdir
     rwdir = rio(FTP_RWROOT)
+    rio(rwdir,'dir1').rmdir
+    rio(rwdir,'dir0').rmdir
     rwdir.chdir
     assert_equal(FTP_RWROOT.to_s,rwdir.cwd.to_s)
     rio(rwdir,'dir0').mkdir
     assert_equal(smap([FTP_RWROOT/'dir0']),smap(FTP_RWROOT.entries[/^dir/]))
   end
   def test_rmdir
     rwdir = rio(FTP_RWROOT)
+    rio(rwdir,'dir1').rmdir
+    rio(rwdir,'dir0').rmdir
     rio(rwdir,'dir1').mkdir
     assert_equal(smap([FTP_RWROOT/'dir1']),smap(FTP_RWROOT.entries[/^dir/]))
     rio(rwdir,'dir1').rmdir
     assert_equal(smap([]),smap(FTP_RWROOT.entries[/^dir/]))
   end