summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/webrick/test_filehandler.rb12
-rw-r--r--test/webrick/test_httpserver.rb40
-rw-r--r--test/webrick/test_server.rb14
4 files changed, 37 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index f82e40d4c57..0bb89b1fe25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 9 21:03:59 2014 Tanaka Akira <akr@fsij.org>
+
+ * test/webrick: Fix the argument order of assert_equal.
+
Sun Nov 9 20:29:01 2014 Tanaka Akira <akr@fsij.org>
* test/webrick: Store log in an array.
diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
index bdbd4e26fa8..9e50664233d 100644
--- a/test/webrick/test_filehandler.rb
+++ b/test/webrick/test_filehandler.rb
@@ -51,27 +51,27 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
res = make_range_response(filename, "bytes=#{filesize-100}-")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 100)
+ assert_equal(100, get_res_body(res).size)
res = make_range_response(filename, "bytes=-100")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 100)
+ assert_equal(100, get_res_body(res).size)
res = make_range_response(filename, "bytes=0-99")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 100)
+ assert_equal(100, get_res_body(res).size)
res = make_range_response(filename, "bytes=100-199")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 100)
+ assert_equal(100, get_res_body(res).size)
res = make_range_response(filename, "bytes=0-0")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 1)
+ assert_equal(1, get_res_body(res).size)
res = make_range_response(filename, "bytes=-1")
assert_match(%r{^text/plain}, res["content-type"])
- assert_equal(get_res_body(res).size, 1)
+ assert_equal(1, get_res_body(res).size)
res = make_range_response(filename, "bytes=0-0, -2")
assert_match(%r{^multipart/byteranges}, res["content-type"])
diff --git a/test/webrick/test_httpserver.rb b/test/webrick/test_httpserver.rb
index 70ad3025498..eae77ec9bab 100644
--- a/test/webrick/test_httpserver.rb
+++ b/test/webrick/test_httpserver.rb
@@ -24,50 +24,50 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase
serv, opts, script_name, path_info = httpd.search_servlet("/")
assert_equal(:Root, serv)
assert_equal([], opts)
- assert_equal(script_name, "")
- assert_equal(path_info, "/")
+ assert_equal("", script_name)
+ assert_equal("/", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/sub")
assert_equal(:Root, serv)
assert_equal([], opts)
- assert_equal(script_name, "")
- assert_equal(path_info, "/sub")
+ assert_equal("", script_name)
+ assert_equal("/sub", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/sub/")
assert_equal(:Root, serv)
assert_equal([], opts)
- assert_equal(script_name, "")
- assert_equal(path_info, "/sub/")
+ assert_equal("", script_name)
+ assert_equal("/sub/", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/foo")
assert_equal(:Foo, serv)
assert_equal([], opts)
- assert_equal(script_name, "/foo")
- assert_equal(path_info, "")
+ assert_equal("/foo", script_name)
+ assert_equal("", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/foo/")
assert_equal(:Foo, serv)
assert_equal([], opts)
- assert_equal(script_name, "/foo")
- assert_equal(path_info, "/")
+ assert_equal("/foo", script_name)
+ assert_equal("/", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/foo/sub")
assert_equal(:Foo, serv)
assert_equal([], opts)
- assert_equal(script_name, "/foo")
- assert_equal(path_info, "/sub")
+ assert_equal("/foo", script_name)
+ assert_equal("/sub", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar")
assert_equal(:Bar, serv)
assert_equal([:bar1], opts)
- assert_equal(script_name, "/foo/bar")
- assert_equal(path_info, "")
+ assert_equal("/foo/bar", script_name)
+ assert_equal("", path_info)
serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar/baz")
assert_equal(:Baz, serv)
assert_equal([:baz1, :baz2], opts)
- assert_equal(script_name, "/foo/bar/baz")
- assert_equal(path_info, "")
+ assert_equal("/foo/bar/baz", script_name)
+ assert_equal("", path_info)
end
class Req
@@ -243,9 +243,9 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase
server.virtual_host(WEBrick::HTTPServer.new(vhost_config))
Thread.pass while server.status != :Running
- assert_equal(started, 1, log.call)
- assert_equal(stopped, 0, log.call)
- assert_equal(accepted, 0, log.call)
+ assert_equal(1, started, log.call)
+ assert_equal(0, stopped, log.call)
+ assert_equal(0, accepted, log.call)
http = Net::HTTP.new(addr, port)
req = Net::HTTP::Get.new("/")
@@ -371,7 +371,7 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase
http.request(req){|res| assert_equal("404", res.code, log.call)}
assert_match(%r{:RequestHandler is deprecated, please use :RequestCallback$}, log.call, log.call)
}
- assert_equal(requested, 1)
+ assert_equal(1, requested)
end
def test_shutdown_with_busy_keepalive_connection
diff --git a/test/webrick/test_server.rb b/test/webrick/test_server.rb
index e46494a1325..fa7fc940ca7 100644
--- a/test/webrick/test_server.rb
+++ b/test/webrick/test_server.rb
@@ -46,7 +46,7 @@ class TestWEBrickServer < Test::Unit::TestCase
server.start
end
- assert_equal(stopped, 1)
+ assert_equal(1, stopped)
assert_equal(1, log.length)
assert_match(/FATAL SignalException: SIGTERM/, log[0])
end
@@ -60,16 +60,16 @@ class TestWEBrickServer < Test::Unit::TestCase
}
TestWEBrick.start_server(Echo, config){|server, addr, port, log|
true while server.status != :Running
- assert_equal(started, 1, log.call)
- assert_equal(stopped, 0, log.call)
- assert_equal(accepted, 0, log.call)
+ assert_equal(1, started, log.call)
+ assert_equal(0, stopped, log.call)
+ assert_equal(0, accepted, log.call)
TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
- assert_equal(accepted, 3, log.call)
+ assert_equal(3, accepted, log.call)
}
- assert_equal(started, 1)
- assert_equal(stopped, 1)
+ assert_equal(1, started)
+ assert_equal(1, stopped)
end
def test_daemon