refactor: all tests passing

kareemmahlees · Feb 4, 2024 · 79fb91e · 79fb91e
1 parent af53668
commit 79fb91e
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 236 deletions.
diff --git a/internal/rest/databaseRoutes_test.go b/internal/rest/databaseRoutes_test.go
@@ -83,32 +83,17 @@ func (suite *DatabaseRoutesTestSuite) TestRegisterDatabaseRoutes() {
 	app := fiber.New()
 	routes.RegisterDatabasesRoutes(app, nil)
 
-	var routes []struct {
-		method string
-		params []string
-		path   string
-	}
-
+	var routes []utils.FiberRoute
 	for _, route := range app.GetRoutes() {
-		routes = append(routes, struct {
-			method string
-			params []string
-			path   string
-		}{
-			method: route.Method,
-			params: route.Params,
-			path:   route.Path,
+		routes = append(routes, utils.FiberRoute{
+			Method: route.Method,
+			Path:   route.Path,
 		})
 	}
 
-	assert.Contains(t, routes, struct {
-		method string
-		params []string
-		path   string
-	}{
-		method: "GET",
-		params: []string(nil),
-		path:   "/database",
+	assert.Contains(t, routes, utils.FiberRoute{
+		Method: "GET",
+		Path:   "/database",
 	})
 
 }

diff --git a/internal/rest/defaultRoutes_test.go b/internal/rest/defaultRoutes_test.go
@@ -16,32 +16,17 @@ func TestRegisterDefaultRoutes(t *testing.T) {
 
 	RegisterDefaultRoutes(app)
 
-	var routes []struct {
-		method string
-		params []string
-		path   string
-	}
-
+	var routes []utils.FiberRoute
 	for _, route := range app.GetRoutes() {
-		routes = append(routes, struct {
-			method string
-			params []string
-			path   string
-		}{
-			method: route.Method,
-			params: route.Params,
-			path:   route.Path,
+		routes = append(routes, utils.FiberRoute{
+			Method: route.Method,
+			Path:   route.Path,
 		})
 	}
 
-	assert.Contains(t, routes, struct {
-		method string
-		params []string
-		path   string
-	}{
-		method: "GET",
-		params: []string(nil),
-		path:   "/health",
+	assert.Contains(t, routes, utils.FiberRoute{
+		Method: "GET",
+		Path:   "/health",
 	})
 
 }

diff --git a/internal/rest/setupRoutes_test.go b/internal/rest/setupRoutes_test.go
@@ -1,6 +1,8 @@
-package routes
+package routes_test
 
 import (
+	routes "meta-x/internal/rest"
+	"meta-x/utils"
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
@@ -9,34 +11,21 @@ import (
 
 func TestSetup(t *testing.T) {
 	app := fiber.New()
-	Setup(app, nil)
+	routes.Setup(app, nil)
 
-	var routes []struct {
-		method string
-		params []string
-		path   string
-	}
+	var routes []utils.FiberRoute
 
 	for _, route := range app.GetRoutes() {
-		routes = append(routes, struct {
-			method string
-			params []string
-			path   string
-		}{
-			method: route.Method,
-			params: route.Params,
-			path:   route.Path,
+		routes = append(routes, utils.FiberRoute{
+			Method: route.Method,
+			Path:   route.Path,
 		})
 	}
 
-	testData := []struct {
-		method string
-		params []string
-		path   string
-	}{
-		{method: "GET", params: []string(nil), path: "/health"},
-		{method: "GET", params: []string(nil), path: "/databases"},
-		{method: "GET", params: []string(nil), path: "/tables"},
+	testData := []utils.FiberRoute{
+		{Method: "GET", Path: "/health"},
+		{Method: "GET", Path: "/database"},
+		{Method: "GET", Path: "/table"},
 	}
 	for _, test := range testData {
 		assert.Contains(t, routes, test)

diff --git a/internal/rest/tableRoutes_test.go b/internal/rest/tableRoutes_test.go
@@ -101,32 +101,17 @@ func (suite *TableRoutesTestSuite) TestRegisterTablesRoutes() {
 
 	routes.RegisterTablesRoutes(app, nil)
 
-	var routes []struct {
-		method string
-		params []string
-		path   string
-	}
-
+	var routes []utils.FiberRoute
 	for _, route := range app.GetRoutes() {
-		routes = append(routes, struct {
-			method string
-			params []string
-			path   string
-		}{
-			method: route.Method,
-			params: route.Params,
-			path:   route.Path,
+		routes = append(routes, utils.FiberRoute{
+			Method: route.Method,
+			Path:   route.Path,
 		})
 	}
 
-	assert.Contains(t, routes, struct {
-		method string
-		params []string
-		path   string
-	}{
-		method: "GET",
-		params: []string(nil),
-		path:   "/table",
+	assert.Contains(t, routes, utils.FiberRoute{
+		Method: "GET",
+		Path:   "/table",
 	})
 
 }

diff --git a/internal/server.go b/internal/server.go
@@ -57,7 +57,6 @@ func InitDBAndServer(provider, cfg string, port int) error {
 	fmt.Println(utils.NewStyle("Playground", "#B6B5B5"), fmt.Sprintf("http://localhost:%d/playground\n", port))
 
 	if err := app.Listen(fmt.Sprintf(":%d", port)); err != nil {
-		// log.Error(err)
 		return err
 	}
 	return nil

diff --git a/lib/errors_test.go b/lib/errors_test.go
diff --git a/lib/validator_test.go b/lib/validator_test.go
@@ -60,32 +60,3 @@ func TestNotEmpty(t *testing.T) {
 		}
 	}
 }
-
-func TestUpdateTableDataValidator(t *testing.T) {
-	baseStruct := UpdateTableProps{}
-	testData := []struct {
-		Type     string
-		Data     any
-		willFail bool
-	}{
-		{Type: "add", Data: map[string]string{"foo": "bar"}, willFail: false},
-		{Type: "add", Data: []string{"foo", "bar"}, willFail: true},
-		{Type: "modify", Data: map[string]string{"foo": "bar"}, willFail: false},
-		{Type: "modify", Data: []string{"foo", "bar"}, willFail: true},
-		{Type: "delete", Data: []string{"foo", "bar"}, willFail: false},
-		{Type: "delete", Data: map[string]string{"foo": "bar"}, willFail: true},
-	}
-
-	for _, test := range testData {
-		baseStruct.Operation.Type = test.Type
-		baseStruct.Operation.Data = test.Data
-
-		errs := ValidateStruct(baseStruct)
-
-		if test.willFail {
-			assert.Greater(t, len(errs), 0)
-		} else {
-			assert.Zero(t, len(errs))
-		}
-	}
-}
diff --git a/utils/envVars.go b/utils/envVars.go
diff --git a/utils/envVars_test.go b/utils/envVars_test.go
diff --git a/utils/handlers.go b/utils/handlers.go
@@ -8,7 +8,9 @@ import (
 	"github.com/valyala/fasthttp/fasthttpadaptor"
 )
 
-func RouteHandler(db *sqlx.DB, routeHandlerFunc func(*fiber.Ctx, *sqlx.DB) error) fiber.Handler {
+type RouteHandlerFunc func(*fiber.Ctx, *sqlx.DB) error
+
+func RouteHandler(db *sqlx.DB, routeHandlerFunc RouteHandlerFunc) fiber.Handler {
 	fn := func(c *fiber.Ctx) error {
 		return routeHandlerFunc(c, db)
 	}

diff --git a/utils/payloadReader_test.go b/utils/payloadReader_test.go
diff --git a/utils/testHelpers.go b/utils/testHelpers.go
@@ -106,3 +106,8 @@ func SliceOfPointersToSliceOfValues[T any](s []*T) []T {
 	}
 	return v
 }
+
+type FiberRoute struct {
+	Method string
+	Path   string
+}