tests

4 files changed, 64 insertions, 2 deletions

diff --git a/tests/tests.lua b/tests/tests.lua
index b4110d4..6dae570 100644
--- a/tests/tests.lua
+++ b/tests/tests.lua
@@ -1,4 +1,5 @@
 llby = require("lullaby")
+PORT = 5552
 
 local failed = {}
 local total = 0
@@ -19,6 +20,7 @@ end
 local handle = assert(io.popen("find tests/units/".. search .." -type f"))
 
 for file in handle:lines() do
+  print(_G._locals)
   total = total + 1
   local f = loadfile(file)()
 
diff --git a/tests/units/net-nested.lua b/tests/units/net-nested.lua
new file mode 100644
index 0000000..abb1a42
--- /dev/null
+++ b/tests/units/net-nested.lua
@@ -0,0 +1,26 @@
+local bserver = llby.thread.buffer(nil)
+
+local net = llby.thread.async(function(tres)
+  llby.net.listen(function(server)
+    _G.server = server
+    bserver:set(server)
+
+    server:GET("/c", function(res, req)
+      _G.server:GET("/test", function(res, req)
+        res:send("555221")
+      end)
+    end)
+  end, PORT)
+end)
+
+--should wait for the server to start
+os.execute("sleep 0.1")
+
+llby.net.request(string.format("localhost:%i/c", PORT))
+local s = llby.net.request(string.format("localhost:%i/test", PORT))
+local num = 2--s.content:read()
+
+bserver:get():close()
+
+net:await()
+return tonumber(num) == 555221
diff --git a/tests/units/net-parameter.lua b/tests/units/net-parameter.lua
new file mode 100644
index 0000000..ce42759
--- /dev/null
+++ b/tests/units/net-parameter.lua
@@ -0,0 +1,29 @@
+local bserver = llby.thread.buffer(nil)
+
+local a = 255
+local b = 992
+
+local net = llby.thread.async(function(tres)
+  local c = 943
+  llby.net.listen(function(server)
+    bserver:set(server)
+    server:GET("/{a}/{b}/{c}", function(res, req)
+      res:send(tostring(tonumber(req.parameters.a) * a + tonumber(req.parameters.b) * b + tonumber(req.parameters.c) * c))
+    end)
+  end, PORT)
+end)
+
+local t1 = 293
+local t2 = 928
+local t3 = 777
+
+--should wait for the server to start
+os.execute("sleep 0.1")
+
+local s = llby.net.request(string.format("localhost:%i/%i/%i/%i", PORT, t1, t2, t3))
+local num = s.content:read()
+
+bserver:get():close()
+
+net:await()
+return tonumber(num) == (t1 * a + t2 * b + t3 * 943)
diff --git a/tests/units/net-query.lua b/tests/units/net-query.lua
index 4115172..2e07262 100644
--- a/tests/units/net-query.lua
+++ b/tests/units/net-query.lua
@@ -1,10 +1,13 @@
-PORT = 5552
+local bserver = llby.thread.buffer(nil)
+
 local a = 255
 local b = 992
 
 local net = llby.thread.async(function(tres)
   local c = 943
   llby.net.listen(function(server)
+    bserver:set(server)
+
     server:GET("/", function(res, req)
       res:send(tostring(tonumber(req.query.t1) * a + tonumber(req.query.t2) * b + tonumber(req.query.t3) * c))
     end)
@@ -21,5 +24,7 @@ os.execute("sleep 0.1")
 local s = llby.net.request(string.format("localhost:%i/?t1=%i&t2=%i&t3=%i", PORT, t1, t2, t3))
 local num = s.content:read()
 
-net:close()
+bserver:get():close()
+
+net:await()
 return tonumber(num) == (t1 * a + t2 * b + t3 * 943)