akr	2009-01-17 18:39:14 +0900 (Sat, 17 Jan 2009)

  New Revision: 21626

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21626

  Log:
    extract TestBasicSocket from test_socket.rb.

  Added files:
    trunk/test/socket/test_basicsocket.rb
  Modified files:
    trunk/test/socket/test_socket.rb

Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 21625)
+++ test/socket/test_socket.rb	(revision 21626)
@@ -4,89 +4,6 @@
 rescue LoadError
 end
 
-class TestBasicSocket < Test::Unit::TestCase
-  def inet_stream
-    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    yield sock
-  ensure
-    assert_raise(IOError) {sock.close}
-  end
-
-  def test_getsockopt
-    inet_stream do |s|
-      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
-      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
-
-      n = s.getsockopt("SOL_SOCKET", "SO_TYPE")
-      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
-
-      n = s.getsockopt(:SOL_SOCKET, :SO_TYPE)
-      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
-
-      n = s.getsockopt(:SOCKET, :TYPE)
-      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
-
-      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
-      assert_equal([0].pack("i"), n)
-
-      val = Object.new
-      class << val; self end.send(:define_method, :to_int) {
-        s.close
-        Socket::SO_TYPE
-      }
-      assert_raise(IOError) {
-        n = s.getsockopt(Socket::SOL_SOCKET, val)
-      }
-    end
-  end
-
-  def test_setsockopt
-    s = nil
-    linger = [0, 0].pack("ii")
-
-    val = Object.new
-    class << val; self end.send(:define_method, :to_str) {
-      s.close
-      linger
-    }
-    inet_stream do |sock|
-      s = sock
-      assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger))
-
-      assert_raise(IOError, "[ruby-dev:25039]") {
-        s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, val)
-      }
-    end
-
-    val = Object.new
-    class << val; self end.send(:define_method, :to_int) {
-      s.close
-      Socket::SO_LINGER
-    }
-    inet_stream do |sock|
-      s = sock
-      assert_raise(IOError) {
-        s.setsockopt(Socket::SOL_SOCKET, val, linger)
-      }
-    end
-  end
-
-  def test_listen
-    s = nil
-    log = Object.new
-    class << log; self end.send(:define_method, :to_int) {
-      s.close
-      2
-    }
-    inet_stream do |sock|
-      s = sock
-      assert_raise(IOError) {
-        s.listen(log)
-      }
-    end
-  end
-end if defined?(Socket)
-
 class TestSocket < Test::Unit::TestCase
   def test_unpack_sockaddr
     sockaddr_in = Socket.sockaddr_in(80, "")
Index: test/socket/test_basicsocket.rb
===================================================================
--- test/socket/test_basicsocket.rb	(revision 0)
+++ test/socket/test_basicsocket.rb	(revision 21626)
@@ -0,0 +1,88 @@
+begin
+  require "socket"
+  require "test/unit"
+rescue LoadError
+end
+
+class TestBasicSocket < Test::Unit::TestCase
+  def inet_stream
+    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    yield sock
+  ensure
+    assert_raise(IOError) {sock.close}
+  end
+
+  def test_getsockopt
+    inet_stream do |s|
+      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
+      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
+
+      n = s.getsockopt("SOL_SOCKET", "SO_TYPE")
+      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
+
+      n = s.getsockopt(:SOL_SOCKET, :SO_TYPE)
+      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
+
+      n = s.getsockopt(:SOCKET, :TYPE)
+      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
+
+      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+      assert_equal([0].pack("i"), n)
+
+      val = Object.new
+      class << val; self end.send(:define_method, :to_int) {
+        s.close
+        Socket::SO_TYPE
+      }
+      assert_raise(IOError) {
+        n = s.getsockopt(Socket::SOL_SOCKET, val)
+      }
+    end
+  end
+
+  def test_setsockopt
+    s = nil
+    linger = [0, 0].pack("ii")
+
+    val = Object.new
+    class << val; self end.send(:define_method, :to_str) {
+      s.close
+      linger
+    }
+    inet_stream do |sock|
+      s = sock
+      assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger))
+
+      assert_raise(IOError, "[ruby-dev:25039]") {
+        s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, val)
+      }
+    end
+
+    val = Object.new
+    class << val; self end.send(:define_method, :to_int) {
+      s.close
+      Socket::SO_LINGER
+    }
+    inet_stream do |sock|
+      s = sock
+      assert_raise(IOError) {
+        s.setsockopt(Socket::SOL_SOCKET, val, linger)
+      }
+    end
+  end
+
+  def test_listen
+    s = nil
+    log = Object.new
+    class << log; self end.send(:define_method, :to_int) {
+      s.close
+      2
+    }
+    inet_stream do |sock|
+      s = sock
+      assert_raise(IOError) {
+        s.listen(log)
+      }
+    end
+  end
+end if defined?(BasicSocket)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/