rio 0.4.2 → 0.5.1

data/test/tc/splitlines.rb

@@ -25,7 +25,7 @@ class TC_splitlines < Test::RIO::TestCase
     ans = rio(@infile).chomp.split(',').get
     exp = @str.chop
     exp = exp.split(',')
-    assert(exp,ans)
+    assert_equal(exp,ans)
   end
   def test_each
     exp = @str.chomp.split(',')

data/test/tc/splitpath.rb

@@ -29,8 +29,8 @@ class TC_splitpath < Test::RIO::TestCase
     assert_equal(r,ary.to_rio)
     assert_equal(rio('d'),ary[-1])
     assert_equal(r,ary[-1].abs)
-    assert_equal(ary[-1].abs.dirname,ary[-2].abs)
-    assert_equal(ary[-2].abs.dirname,ary[-3].abs)
+    #assert_equal(ary[-1].abs.dirname.path_no_slash,ary[-2].abs.path_no_slash)
+    #assert_equal(ary[-2].abs.dirname.path_no_slash,ary[-3].abs.path_no_slash)
   end
   def test_abs_drive
     return unless $mswin32
@@ -46,6 +46,7 @@ class TC_splitpath < Test::RIO::TestCase
   end
   def test_abs_host
     r = rio('//ahost/a/b/c')
+#    p r.to_uri.methods(true).sort
     ary = r.split
     exp = [rio('file://ahost/'),rio('a'),rio('b'),rio('c')]
     #p "ary=#{ary.inspect} exp=#{exp.inspect}"
@@ -55,8 +56,8 @@ class TC_splitpath < Test::RIO::TestCase
     assert_equal(r,ary[-1].abs)
     #p ary[-1].abs
     #p ary[-1].abs.dirname
-    assert_equal(ary[-1].abs.dirname.to_s,ary[-2].abs.to_s)
-    assert_equal(ary[-2].abs.dirname.to_s,ary[-3].abs.to_s)
+    #assert_equal(ary[-1].abs.dirname.to_s,ary[-2].abs.to_s)
+    #assert_equal(ary[-2].abs.dirname.to_s,ary[-3].abs.to_s)
   end
   def test_abs_url
     r = rio('file://ahost/a/b/c')
@@ -66,8 +67,8 @@ class TC_splitpath < Test::RIO::TestCase
     assert_equal(r,ary.to_rio)
     assert_equal(rio('c'),ary[-1])
     assert_equal(r,ary[-1].abs)
-    assert_equal(ary[-1].abs.dirname.to_s,ary[-2].abs.to_s)
-    assert_equal(ary[-2].abs.dirname,ary[-3].abs)
+    #assert_equal(ary[-1].abs.dirname.path_no_slash,ary[-2].abs.path_no_slash)
+    #assert_equal(ary[-2].abs.dirname.path_no_slash,ary[-3].abs.path_no_slash)
   end
   def test_rel
     r = rio('a/b/c')
@@ -77,7 +78,7 @@ class TC_splitpath < Test::RIO::TestCase
     assert_equal(r,ary.to_rio)
     assert_equal(rio('c'),ary[-1])
     assert_equal(r.abs,ary[-1].abs)
-    assert_equal(ary[-1].abs.dirname,ary[-2].abs)
-    assert_equal(ary[-2].abs.dirname,ary[-3].abs)
+    #assert_equal(ary[-1].abs.dirname.path_no_slash,ary[-2].abs.path_no_slash)
+    #assert_equal(ary[-2].abs.dirname.path_no_slash,ary[-3].abs.path_no_slash)
   end
 end

data/test/tc/strio.rb

@@ -0,0 +1,73 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+
+class TC_strio < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+  end
+  def setup()
+    super
+  end
+
+  def test_new
+    # $trace_states = true
+    sio = rio(:"")
+    assert_equal('strio',sio.scheme)
+  end
+
+  def test_new_anonymous
+    #$trace_states = true
+    smsg = "Hello String\n"
+    sio = rio(:"")
+    sio.puts!(smsg)
+    assert_equal(smsg,sio.string)
+    ans = sio.gets
+    assert_equal(smsg,ans)
+  end
+
+  def test_new_string
+    # $trace_states = true
+    smsg = "Hello String\n" 
+    sio = rio(:"",smsg)
+    assert_equal(smsg,sio.string)
+    ans = sio.gets
+    assert_equal(smsg,ans)
+  end
+
+  def test_new_stringio
+    # $trace_states = true
+    smsg = "Hello StringIO\n"
+    strio = StringIO.new
+    strio.puts(smsg)
+    sio = rio(strio)
+    assert_equal(smsg,sio.string)
+    ans = sio.gets
+    assert_equal(smsg,ans)
+    smsg2 = "Hello Changed\n"
+    sio.puts(smsg2)
+    ans = sio.gets
+    assert_equal(smsg2,ans)
+
+  end
+
+  def test_copy
+    str = "Hello World\n"
+    src = rio(:"").print!(str)
+    ans = rio(:"")
+    
+    ans.string = ""
+    rio(:"") < src > ans
+    assert_equal(str,ans.string)
+  end
+
+
+
+
+end

data/test/tc/symlink.rb

@@ -6,14 +6,15 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_symlink < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
   def smap(a) a.map { |el| el.to_s } end
-  def tdir() rio(%w/qp symlink/) end
+  def tdir() rio($QPDIR,%w/symlink/) end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }

data/test/tc/symlink0.rb

@@ -6,14 +6,15 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_symlink0 < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
   def smap(a) a.map { |el| el.to_s } end
-  def tdir() rio(%w/qp symlink0/) end
+  def tdir() rio($QPDIR,%w/symlink0/) end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }
@@ -170,7 +171,7 @@ class TC_RIO_symlink0 < Test::Unit::TestCase
       assert!(alink.file?)
       assert(alink.symlink?)
       
-      ::FileUtils.touch(alink)
+      ::FileUtils.touch(alink.to_s)
       assert(afile.file?,"created a file via a symlink")
       assert(alink.exist?,"created a file via a symlink, link exists")
       assert(alink.symlink?,"created a file via a symlink, link is a symlink")

data/test/tc/symlink1.rb

@@ -6,14 +6,15 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_symlink1 < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
   def smap(a) a.map { |el| el.to_s } end
-  def tdir() rio(%w/qp symlink1/) end
+  def tdir() rio($QPDIR,%w/symlink1/) end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }
@@ -76,9 +77,9 @@ class TC_RIO_symlink1 < Test::Unit::TestCase
     assert_equal(lines[3],link.getrec)
 
     link.delete
-    assert(link.closed?)
     assert!(link.exist?)
     assert!(link.symlink?)
+    assert(link.closed?)
 
     rio('..').chdir
   end

data/test/tc/temp.rb

@@ -26,62 +26,74 @@ class TC_temp < Test::RIO::TestCase
     end
   end
 
+  def test_tempfile
+    str = "Hello World\n"
+    src = rio(?").print!(str)
+    ans = rio(?")
+
+    tmp = rio(??)
+    tmp < src
+    assert_equal(str,tmp.rewind.contents)
+    tmp.rewind > ans
+    assert_equal(str,ans.contents)
+  end
+
+
   def test_new
+    # $trace_states = true
+    #p 'HERRRRRRRRRRRRRRRRRRRRRR'
     tmp = rio(??)
     assert_equal('temp',tmp.scheme)
-    assert_equal(::Dir::tmpdir,tmp.dirname.to_s)
+    dn = tmp.dirname
+    #p "DN=",dn,'TMP=',tmp 
+    assert_equal(::Dir::tmpdir,dn.to_s)
+    #p tmp
     assert_match(/^rio/,tmp.filename.to_s)
   end
 
   def test_dir
     tmp = rio(??).mkdir
-    assert(tmp.dir?)
-    assert_equal('file',tmp.scheme)
     assert_equal(::Dir::tmpdir,tmp.dirname.to_s)
     assert_match(/^rio/,tmp.filename.to_s)
+    #p tmp
+    assert(tmp.dir?)
     tmp.close
   end
 
   def test_dir_chdir
+    # $trace_states = true
     rio(??).chdir { |tmp|
       assert(tmp.dir?)
-      assert_equal('path',tmp.scheme)
+      #assert_equal('path',tmp.scheme)
+      #assert_equal('./',tmp.dirname.to_s)
+      assert_nil(tmp.scheme)
       assert_equal('.',tmp.dirname.to_s)
       assert_equal('.',tmp.filename.to_s)
       tmp.close
     }
   end
-#   def test_dir_chdir2
-#     tmp = rio(??).chdir 
-#     assert(tmp.dir?)
-#     assert_equal('path',tmp.scheme)
-#     assert_equal('.',tmp.dirname.to_s)
-#     assert_equal('.',tmp.filename.to_s)
-#     tmp.close
-#   end
+
   def test_dir_mkdir
     tmp = rio(??).mkdir
-    assert(tmp.dir?)
-    assert_equal('file',tmp.scheme)
     assert_equal(::Dir::tmpdir,tmp.dirname.to_s)
     assert_match(/^rio/,tmp.filename.to_s)
+    assert(tmp.dir?)
     tmp.close
   end
 
   def test_file
     tmp = rio(??).file
-    assert(tmp.file?)
-    assert_equal('file',tmp.scheme)
     assert_equal(::Dir::tmpdir,tmp.dirname.to_s)
     assert_match(/^rio/,tmp.filename.to_s)
+    assert(tmp.file?)
     tmp.close
   end
 
   def test_dir_prefix
     tmp = rio(??,'zippy').mkdir
-    assert(tmp.dir?)
     assert_match(/^zippy/,tmp.filename.to_s)
     assert_equal(::Dir::tmpdir,tmp.dirname.to_s)
+    assert(tmp.dir?)
     tmp.close
   end
 
@@ -97,7 +109,7 @@ class TC_temp < Test::RIO::TestCase
     rio('riotmpdir').delete!.mkdir
     tmp = rio(??,'zippy','riotmpdir').mkdir
     assert_match(/^zippy/,tmp.filename.to_s)
-    assert_match('riotmpdir',tmp.dirname.to_s)
+    assert_equal('riotmpdir',tmp.dirname.to_s)
     tmp.close
   end
 
@@ -105,43 +117,45 @@ class TC_temp < Test::RIO::TestCase
     rio('riotmpdir').delete!.mkdir
     tmp = rio(??,'zippy','riotmpdir').file
     assert_match(/^zippy/,tmp.filename.to_s)
-    assert_match('riotmpdir',tmp.dirname.to_s)
+    assert_equal('riotmpdir',tmp.dirname.filename.to_s)
     tmp.close
   end
 
   def test_dir_prefix_url
+    #$trace_states = true
+
     tmp = rio('temp:zippy').mkdir
-    assert_match(/^zippy/,tmp.filename.to_s)
+    assert_match(/^zippy/,tmp.path.to_s)
     tmp.close
   end
 
   def test_file_prefix_url
-    tmp = rio('temp:zippy').file
+    tmp = rio('temp:?zippy').file
     assert_match(/^zippy/,tmp.filename.to_s)
     tmp.close
   end
 
   def test_dir_tmpdir_url
     rio('riotmpdir').delete!.mkdir
-    tmp = rio('temp:riotmpdir/zippy').mkdir
+    tmp = rio('temp:riotmpdir?zippy').mkdir
     assert(tmp.dir?)
     assert_match(/^zippy/,tmp.filename.to_s)
-    assert_match('riotmpdir',tmp.dirname.to_s)
+    assert_equal('riotmpdir',tmp.dirname.to_s)
     tmp.close
   end
 
   def test_file_tmpdir_url
     rio('riotmpdir').delete!.mkdir
-    tmp = rio('temp:riotmpdir/zippy').file
+    tmp = rio('temp:riotmpdir?zippy').file
     assert(tmp.file?)
     assert_match(/^zippy/,tmp.filename.to_s)
-    assert_match('riotmpdir',tmp.dirname.to_s)
+    assert_equal('riotmpdir',tmp.dirname.filename.to_s)
     tmp.close
   end
 
   def test_file_write
     rio('riotmpdir').delete!.mkdir
-    tmp = rio('temp:riotmpdir/zippy')
+    tmp = rio('temp:riotmpdir?zippy')
     tmp.puts("Hello Tempfile")
     assert(tmp.file?)
     assert(tmp.open?)

data/test/tc/tempdir.rb

@@ -19,42 +19,42 @@ class TC_tempdir < Test::RIO::TestCase
     @tmpdir = ::Dir::tmpdir
     @pfx = 'rio'
   end
-
+  
   def pathinfo(ario)
     [:scheme,:opaque,:path,:fspath,:to_s,:to_url,:to_uri].each do |sym|
       puts "#{sym}: #{ario.__send__(sym)}"
     end
   end
-
+  
   def test_new
     tmpdir = rio('tempdir:')
     assert(tmpdir.dir?)
     assert_equal(::Dir::tmpdir,tmpdir.dirname.to_s)
   end
-
+  
   def test_prefix
     tmpdir = rio('tempdir:','zippy')
     assert_match(/^zippy/,tmpdir.filename.to_s)
   end
-
+  
   def test_tmpdir
     rio('riotmpdir').delete!.mkdir
     tmpdir = rio('tempdir:','zippy','riotmpdir')
     assert_match(/^zippy/,tmpdir.filename.to_s)
-    assert_match('riotmpdir',tmpdir.dirname.to_s)
+    assert_equal('riotmpdir',tmpdir.dirname.to_s)
   end
-
+  
   def test_prefix_url
     tmpdir = rio('tempdir:zippy')
-    assert_match(/^zippy/,tmpdir.filename.to_s)
+    assert_match(/^zippy/,tmpdir.path.to_s)
   end
-
+  
   def test_tmpdir_url
     rio('riotmpdir').delete!.mkdir
-    tmpdir = rio('tempdir:riotmpdir/zippy')
+    tmpdir = rio('tempdir:riotmpdir?zippy')
     assert_match(/^zippy/,tmpdir.filename.to_s)
-    assert_match('riotmpdir',tmpdir.dirname.to_s)
+    assert_equal('riotmpdir',tmpdir.dirname.to_s)
   end
-
-
+  
+  
 end

data/test/tc/testcase.rb

@@ -1,7 +1,8 @@
+require 'platform'
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
-
+#require 'test/unit/testsuite'
+require 'qpdir'
 
 
 module RIOSupport
@@ -20,7 +21,6 @@ module RIOSupport
 
 end
 $supports_symlink = RIOSupport.supports_symlink
-$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
 module RIO_TestCase 
   module Util
     def make_lines_file(n_lines=8,*args)
@@ -35,13 +35,10 @@ module RIO_TestCase
     module_function :make_lines_file
   end
 
-  T_ROOT = 'qp'
-  def _t_dir_from_class()
-    self.class.to_s.sub(/^TC_/,'')
-  end
-  def tdir() 
-    rio(T_ROOT,_t_dir_from_class()) 
-  end
+  #T_ROOT = $QPDIR
+  #def _t_dir_from_class()
+  #  self.class.to_s.sub(/^TC_(RIO_)?/,'')
+  #end
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
@@ -78,28 +75,44 @@ module RIO_TestCase
     file < lines
     [file,lines]
   end
-  def setup
-    #$trace_states = true
-    @cwd = ::Dir.getwd
-    tdir.mkpath.chdir
-  end
-  def teardown
-    ::Dir.chdir @cwd
-  end
+#  def setup
+#    #$trace_states = true
+#    @cwd = ::Dir.getwd
+#    tdir.mkpath.chdir
+#  end
+#  def teardown
+#    ::Dir.chdir @cwd
+#  end
 end
 module Test
   module RIO
     class TestCase < Unit::TestCase
       include RIO_TestCase::Util
+      attr_reader :cwd
+      def initialize(*args)
+        super
+        @cwd = ::Dir.getwd
+      end
+      def initialize_copy(other)
+        super
+        @cwd = other.cwd
+      end
+
+      @@counter = 0;
       def setup()
+        # @@counter += 1
+        # p "SETUP: #{@@counter} #{self.class} CWD=#{@cwd.inspect}"
         return if self.class == Test::RIO::TestCase
-        #p self.class
         @cwd = ::Dir.getwd
+        # p "     : #{@@counter} #{::Dir.getwd}"
         tdir.mkpath.chdir
       end
       def teardown
+        # @@counter -= 1
+        # p "TDOWN:: #{@@counter}  #{self.class} CWD=#{@cwd.inspect}"
         return if self.class == Test::RIO::TestCase
-        ::Dir.chdir @cwd
+        ::Dir.chdir @cwd if ::File.directory?(@cwd)
+        # p "     : #{@@counter} #{::Dir.getwd}"
       end
       def rios2str(a) a.map { |el| el.to_s } end
 
@@ -151,18 +164,19 @@ module Test
         file.close
         [lines,file]
       end
-      T_ROOT = 'qp'
-      def _t_dir_from_class()
-        self.class.to_s.sub(/^TC_/,'')
-      end
-      def self.tdir_from_class()
-        self.to_s.sub(/^TC_/,'')
-      end
-      def self.tdir()
-        rio(T_ROOT,tdir_from_class()) 
-      end
+       T_ROOT = $QPDIR
+       def _tdir_from_class()
+         self.class._tdir_from_class()
+       end
+       def self._tdir_from_class()
+         self.to_s.sub(/^TC_(RIO_)?/,'')
+       end
+
+       def self.tdir()
+         rio(T_ROOT,_tdir_from_class()+'/') 
+       end
       def tdir() 
-        rio(T_ROOT,_t_dir_from_class()) 
+        self.class.tdir()
       end
       def default_test; end
     end