Merge pull request #35 from scr-oath/make-api_tests-common

Author: scr-oath

aws/cloudwatch/api_test.go

@@ -1,18 +1,17 @@
 package cloudwatch
 
 import (
+	"github.com/stretchr/testify/assert"
+	"github.com/vadv/gopher-lua-libs/tests"
 	"testing"
 
 	"github.com/vadv/gopher-lua-libs/inspect"
-
-	lua "github.com/yuin/gopher-lua"
 )
 
 func TestApi(t *testing.T) {
-	state := lua.NewState()
-	Preload(state)
-	inspect.Preload(state)
-	if err := state.DoFile("./test/test_api.lua"); err != nil {
-		t.Fatalf("execute test: %s\n", err.Error())
-	}
+	preload := tests.SeveralPreloadFuncs(
+		inspect.Preload,
+		Preload,
+	)
+	assert.NotZero(t, tests.RunLuaTestFile(t, preload, "./test/test_api.lua"))
 }

aws/cloudwatch/test/test_api.lua

@@ -1,6 +1,9 @@
 if os.getenv("CI") then
-  -- travis
+    -- travis: Include a test function that just skips
+    function TestCI(t)
+        t:Skip("CI")
+    end
 else
-  --dofile("./test/test_cloudwatch_logs.lua")
-  dofile("./test/test_cloudwatch_get_metric_data.lua")
+    --dofile("./test/test_cloudwatch_logs.lua")
+    dofile("./test/test_cloudwatch_get_metric_data.lua")
 end

aws/cloudwatch/test/test_cloudwatch_get_metric_data.lua

@@ -1,25 +1,27 @@
-local cloudwatch = require("cloudwatch")
-local inspect = require("inspect")
+function Test_cloudwatch_get_metric_data(t)
+    local cloudwatch = require("cloudwatch")
+    local inspect = require("inspect")
 
-local clw_client, err = cloudwatch.new()
-if err then error(err) end
+    local clw_client, err = cloudwatch.new()
+    assert(not err, err)
 
-local query1 = {
-  namespace = "AWS/RDS",
-  metric = "CPUUtilization",
-  dimension_name = "DBInstanceIdentifier",
-  dimension_value = os.getenv("DBINSTANCE"),
-  stat = "Average",
-  period = 60,
-}
-local query2 = {
-    namespace = "AWS/RDS",
-    metric = "ReadIOPS",
-    dimension_name = "DBInstanceIdentifier",
-    dimension_value = os.getenv("DBINSTANCE"),
-    stat = "Average",
-    period = 60,
-}
-local result, err = clw_client:get_metric_data({queries={cpu=query1, iops=query2}})
-if err then error(err) end
-print(inspect(result))
+    local query1 = {
+        namespace = "AWS/RDS",
+        metric = "CPUUtilization",
+        dimension_name = "DBInstanceIdentifier",
+        dimension_value = os.getenv("DBINSTANCE"),
+        stat = "Average",
+        period = 60,
+    }
+    local query2 = {
+        namespace = "AWS/RDS",
+        metric = "ReadIOPS",
+        dimension_name = "DBInstanceIdentifier",
+        dimension_value = os.getenv("DBINSTANCE"),
+        stat = "Average",
+        period = 60,
+    }
+    local result, err = clw_client:get_metric_data({ queries = { cpu = query1, iops = query2 } })
+    assert(not err, err)
+    t:Log(inspect(result))
+end

aws/cloudwatch/test/test_cloudwatch_logs.lua

@@ -1,12 +1,14 @@
-local cloudwatch = require("cloudwatch")
+function Test_cloudwatch_logs(t)
+    local cloudwatch = require("cloudwatch")
 
-local clw_client, err = cloudwatch.new()
-if err then error(err) end
+    local clw_client, err = cloudwatch.new()
+    assert(not err, err)
 
-local filter = {
-    log_group_name = os.getenv("LOG_GROUP_NAME"),
-    start_time = 1557948000,
-    end_time = 1557948200,
-}
-local err = clw_client:download("./test/test.log", filter, 100)
-if err then error(err) end
+    local filter = {
+        log_group_name = os.getenv("LOG_GROUP_NAME"),
+        start_time = 1557948000,
+        end_time = 1557948200,
+    }
+    local err = clw_client:download("./test/test.log", filter, 100)
+    assert(not err, err)
+end

cert_util/api_test.go

@@ -1,34 +1,35 @@
 package cert_util
 
 import (
-	"log"
+	"context"
+	"github.com/stretchr/testify/assert"
+	"github.com/vadv/gopher-lua-libs/tests"
+	"io"
 	"net/http"
 	"testing"
 	"time"
-
-	lua "github.com/yuin/gopher-lua"
 )
 
-func runHttps(addr string) {
-	err := http.ListenAndServeTLS(addr, "./test/cert.pem", "./test/key.pem", nil)
-	if err != nil {
-		log.Fatal("ListenAndServeTLS: ", err)
-	}
+func runHttps(addr string, handler http.Handler) *http.Server {
+	server := &http.Server{Addr: addr, Handler: handler}
+	go func() {
+		_ = server.ListenAndServeTLS("./test/cert.pem", "./test/key.pem")
+	}()
+	return server
 }
 
 func httpRouterGet(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte(`OK`))
+	_, _ = io.WriteString(w, "OK")
 }
 
 func TestApi(t *testing.T) {
-
-	http.HandleFunc("/get", httpRouterGet)
-	go runHttps(":1443")
+	mux := http.NewServeMux()
+	mux.HandleFunc("/get", httpRouterGet)
+	server := runHttps(":1443", mux)
+	t.Cleanup(func() {
+		_ = server.Shutdown(context.Background())
+	})
 	time.Sleep(time.Second)
 
-	state := lua.NewState()
-	Preload(state)
-	if err := state.DoFile("./test/test_api.lua"); err != nil {
-		t.Fatalf("execute test: %s\n", err.Error())
-	}
+	assert.NotZero(t, tests.RunLuaTestFile(t, Preload, "./test/test_api.lua"))
 }

cert_util/test/test_api.lua

@@ -1,6 +1,7 @@
 local cert_util = require("cert_util")
 
-local tx, err = cert_util.not_after("127.0.0.1:1443", "127.0.0.1:1443")
-if err then error(err) end
-
-if not(tx == 1576161031) then error("cert") end
+function Test_cert_util(t)
+    local tx, err = cert_util.not_after("127.0.0.1:1443", "127.0.0.1:1443")
+    assert(not err, err)
+    assert(tx == 1576161031, "cert: " .. tx)
+end

chef/api_test.go

@@ -1,20 +1,20 @@
 package chef_test
 
 import (
+	"github.com/stretchr/testify/assert"
+	"github.com/vadv/gopher-lua-libs/tests"
 	"testing"
 
 	chef "github.com/vadv/gopher-lua-libs/chef"
 	http "github.com/vadv/gopher-lua-libs/http"
 	inspect "github.com/vadv/gopher-lua-libs/inspect"
-	lua "github.com/yuin/gopher-lua"
 )
 
 func TestApi(t *testing.T) {
-	state := lua.NewState()
-	chef.Preload(state)
-	http.Preload(state)
-	inspect.Preload(state)
-	if err := state.DoFile("./test/test_api.lua"); err != nil {
-		t.Fatalf("execute test: %s\n", err.Error())
-	}
+	preload := tests.SeveralPreloadFuncs(
+		chef.Preload,
+		http.Preload,
+		inspect.Preload,
+	)
+	assert.NotZero(t, tests.RunLuaTestFile(t, preload, "./test/test_api.lua"))
 }

chef/test/test_api.lua

@@ -1,5 +1,8 @@
 if os.getenv("CI") then
-  -- travis
+    -- travis
+    function TestCI(t)
+        t:Skip("CI")
+    end
 else
-  dofile("./test/test_api_restream.lua")
+    dofile("./test/test_api_restream.lua")
 end

chef/test/test_api_restream.lua

@@ -4,42 +4,50 @@ local inspect = require("inspect")
 
 local node = "chef.itv.restr.im"
 
-local http_client = http.client({insecure_ssl=true, timeout=20})
+local http_client = http.client({ insecure_ssl = true, timeout = 20 })
 local client = chef.client(
-    "lualibs",
-    "./test/client.pem",
-    "https://chef.itv.restr.im/organizations/restream/",
-    http_client
+        "lualibs",
+        "./test/client.pem",
+        "https://chef.itv.restr.im/organizations/restream/",
+        http_client
 )
 
--- nodes
-local result, err = client:request("GET", "nodes")
-if err then error(err) end
-local found = false
-for k,v in pairs(result) do if k == node then found = true end end
-if not found then error("nodes") end
-print("done: nodes")
+function TestNodes(t)
+    -- nodes
+    local result, err = client:request("GET", "nodes")
+    assert(not err, err)
+    local found = false
+    for k, v in pairs(result) do
+        if k == node then
+            found = true
+        end
+    end
+    assert(found, "nodes don't contain " .. node)
+end
 
--- node
-local result, err = client:request("GET", "nodes/"..node)
-if err then error(err) end
-if not (result.name == node) then error("get node") end
-print(result.default)
-print(result.automatic)
-print(result.normal)
-print(result.override)
-print("done: get node")
+function TestNodes(t)
+    -- node
+    local result, err = client:request("GET", "nodes/" .. node)
+    assert(not err, err)
+    t:Log(result.default)
+    t:Log(result.automatic)
+    t:Log(result.normal)
+    t:Log(result.override)
+    assert(result.name == node, "get node: " .. result.name)
+end
 
--- search 1
-local result, err = client:search("node", "fqdn:"..node)
-if err then error(err) end
-if not (result.rows[1].name == node) then error("search node 1") end
-print("done: search 1")
-
--- search 2
-local result, err = client:search("node", "fqdn:"..node, {fqdn_name={"name"}})
-if err then error(err) end
-print(inspect(result.rows[1].data))
-if not (result.rows[1].data.fqdn_name == node) then error("search node 2: "..tostring(result.rows[1].data.fqdn_name)) end
-print("done: search 2")
+function TestSearch(t)
+    t:Run("1", function(t)
+        local result, err = client:search("node", "fqdn:" .. node)
+        assert(not err, err)
+        assert(result.rows[1].name == node, "search node 1: " .. result.rows[1].name)
+    end)
 
+    t:Run("2", function(t)
+        -- search 2
+        local result, err = client:search("node", "fqdn:" .. node, { fqdn_name = { "name" } })
+        assert(not err, err)
+        t:Log(inspect(result.rows[1].data))
+        assert(result.rows[1].data.fqdn_name == node, "search node 2: " .. tostring(result.rows[1].data.fqdn_name))
+    end)
+end

cmd/api_test.go

@@ -1,17 +1,17 @@
 package cmd
 
 import (
+	"github.com/stretchr/testify/assert"
+	"github.com/vadv/gopher-lua-libs/tests"
 	"testing"
 
 	runtime "github.com/vadv/gopher-lua-libs/runtime"
-	lua "github.com/yuin/gopher-lua"
 )
 
 func TestApi(t *testing.T) {
-	state := lua.NewState()
-	Preload(state)
-	runtime.Preload(state)
-	if err := state.DoFile("./test/test_api.lua"); err != nil {
-		t.Fatalf("execute test: %s\n", err.Error())
-	}
+	preload := tests.SeveralPreloadFuncs(
+		runtime.Preload,
+		Preload,
+	)
+	assert.NotZero(t, tests.RunLuaTestFile(t, preload, "./test/test_api.lua"))
 }