@@ -28,6 +28,18 @@ module BasicTests assert_equal 200, response['status'] end end + + def test_last_header + response = get("/bytes/123", { + "Hello" => "World", + "Something" => "Else", + "Content-Length" => "0" + }) + assert_equal 200, response['status'] + assert_equal "World", response['HTTP_HELLO'] + assert_equal "Else", response['HTTP_SOMETHING'] + assert_equal 0, response['CONTENT_LENGTH'] + end end class BasicTest < ServerTest test/basic_test.rb @@ -49,19 +49,10 @@ class HelperApp end end -class Test::Unit::TestCase - def get(path) - response = Net::HTTP.get_response(URI.parse("http://0.0.0.0:#{TEST_PORT}#{path}")) - end - - def post(path, data) - response = Net::HTTP.post_form(URI.parse("http://0.0.0.0:#{TEST_PORT}#{path}"), data) - end -end - class ServerTest < Test::Unit::TestCase - def get(path) - response = Net::HTTP.get_response(URI.parse("http://0.0.0.0:#{TEST_PORT}#{path}")) + def get(path, headers=nil) + h = Net::HTTP.new('127.0.0.1', TEST_PORT) + response = h.get(path, headers) env = JSON.parse(response.body) end @@ -99,9 +90,11 @@ class ServerTestFD < ServerTest end class ServerTestSocket < ServerTest - def get(path) + def get(path, headers = {}) socket = UNIXSocket.open(@socketfile) - socket.write("GET #{path} HTTP/1.0\r\n\r\n") + socket.write("GET #{path} HTTP/1.0\r\n") + headers.each_pair { |field, value| socket.write("#{field}: #{value}\r\n") } + socket.write("\r\n") response = "" while chunk = socket.read(100) response << chunk test/helper.rb dae3f8388323cca28ec1b8df8c235e9c5b1282e1 Ryan ry@tinyclouds.org http://github.com/ry/ebb/commit/64ca0e0dbfaba60167b8ffa3c575fe112ef3aaf0 64ca0e0dbfaba60167b8ffa3c575fe112ef3aaf0 2008-10-04T09:42:03-07:00 2008-10-04T09:42:03-07:00 add an additional test to test last header inclusion 561582922fc44a699bbe8c92be42dc615dc828ea Ryan ry@tinyclouds.org