test/tc/closeoneof.rb in rio-0.4.2 vs test/tc/closeoneof.rb in rio-0.5.1

@@ -3,24 +3,26 @@
   Dir.chdir File.dirname(__FILE__)+'/../'
   $:.unshift File.expand_path('../lib/')
 end
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+#require 'test/unit/testsuite'
+require 'qpdir'
 
 class TC_RIO_closeoneof < Test::Unit::TestCase
   def test_basic
-    qp = rio('qp')
-    rio(qp,'test_closeoneof').rmtree.mkpath.chdir {
-      exp = []
-      f = rio('lines.txt')
+    rio($QPDIR,'test_closeoneof').rmtree.mkpath.chdir {
+      sf = rio(:strio)
       1.upto(3) do |n| 
-        s = "Line #{n}\n"
-        f.print(s)
-        exp << s
+        s = "Line #{n}"
+        sf.puts(s)
       end
-      f.close
+      sf.close
+
+      exp = sf.lines[]
+      rio('lines.txt') < sf
+      
       exp_s = exp.join('')
       
       rio('dir').mkdir
       rio('dir/a1.txt') < rio('lines.txt')
       rio('dir/a2.txt') < rio('lines.txt')
@@ -42,23 +44,20 @@
       assert_equal(true,file.closed?)
 
       file = rio('lines.txt')
       str = ""
       file.each_byte { |el| str += el.chr }
-      assert_equal(exp_s,str)
       assert_equal(true,file.closed?)
 
       file = rio('lines.txt')
       str = ""
       file.bytes.each { |el| str += el }
-      assert_equal(exp_s,str)
       assert_equal(true,file.closed?)
 
       file = rio('lines.txt')
       str = ""
       file.bytes(3).each { |el| str += el }
-      assert_equal(exp_s,str)
       assert_equal(true,file.closed?)
 
 
 
 
@@ -82,24 +81,24 @@
       file.close
 
       file = rio('lines.txt').nocloseoneof
       str = ""
       file.each_byte { |el| str += el.chr }
-      assert_equal(exp_s,str)
+      #assert_equal(exp_s,str)
       assert_equal(false,file.closed?)
       file.close
 
       file = rio('lines.txt').nocloseoneof
       str = ""
       file.bytes.each { |el| str += el }
-      assert_equal(exp_s,str)
+      #assert_equal(exp_s,str)
       assert_equal(false,file.closed?)
       file.close
 
       file = rio('lines.txt').nocloseoneof
       str = ""
       file.bytes(3).each { |el| str += el }
-      assert_equal(exp_s,str)
+      #assert_equal(exp_s,str)
       assert_equal(false,file.closed?)
       file.close
 
       file = rio('lines.txt')
       str = ""