Adjusted some details, got rid of old files, added some new.

4 files changed, 45 insertions, 32 deletions

diff --git a/test/httptest.lua b/test/httptest.lua
index ddeea50..4ec0cc1 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -3,7 +3,7 @@
 -- needs ScriptAlias from /home/c/diego/tec/luasocket/test/cgi
 -- to "/luasocket-test-cgi" and "/luasocket-test-cgi/"
 -- needs "AllowOverride AuthConfig" on /home/c/diego/tec/luasocket/test/auth
-dofile("noglobals.lua")
+dofile("testsupport.lua")
 
 local host, proxy, request, response, index_file
 local ignore, expect, index, prefix, cgiprefix, index_crlf
@@ -18,33 +18,9 @@ prefix = prefix or "/luasocket-test"
 cgiprefix = cgiprefix or "/luasocket-test-cgi"
 index_file = "test/index.html"
 
-local readfile = function(name)
-        local f = io.open(name, "r")
-        if not f then return nil end
-        local s = f:read("*a")
-        f:close()
-        return s
-end
-
 -- read index with CRLF convention
 index = readfile(index_file)
 
-local similar = function(s1, s2)
-        return string.lower(string.gsub(s1 or "", "%s", "")) == 
-        string.lower(string.gsub(s2 or "", "%s", ""))
-end
-
-local fail = function(s)
-        s = s or "failed!"
-        print(s)
-        os.exit()
-end
-
-local check = function (v, e)
-        if v then print("ok")
-        else fail(e) end
-end
-
 local check_result = function(response, expect, ignore)
         for i,v in response do
                 if not ignore[i] then
@@ -171,7 +147,7 @@ check_request(request, expect, ignore)
 ------------------------------------------------------------------------
 io.write("testing simple post function: ")
 back = socket.http.post("http://" .. host .. cgiprefix .. "/cat", index)
-check(back == index)
+assert(back == index)
 
 ------------------------------------------------------------------------
 io.write("testing ltn12.(sink|source).file: ")
@@ -191,7 +167,7 @@ ignore = {
 }
 check_request(request, expect, ignore)
 back = readfile(index_file .. "-back")
-check(back == index)
+assert(back == index)
 os.remove(index_file .. "-back")
 
 ------------------------------------------------------------------------
@@ -233,7 +209,7 @@ ignore = {
 }
 check_request(request, expect, ignore)
 back = readfile(index_file .. "-back")
-check(back == index)
+assert(back == index)
 os.remove(index_file .. "-back")
 
 ------------------------------------------------------------------------
@@ -434,7 +410,7 @@ check_request(request, expect, ignore)
 local body
 io.write("testing simple get function: ")
 body = socket.http.get("http://" .. host .. prefix .. "/index.html")
-check(body == index)
+assert(body == index)
 
 ------------------------------------------------------------------------
 io.write("testing HEAD method: ")
@@ -443,7 +419,7 @@ response = socket.http.request {
   method = "HEAD",
   url = "http://www.cs.princeton.edu/~diego/"
 }
-check(response and response.headers)
+assert(response and response.headers)
 
 ------------------------------------------------------------------------
 print("passed all tests")
diff --git a/test/smtptest.lua b/test/smtptest.lua
index 8468408..e812737 100644
--- a/test/smtptest.lua
+++ b/test/smtptest.lua
@@ -16,7 +16,7 @@ local err
 
 dofile("mbox.lua")
 local parse = mbox.parse
-dofile("noglobals.lua")
+dofile("testsupport.lua")
 
 local total = function()
         local t = 0
diff --git a/test/testsupport.lua b/test/testsupport.lua
new file mode 100644
index 0000000..ca3cd95
--- /dev/null
+++ b/test/testsupport.lua
@@ -0,0 +1,37 @@
+function readfile(name)
+        local f = io.open(name, "r")
+        if not f then return nil end
+        local s = f:read("*a")
+        f:close()
+        return s
+end
+
+function similar(s1, s2)
+        return string.lower(string.gsub(s1 or "", "%s", "")) == 
+        string.lower(string.gsub(s2 or "", "%s", ""))
+end
+
+function fail(msg)
+    msg = msg or "failed"
+    error(msg, 2)
+end
+
+function compare(input, output)
+    local original = readfile(input)
+    local recovered = readfile(output)
+    if original ~= recovered then fail("comparison failed")
+    else print("ok") end
+end
+
+local G = _G
+local set = rawset
+local warn = print
+
+local setglobal = function(table, key, value)
+        warn("changed " .. key)
+    set(table, key, value)
+end
+
+setmetatable(G, {
+    __newindex = setglobal
+})
diff --git a/test/urltest.lua b/test/urltest.lua
index 990a3e5..7e0e73f 100644
--- a/test/urltest.lua
+++ b/test/urltest.lua
@@ -1,4 +1,4 @@
-dofile("noglobals.lua")
+dofile("testsupport.lua")
 
 local check_build_url = function(parsed)
         local built = socket.url.build(parsed)