Modified: trunk/jopenssl/build.xml (819 => 820)
--- trunk/jopenssl/build.xml 2007-11-29 21:54:28 UTC (rev 819)
+++ trunk/jopenssl/build.xml 2007-11-29 22:08:29 UTC (rev 820)
@@ -50,7 +50,7 @@
<target name="test" depends="jar">
<exec executable="${jruby.home}/bin/jruby" failonerror="true">
- <arg value="-Ilib:."/>
+ <arg value="-Ilib:test"/>
<arg value="test/test_openssl.rb"/>
</exec>
</target>
Modified: trunk/jopenssl/test/test_openssl.rb (819 => 820)
--- trunk/jopenssl/test/test_openssl.rb 2007-11-29 21:54:28 UTC (rev 819)
+++ trunk/jopenssl/test/test_openssl.rb 2007-11-29 22:08:29 UTC (rev 820)
@@ -13,18 +13,18 @@
end
if runTests
-# won't work, since kill and pid is used.
-# require 'test/openssl/test_ssl'
- require 'test/openssl/test_asn1'
- require 'test/openssl/test_cipher'
- require 'test/openssl/test_digest'
- require 'test/openssl/test_hmac'
- require 'test/openssl/test_ns_spki'
- require 'test/openssl/test_pkey_rsa'
- require 'test/openssl/test_x509cert'
- require 'test/openssl/test_x509crl'
- require 'test/openssl/test_x509name'
- require 'test/openssl/test_x509ext'
- require 'test/openssl/test_x509req'
- require 'test/openssl/test_x509store'
+ require 'openssl/test_asn1'
+ require 'openssl/test_cipher'
+ require 'openssl/test_digest'
+ require 'openssl/test_hmac'
+ require 'openssl/test_ns_spki'
+ require 'openssl/test_pair'
+ require 'openssl/test_pkey_rsa'
+# require 'openssl/test_ssl' # won't work, since kill and pid is used.
+ require 'openssl/test_x509cert'
+ require 'openssl/test_x509crl'
+ require 'openssl/test_x509name'
+ require 'openssl/test_x509ext'
+ require 'openssl/test_x509req'
+ require 'openssl/test_x509store'
end
Added: trunk/jopenssl/test/ut_eof.rb (0 => 820)
--- trunk/jopenssl/test/ut_eof.rb (rev 0)
+++ trunk/jopenssl/test/ut_eof.rb 2007-11-29 22:08:29 UTC (rev 820)
@@ -0,0 +1,128 @@
+require 'test/unit'
+
+module TestEOF
+ def test_eof_0
+ open_file("") {|f|
+ assert_equal("", f.read(0))
+ assert_equal("", f.read(0))
+ assert_equal("", f.read)
+ assert_nil(f.read(0))
+ assert_nil(f.read(0))
+ }
+ open_file("") {|f|
+ assert_nil(f.read(1))
+ assert_equal("", f.read)
+ assert_nil(f.read(1))
+ }
+ open_file("") {|f|
+ s = "x"
+ assert_equal("", f.read(nil, s))
+ assert_equal("", s)
+ }
+ open_file("") {|f|
+ s = "x"
+ assert_nil(f.read(10, s))
+ assert_equal("", s)
+ }
+ end
+
+ def test_eof_0_rw
+ return unless respond_to? :open_file_rw
+ open_file_rw("") {|f|
+ assert_equal("", f.read)
+ assert_equal("", f.read)
+ assert_equal(0, f.syswrite(""))
+ assert_equal("", f.read)
+ }
+ end
+
+ def test_eof_1
+ open_file("a") {|f|
+ assert_equal("", f.read(0))
+ assert_equal("a", f.read(1))
+ assert_equal("" , f.read(0))
+ assert_equal("" , f.read(0))
+ assert_equal("", f.read)
+ assert_nil(f.read(0))
+ assert_nil(f.read(0))
+ }
+ open_file("a") {|f|
+ assert_equal("a", f.read(1))
+ assert_nil(f.read(1))
+ }
+ open_file("a") {|f|
+ assert_equal("a", f.read(2))
+ assert_nil(f.read(1))
+ assert_equal("", f.read)
+ assert_nil(f.read(1))
+ }
+ open_file("a") {|f|
+ assert_equal("a", f.read)
+ assert_nil(f.read(1))
+ assert_equal("", f.read)
+ assert_nil(f.read(1))
+ }
+ open_file("a") {|f|
+ assert_equal("a", f.read(2))
+ assert_equal("", f.read)
+ assert_equal("", f.read)
+ }
+ open_file("a") {|f|
+ assert_equal("a", f.read)
+ assert_nil(f.read(0))
+ }
+ open_file("a") {|f|
+ s = "x"
+ assert_equal("a", f.read(nil, s))
+ assert_equal("a", s)
+ }
+ open_file("a") {|f|
+ s = "x"
+ assert_equal("a", f.read(10, s))
+ assert_equal("a", s)
+ }
+ end
+
+ def test_eof_2
+ open_file("") {|f|
+ assert_equal("", f.read)
+ assert(f.eof?)
+ }
+ end
+
+ def test_eof_3
+ open_file("") {|f|
+ assert(f.eof?)
+ }
+ end
+
+ module Seek
+ def open_file_seek(content, pos)
+ open_file(content) do |f|
+ f.seek(pos)
+ yield f
+ end
+ end
+
+ def test_eof_0_seek
+ open_file_seek("", 10) {|f|
+ assert_equal(10, f.pos)
+ assert_equal("", f.read(0))
+ assert_equal("", f.read)
+ assert_nil(f.read(0))
+ assert_equal("", f.read)
+ }
+ end
+
+ def test_eof_1_seek
+ open_file_seek("a", 10) {|f|
+ assert_equal("", f.read)
+ assert_equal("", f.read)
+ }
+ open_file_seek("a", 1) {|f|
+ assert_equal("", f.read)
+ assert_equal("", f.read)
+ }
+ end
+ end
+end
