1 files changed, 34 insertions, 9 deletions
diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb
index 0bfff7d..1896300 100644
--- a/test/unit/test_request.rb
+++ b/test/unit/test_request.rb
@@ -1,14 +1,9 @@
+# -*- encoding: binary -*-
+
  # Copyright (c) 2009 Eric Wong
  # You can redistribute it and/or modify it under the same terms as Ruby.
  
  require 'test/test_helper'
-begin
-  require 'rack'
-  require 'rack/lint'
-rescue LoadError
-  warn "Unable to load rack, skipping test"
-  exit 0
-end
  
  include Unicorn
  
@@ -16,10 +11,11 @@ class RequestTest < Test::Unit::TestCase
  
    class MockRequest < StringIO
      alias_method :readpartial, :sysread
+    alias_method :read_nonblock, :sysread
    end
  
    def setup
-    @request = HttpRequest.new(Logger.new($stderr))
+    @request = HttpRequest.new
      @app = lambda do |env|
        [ 200, { 'Content-Length' => '0', 'Content-Type' => 'text/plain' }, [] ]
      end
@@ -119,6 +115,31 @@ class RequestTest < Test::Unit::TestCase
      assert_nothing_raised { res = @lint.call(env) }
    end
  
+  def test_no_content_stringio
+    client = MockRequest.new("GET / HTTP/1.1\r\nHost: foo\r\n\r\n")
+    res = env = nil
+    assert_nothing_raised { env = @request.read(client) }
+    assert_equal StringIO, env['rack.input'].class
+  end
+
+  def test_zero_content_stringio
+    client = MockRequest.new("PUT / HTTP/1.1\r\n" \
+                             "Content-Length: 0\r\n" \
+                             "Host: foo\r\n\r\n")
+    res = env = nil
+    assert_nothing_raised { env = @request.read(client) }
+    assert_equal StringIO, env['rack.input'].class
+  end
+
+  def test_real_content_not_stringio
+    client = MockRequest.new("PUT / HTTP/1.1\r\n" \
+                             "Content-Length: 1\r\n" \
+                             "Host: foo\r\n\r\n")
+    res = env = nil
+    assert_nothing_raised { env = @request.read(client) }
+    assert_equal Unicorn::TeeInput, env['rack.input'].class
+  end
+
    def test_rack_lint_put
      client = MockRequest.new(
        "PUT / HTTP/1.1\r\n" \
@@ -149,7 +170,11 @@ class RequestTest < Test::Unit::TestCase
      assert_nothing_raised { env = @request.read(client) }
      assert ! env.include?(:http_body)
      assert_equal length, env['rack.input'].size
-    count.times { assert_equal buf, env['rack.input'].read(bs) }
+    count.times {
+      tmp = env['rack.input'].read(bs)
+      tmp << env['rack.input'].read(bs - tmp.size) if tmp.size != bs
+      assert_equal buf, tmp
+    }
      assert_nil env['rack.input'].read(bs)
      assert_nothing_raised { env['rack.input'].rewind }
      assert_nothing_raised { res = @lint.call(env) }