rio 0.4.2 → 0.5.1

data/test/tc/dir.rb

@@ -3,7 +3,6 @@ if $0 == __FILE__
   Dir.chdir File.dirname(__FILE__)+'/../'
   $:.unshift File.expand_path('../lib/')
 end
-
 require 'rio'
 require 'tc/testcase'
 class TC_dir < Test::Unit::TestCase
@@ -22,7 +21,7 @@ class TC_dir < Test::Unit::TestCase
     while ent = d.read
       ans << ent
     end
-    assert_equal(@rents,ans)
+    assert_equal(@rents.sort,ans.sort)
     assert(d.closed?)
   end
   def test_rewind
@@ -31,13 +30,13 @@ class TC_dir < Test::Unit::TestCase
     while ent = d.read
       ans << ent
     end
-    assert_equal(@rents,ans)
+    assert_equal(@rents.sort,ans.sort)
     assert!(d.closed?)
     d.rewind
     while ent = d.read
       ans << ent
     end
-    assert_equal(@rents+@rents,ans)
+    assert_equal((@rents+@rents).sort,ans.sort)
     d.close
   end
   def test_seek

data/test/tc/dir_iter.rb

@@ -6,7 +6,7 @@ end
 
 if ENV['TEST_RIO'] == 'gem'
   require 'rubygems'
-  require_gem 'rio'
+  require 'rio'
 else
   require 'rio'
 end
@@ -26,6 +26,8 @@ class TC_dir_iter < Test::RIO::TestCase
           @@exp[d.to_s] << rio('f'+fnum.to_s).touch
         }
       }
+      @@exp[d.to_s] = ::Dir.entries(d.to_s).reject{|el| el =~ /^\.\.?$/}
+      #p @@exp[d.to_s]
     }
   end
   def setup

data/test/tc/dirent.rb

@@ -6,11 +6,12 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_dirent < Test::Unit::TestCase
   def smap(a) a.map { |el| el.to_s } end
-  def tdir() rio(%w/qp dirent/) end
+  def tdir() rio($QPDIR,%w/dirent/) end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }
@@ -18,7 +19,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
   end
   def setup() 
     $trace_states = false
-    rio('qp/dirent').delete!.mkpath.chdir do
+    rio($QPDIR,'dirent').delete!.mkpath.chdir do
       rio('d0').mkpath.chdir do
         rio('q1') < (0..1).map { |i| "L#{i}:d0/q1\n" }
         rio('q2') < (0..1).map { |i| "L#{i}:d0/q2\n" }
@@ -37,7 +38,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
   end
   def test_dirent
     ds = %w[d0/q1 d0/q2 d0/d1 d0/d2 d0/d1/q1 d0/d1/q2 d0/d1/d1 d0/d1/d1/q1 d0/d1/d1/q2]
-    rio('qp/dirent').chdir do
+    rio($QPDIR,'dirent').chdir do
       begin
         ans = []
         rio('d0').entries.each do |ent|
@@ -68,7 +69,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
   end
   def test_dirent_mixed
     ds = %w[d0/q1 d0/q2 d0/d1 d0/d2 d0/d1/q1 d0/d1/q2 d0/d1/d1 d0/d1/d1/q1 d0/d1/d1/q2]
-    rio('qp/dirent').chdir do
+    rio($QPDIR,'dirent').chdir do
       begin
         exp = []
         ans = []
@@ -104,7 +105,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
   end
   def test_dirent_files
     ds = %w[d0/q1 d0/q2 d0/d1 d0/d2 d0/d1/q1 d0/d1/q2 d0/d1/d1 d0/d1/d1/q1 d0/d1/d1/q2]
-    rio('qp/dirent').chdir do
+    rio($QPDIR,'dirent').chdir do
 
       begin
         ans = []
@@ -127,7 +128,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
   end
   def test_dirent_all
     ds = %w[d0/q1 d0/q2 d0/d1 d0/d2 d0/d1/q1 d0/d1/q2 d0/d1/d1 d0/d1/d2 d0/d1/d1/q1 d0/d1/d1/q2]
-    rio('qp/dirent').chdir do
+    rio($QPDIR,'dirent').chdir do
       begin
         ans = []
         rio('d0').all.entries.each do |ent|

data/test/tc/each.rb

@@ -5,27 +5,32 @@ if $0 == __FILE__
 end
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+
+#require 'test/unit/testsuite'
 
 class TC_RIO_each < Test::Unit::TestCase
-  def test_basic
-    qp = rio('qp')
-    rio(qp,'test_each').rmtree.mkpath.chdir do
+  def setup
+    rio($QPDIR,'test_each').rmtree.mkpath.chdir do
       f = rio('basic.txt')
       0.upto(6) do |n|
         f.puts("L#{n+1}: #{n*3}:#{n*2}")
       end
       f.puts!("Line Z")
-      
-      expa = ["L1: 0:0\n", "L2: 3:2\n", "L3: 6:4\n", "L4: 9:6\n", "L5: 12:8\n", "L6: 15:10\n", "L7: 18:12\n", 
-              "Line Z\n"]
-      
+    end
+  end
+
+  def test_basic
+    rio($QPDIR,'test_each').chdir do
+
+      expa = ["L1: 0:0\n", "L2: 3:2\n", "L3: 6:4\n", "L4: 9:6\n", "L5: 12:8\n", "L6: 15:10\n", "L7: 18:12\n",
+        "Line Z\n"]
+
       ans = []
-      
+
       rio('basic.txt').lines { |line| ans.push(line) }
       assert_equal(expa,ans)
       ans.clear
-      
+
       rio('basic.txt').lines.each { |line| ans.push(line) }
       assert_equal(expa,ans)
       ans.clear
@@ -33,77 +38,87 @@ class TC_RIO_each < Test::Unit::TestCase
       rio('basic.txt').each { |line| ans.push(line) }
       assert_equal(expa,ans)
       ans.clear
-      
+
       # proxy of IO#each_line -- lines() is ignored
       rio('basic.txt').each_line { |line| ans.push(line) }
       assert_equal(expa,ans)
       ans.clear
-      
+
       assert_equal(expa,rio('basic.txt').lines.to_a)
       assert_equal(expa,rio('basic.txt').to_a)
-      
+
       ans = rio('basic.txt').lines(1..3).to_a
       assert_equal(expa[1..3],ans)
       ans = rio('basic.txt').lines(1..1,5..6).to_a
       assert_equal(expa[1..1] + expa[5..6],ans)
       ans = rio('basic.txt').lines(1,5..6).to_a
       assert_equal(expa[1..1] + expa[5..6],ans)
-      
+
       assert_equal([expa[1],expa[4],expa[6]],rio('basic.txt').lines(/2/).to_a)
-      
+
       ans = []
       rio('basic.txt').chomp.lines(/2/).each { |line| ans.push(line) }
       assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
-      
+
       ans = []
       rio('basic.txt').chomp.lines(/2/) { |line| ans.push(line) }
       assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
-      
+
       ans = []
       rio('basic.txt').lines(/2/).chomp { |line| ans.push(line) }
       assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
-      
-      
-      expb = ["L1: 0:0\nL2: 3:2\nL3: 6:4\nL4: 9:6\n", "L5: 12:8\nL6: 15:10\nL7: 18:12\nLin", "e Z\n"]
-      
-      assert_equal(expb,rio('basic.txt').bytes(32).to_a)
-      assert_equal(expb[0..1],rio('basic.txt').records(0..1).bytes(32).to_a)
-      assert_equal(expb[0..1],rio('basic.txt').bytes(32).records(0..1).to_a)
-      
+    end
+  end
+
+  def test_bytes
+    rio($QPDIR,'test_each').chdir do
+      eol = (($mswin32 || $mingw32) && RUBY_VERSION >= "1.9") ? "\r\n" : "\n"
+      nbytes = 32
+
+      str = "L1: 0:0#{eol}L2: 3:2#{eol}L3: 6:4#{eol}L4: 9:6#{eol}L5: 12:8#{eol}L6: 15:10#{eol}L7: 18:12#{eol}Line Z#{eol}"
+      expb = []
+      (0..2).each do |n|
+        expb << str[nbytes*n,nbytes]
+      end
+       
+      assert_equal(expb,rio('basic.txt').bytes(nbytes).to_a)
+      assert_equal(expb[0..1],rio('basic.txt').records(0..1).bytes(nbytes).to_a)
+      assert_equal(expb[0..1],rio('basic.txt').bytes(nbytes).records(0..1).to_a)
+
       ans = []
-      rio('basic.txt').bytes(32) { |rec| ans << rec }
+      rio('basic.txt').bytes(nbytes) { |rec| ans << rec }
       assert_equal(expb,ans)
-      
+
       ans = []
-      rio('basic.txt').bytes(32).each { |rec| ans << rec }
+      rio('basic.txt').bytes(nbytes).each { |rec| ans << rec }
       assert_equal(expb,ans)
-      
+
       ans = []
-      rio('basic.txt').records(1..2).bytes(32).each { |rec| ans << rec }
+      rio('basic.txt').records(1..2).bytes(nbytes).each { |rec| ans << rec }
       assert_equal(expb[1..2],ans)
-      
+
       ans = []
-      rio('basic.txt').records(1..2).bytes(32) { |rec| ans << rec }
+      rio('basic.txt').records(1..2).bytes(nbytes) { |rec| ans << rec }
       assert_equal(expb[1..2],ans)
-      
+
       ans = []
-      rio('basic.txt').bytes(32).records(1..2).each { |rec| ans << rec }
+      rio('basic.txt').bytes(nbytes).records(1..2).each { |rec| ans << rec }
       assert_equal(expb[1..2],ans)
-      
+
       ans = []
-      rio('basic.txt').bytes(32).records(1..2) { |rec| ans << rec }
+      rio('basic.txt').bytes(nbytes).records(1..2) { |rec| ans << rec }
       assert_equal(expb[1..2],ans)
-      
-      assert_equal(expb[0..2],rio('basic.txt').bytes(32).records(0..2).to_a)
-      
-#      expc = [["15", "10"], ["18", "12"]]
-#      assert_equal(expc,rio('basic.txt').lines(/(\d\d):(\d\d)/).to_a)
-      
-#      ans = []
-#      rio('basic.txt').lines(/(\d\d):(\d\d)/) { |ary|
-#        ans.push(ary)
-#      }
-#      assert_equal(expc,ans)
+
+      assert_equal(expb[0..2],rio('basic.txt').bytes(nbytes).records(0..2).to_a)
+
+      #      expc = [["15", "10"], ["18", "12"]]
+      #      assert_equal(expc,rio('basic.txt').lines(/(\d\d):(\d\d)/).to_a)
+
+      #      ans = []
+      #      rio('basic.txt').lines(/(\d\d):(\d\d)/) { |ary|
+      #        ans.push(ary)
+      #      }
+      #      assert_equal(expc,ans)
 
     end
   end

data/test/tc/each_break.rb

@@ -35,25 +35,32 @@ class TC_each_break < Test::Unit::TestCase
     @l3 = @f3.readlines
     @d1 = rio(@dir,'d1')
     @d2 = rio(@dir,'d2')
-    @e1 = %w[d1/f1].map { |ent| rio(@dir,ent) }
-    @e2 = %w[d2/f1 d2/f2].map { |ent| rio(@dir,ent) }
-    @files = [@f1,@f2,@f3]
-    @dirs = [@d1,@d2]
-    @ents = @dirs + @files
-  end
-  def test_nobreak_dir
-    ans = []
-    @d1.each { |ent| ans << ent }
-    assert(@d1.closed?)
-    assert_equal(@e1,ans)
 
-    ans = []
-    @d2.each { |ent| ans << ent }
-    assert(@d2.closed?)
-    assert_equal(@e2,ans)
+    @e1 = %w[d1/f1].map { |ent| rio(@dir,ent) }
 
+    @e2 = []
+    ::Dir.chdir('dir') do |d|
+      @e2 += ::Dir.entries('d2').
+        reject{|el| el =~ /^\.\.?$/}.
+        map { |ent| rio(@dir,'d2',ent) }
+    end
+    #rio(@dir,'d2').entries
+    @e3 = %w[d2/f1 d2/f2].map { |ent| rio(@dir,ent) }
+    #p @e2,@e3
+    # @files = [@f1,@f2,@f3]
+    @files = ::Dir.entries('dir').
+      reject{|el| el =~ /^\.\.?$/}.
+      select{|el| ::File.file?('dir/' + el)}.
+      map { |ent| rio(@dir,ent) }
+    @dirs = ::Dir.entries('dir').
+      reject{|el| el =~ /^\.\.?$/}.
+      select{|el| ::File.directory?('dir/' + el)}.
+      map { |ent| rio(@dir,ent) }
+    @ents = ::Dir.entries('dir').
+      reject{|el| el =~ /^\.\.?$/}.
+      map { |ent| rio(@dir,ent) }
+    #p @files,@dirs,@ents
   end
-
   def test_nobreak_dir_sel
     ans = []
     @dir.entries.each { |ent| ans << ent }
@@ -68,54 +75,89 @@ class TC_each_break < Test::Unit::TestCase
     assert_array_equal(@dirs,ans)
 
   end
-  def test_dir_sel
+  def test_dir_sel0
     ans = []
+    exp = ::Dir.entries(@dir.to_s)
     @dir.entries.each { |ent| ans << ent; break }
     assert_array_equal(@ents[0..0],ans)
 
+  end
+  def test_dir_sel1
     ans = []
     @dir.files.each { |ent| ans << ent; break }
-    assert_array_equal(@ents[1..1],ans)
+    assert_array_equal(@files[0..0],ans)
 
+  end
+  def test_dir_sel2
     ans = []
     @dir.dirs.each { |ent| ans << ent; break }
-    assert_array_equal(@ents[2..2],ans)
+    assert_array_equal(@dirs[0..0],ans)
     
     @dir.close
     assert(@dir.closed?)
 
+  end
+  def test_dir_sel3
     ans = []
     @dir.dirs.each { |ent| ans << ent; break }
-    assert_array_equal(@dirs[0..0],ans)
+    # p ans
+    assert_array_equal(@dirs[0..0].sort,ans.sort)
     
+  end
+  def test_dir_sel4
     ans = []
     @dir.files.each { |ent| ans << ent; break }
-    assert_array_equal(@ents[1..1],ans)
+    # p @files,ans
+    assert_array_equal(@files[0..0],ans)
 
+  end
+  def test_dir_sel5
     ans = []
     @dir.entries.each { |ent| ans << ent; break }
-    assert_array_equal(@ents[2..2],ans)
+    assert_array_equal(@ents[0..0],ans)
 
     @dir.close
     assert(@dir.closed?)
 
+  end
+  def test_dir_sel6
     ans = []
     @dir.files.each { |ent| ans << ent; break }
     assert_array_equal(@files[0..0],ans)
 
+  end
+  def test_dir_sel7
     ans = []
     @dir.dirs.each { |ent| ans << ent; break }
-    assert_array_equal(@files[1..1],ans)
+    assert_array_equal(@dirs[0..0],ans)
 
+  end
+  def test_dir_sel8
     ans = []
     @dir.entries.each { |ent| ans << ent; break }
-    assert_array_equal(@files[2..2],ans)
+    assert_array_equal(@ents[0..0],ans)
 
+  end
+  def test_dir_sel9
     ans = []
     @dir.entries.each { |ent| ans << ent; break }
-    assert_array_equal([],ans)
+    assert_array_equal(@ents[0..0],ans)
+
+  end
+  def test_nobreak_dir
+    ans = []
+    @d1.each { |ent| ans << ent }
+    assert(@d1.closed?)
+    assert_equal(@e1,ans)
+
+    ans = []
+    @d2.each { |ent| ans << ent }
+    assert(@d2.closed?)
+    #p @e2,ans
+    assert_equal(@e2,ans)
 
   end
+
   def test_dir_oneentry
     ans = []
     @d1.each { |ent| ans << ent; break }

data/test/tc/edf.rb

@@ -6,10 +6,11 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_edf < Test::Unit::TestCase
-  def tdir() rio(%w/qp edf/) end
+  def tdir() rio($QPDIR,%w/edf/) end
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end

data/test/tc/empty.rb

@@ -40,11 +40,13 @@ class TC_empty < Test::RIO::TestCase
     assert!(rio('f1').empty?)
   end
   def test_ps_empty
-    assert(rio(?-,PROG['list_dir'] + ' d0').empty?)
-  end
-  def test_ps_not_empty
-    assert!(rio(?-,PROG['list_dir'] + ' d1').empty?)
+    list_dir = PROG[:list_dir]
+    r = rio(?-,[list_dir] + ['d0'])
+    assert(r.empty?)
   end
+  #def test_ps_not_empty
+  #  assert!(rio(?-,PROG['list_dir'] + ' d1').empty?)
+  #end
   def test_dev_null_empty
     assert(rio(nil).empty?)
   end