updated for luasocket 1.4

1 files changed, 296 insertions, 72 deletions

diff --git a/test/httptest.lua b/test/httptest.lua
index 8c78192..0b61729 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -1,89 +1,313 @@
--- load http
-assert(dofile("../lua/http.lua"))
-assert(dofile("../lua/base64.lua"))
-assert(dofile("../lua/buffer.lua"))
-assert(dofile("auxiliar.lua"))
-
-t = _time()
-
 -- needs Alias from /home/i/diego/public/html/luasocket/test to 
 -- /luasocket-test
--- needs ScriptAlias from /home/i/diego/public/html/luasocket/test/cgi-bin
--- to /luasocket-cgi-bin/
+-- needs ScriptAlias from /home/i/diego/public/html/luasocket/test/cgi
+-- to /luasocket-test/cgi
+
+function mysetglobal (varname, oldvalue, newvalue)
+        print("changing " .. varname)
+     %rawset(%globals(), varname, newvalue)
+end
+function mygetglobal (varname, newvalue)
+        print("checking " .. varname)
+     return %rawget(%globals(), varname)
+end
+settagmethod(tag(nil), "setglobal", mysetglobal)
+settagmethod(tag(nil), "getglobal", mygetglobal)
+
+local similar = function(s1, s2)
+        return strlower(gsub(s1, "%s", "")) == strlower(gsub(s2, "%s", ""))
+end
 
-function join(s, e)
-  return tostring(s) .. ":" .. tostring(e)
+local fail = function(s)
+        s = s or "failed!"
+        print(s)
+        exit()
 end
 
-function status(s)
-        local code
-        _,_, code = strfind(s, "(%d%d%d)")
-        return tonumber(code)
+local readfile = function(name)
+        local f = readfrom(name)
+        if not f then return nil end
+        local s = read("*a")
+        readfrom()
+        return s
 end
 
-pdir = pdir or "/home/i/diego/public/html/luasocket/test/"
+local check = function (v, e)
+        if v then print("ok")
+        else %fail(e) end
+end
+        
+local check_request = function(request, expect, ignore)
+        local response = HTTP.request(request)
+        for i,v in response do
+                if not ignore[i] then
+                        if v ~= expect[i] then %fail(i .. " differs!") end
+                end
+        end
+        for i,v in expect do
+                if not ignore[i] then
+                        if v ~= response[i] then %fail(i .. " differs!") end
+                end
+        end
+        print("ok")
+end
+
+local host, request, response, ignore, expect, index, prefix, cgiprefix
+
+-- load http
+assert(dofile("../lua/http.lua"))
+assert(dofile("../lua/code.lua"))
+assert(dofile("../lua/concat.lua"))
+assert(dofile("../lua/url.lua"))
+
+local t = _time()
+
 host = host or "localhost"
+prefix = prefix or "/luasocket-test"
+cgiprefix = cgiprefix or "/luasocket-test-cgi"
+index = readfile("index.html")
+
+write("testing request uri correctness: ")
+local forth = cgiprefix .. "/request-uri?" .. "this+is+the+query+string"
+local back = HTTP.get("http://" .. host .. forth)
+if similar(back, forth) then print("ok")
+else fail("failed!") end
 
-print("testing document retrieval")
-url = "http://" .. host .. "/luasocket-test/index.html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e, join(s, e))
-assert(compare(pdir .. "index.html", f), "documents differ")
-
-print("testing HTTP redirection")
-url = "http://" .. host .. "/luasocket-test"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e, join(s, e))
-assert(compare(pdir .. "index.html", f), "documents differ")
-
-print("testing cgi output retrieval (probably chunked...)")
-url = "http://" .. host .. "/luasocket-cgi-bin/cat-index-html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e, join(s, e))
-assert(compare(pdir .. "index.html", f), "documents differ")
-
-print("testing post method")
-url = "http://" .. host .. "/luasocket-cgi-bin/cat"
-rf = strrep("!@#$!@#%", 80000)
-f, m, s, e = http_post(url, rf)
-assert(f and m and s and not e)
-assert(rf == f, "files differ")
-
-print("testing automatic auth failure")
-url = "http://really:wrong@" .. host .. "/luasocket-test/auth/index.html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e and status(s) == 401)
+write("testing query string correctness: ")
+forth = "this+is+the+query+string"
+back = HTTP.get("http://" .. host .. cgiprefix .. "/query-string?" .. forth)
+if similar(back, forth) then print("ok")
+else fail("failed!") end
 
+write("testing document retrieval: ")
+request = {
+        url = "http://" .. host .. prefix .. "/index.html"
+}
+expect = {
+        body = index,
+        code = 200
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing HTTP redirection: ")
+request = {
+        url = "http://" .. host .. prefix
+}
+expect = {
+        body = index,
+        code = 200
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+
+write("testing automatic auth failure: ")
+request = {
+    url = "http://really:wrong@" .. host .. prefix .. "/auth/index.html"
+}
+expect = {
+    code = 401
+}
+ignore = {
+    body = 1,
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing HTTP redirection failure: ")
+request = {
+        url = "http://" .. host .. prefix,
+        stay = 1
+}
+expect = {
+    code = 301
+}
+ignore = {
+    body = 1,
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+    
 write("testing host not found: ")
-url = "http://wronghost/luasocket-test/index.html"
-f, m, s, e = http_get(url)
-assert(not f and not m and not s and e)
-print(e)
+request = {
+        url = "http://wronghost/does/not/exist"
+}
+local c, e = connect("wronghost", 80)
+expect = {
+        error = e
+}
+ignore = {}
+check_request(request, expect, ignore)
 
-write("testing auth failure: ")
-url = "http://" .. host .. "/luasocket-test/auth/index.html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e and status(s) == 401)
-print(s)
+write("testing invalid url: ")
+request = {
+        url = host .. prefix
+}
+local c, e = connect("", 80)
+expect = {
+        error = e
+}
+ignore = {}
+check_request(request, expect, ignore)
 
 write("testing document not found: ")
-url = "http://" .. host .. "/luasocket-test/wrongdocument.html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e and status(s) == 404)
-print(s)
-
-print("testing manual auth")
-url = "http://" .. host .. "/luasocket-test/auth/index.html"
-h = {authorization = "Basic " .. base64("luasocket:password")}
-f, m, s, e = http_get(url, h)
-assert(f and m and s and not e, join(s, e))
-assert(compare(pdir .. "auth/index.html", f), "documents differ")
-
-print("testing automatic auth")
-url = "http://luasocket:password@" .. host .. "/luasocket-test/auth/index.html"
-f, m, s, e = http_get(url)
-assert(f and m and s and not e, join(s, e))
-assert(compare(pdir .. "auth/index.html", f), "documents differ")
+request = {
+        url = "http://" .. host .. "/wrongdocument.html"
+}
+expect = {
+        code = 404
+}
+ignore = {
+    body = 1,
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing auth failure: ")
+request = {
+        url = "http://" .. host .. prefix .. "/auth/index.html"
+}
+expect = {
+        code = 401
+}
+ignore = {
+    body = 1,
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing manual basic auth: ")
+request = {
+        url = "http://" .. host .. prefix .. "/auth/index.html",
+        headers = {
+                authorization = "Basic " .. Code.base64("luasocket:password")
+        }
+}
+expect = {
+        code = 200,
+        body = index
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing automatic basic auth: ")
+request = {
+        url = "http://luasocket:password@" .. host .. prefix .. "/auth/index.html"
+}
+expect = {
+        code = 200,
+        body = index
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing auth info overriding: ")
+request = {
+        url = "http://really:wrong@" .. host .. prefix .. "/auth/index.html",
+        user = "luasocket",
+        password = "password"
+}
+expect = {
+        code = 200,
+        body = index
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing cgi output retrieval (probably chunked...): ")
+request = {
+    url = "http://" .. host .. cgiprefix .. "/cat-index-html"
+}
+expect = {
+        body = index,
+        code = 200
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+write("testing redirect loop: ")
+request = {
+    url = "http://" .. host .. cgiprefix .. "/redirect-loop"
+}
+expect = {
+    code = 302
+}
+ignore = {
+        status = 1,
+        headers = 1,
+        body = 1
+}
+check_request(request, expect, ignore)
+
+write("testing post method: ")
+request = {
+        url = "http://" .. host .. cgiprefix .. "/cat",
+        method = "POST",
+        body = index
+}
+expect = {
+        body = index,
+        code = 200
+}
+ignore = {
+        status = 1,
+        headers = 1
+}
+check_request(request, expect, ignore)
+
+local body
+write("testing simple get function: ")
+body = HTTP.get("http://" .. host .. prefix .. "/index.html")
+check(body == index)
+
+write("testing simple get function with table args: ")
+body = HTTP.get {
+        url = "http://really:wrong@" .. host .. prefix .. "/auth/index.html",
+        user = "luasocket",
+        password = "password"
+}
+check(body == index)
+
+write("testing simple post function: ")
+body = HTTP.post("http://" .. host .. cgiprefix .. "/cat", index)
+check(body == index)
+
+write("testing simple post function with table args: ")
+body = HTTP.post {
+        url = "http://" .. host .. cgiprefix .. "/cat",
+        body = index
+}
+check(body == index)
+
+write("testing HEAD method: ")
+response = HTTP.request {
+  method = "HEAD",
+  url = "http://www.tecgraf.puc-rio.br/~diego/"
+}
+check(response and response.headers)
 
 print("passed all tests")