From 2f24acbaf12ba9c4917a887ed7459da9b0e7bdd9 Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Sat, 16 Oct 2021 11:47:57 -0400
Subject: [PATCH] add missing GetUserInternal and GetUsers tests

---
 controllers/userHttpController_test.go | 43 ++++++++++++++++++++++++++
 test/testutilities_test.go             | 27 ----------------
 2 files changed, 43 insertions(+), 27 deletions(-)
 delete mode 100644 test/testutilities_test.go

diff --git a/controllers/userHttpController_test.go b/controllers/userHttpController_test.go
index 4cacdf1a..0933b1fc 100644
--- a/controllers/userHttpController_test.go
+++ b/controllers/userHttpController_test.go
@@ -153,6 +153,49 @@ func TestGetUser(t *testing.T) {
 	})
 }
 
+func TestGetUserInternal(t *testing.T) {
+	database.InitializeDatabase()
+	deleteAllUsers()
+	t.Run("NonExistantUser", func(t *testing.T) {
+		admin, err := GetUserInternal("admin")
+		assert.EqualError(t, err, "could not find any records")
+		assert.Equal(t, "", admin.UserName)
+	})
+	t.Run("UserExisits", func(t *testing.T) {
+		user := models.User{"admin", "password", nil, true}
+		CreateUser(user)
+		admin, err := GetUserInternal("admin")
+		assert.Nil(t, err)
+		assert.Equal(t, user.UserName, admin.UserName)
+	})
+}
+
+func TestGetUsers(t *testing.T) {
+	database.InitializeDatabase()
+	deleteAllUsers()
+	t.Run("NonExistantUser", func(t *testing.T) {
+		admin, err := GetUsers()
+		assert.EqualError(t, err, "could not find any records")
+		assert.Equal(t, []models.ReturnUser(nil), admin)
+	})
+	t.Run("UserExisits", func(t *testing.T) {
+		user := models.User{"admin", "password", nil, true}
+		CreateUser(user)
+		admins, err := GetUsers()
+		assert.Nil(t, err)
+		assert.Equal(t, user.UserName, admins[0].UserName)
+	})
+	t.Run("MulipleUsers", func(t *testing.T) {
+		user := models.User{"user", "password", nil, true}
+		CreateUser(user)
+		admins, err := GetUsers()
+		assert.Nil(t, err)
+		assert.Equal(t, "admin", admins[0].UserName)
+		assert.Equal(t, user.UserName, admins[1].UserName)
+	})
+
+}
+
 func TestUpdateUser(t *testing.T) {
 	database.InitializeDatabase()
 	deleteAllUsers()
diff --git a/test/testutilities_test.go b/test/testutilities_test.go
deleted file mode 100644
index ca37b86c..00000000
--- a/test/testutilities_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package tests
-
-import "github.com/gravitl/netmaker/models"
-
-func DeleteAllNetworks() {
-	deleteAllNodes()
-	nets, _ := models.GetNetworks()
-	for _, net := range nets {
-		DeleteNetwork(net.NetID)
-	}
-}
-
-func CreateNet() {
-	var network models.Network
-	network.NetID = "skynet"
-	network.AddressRange = "10.0.0.1/24"
-	network.DisplayName = "mynetwork"
-	_, err := GetNetwork("skynet")
-	if err != nil {
-		CreateNetwork(network)
-	}
-}
-
-func GetNet() models.Network {
-	network, _ := GetNetwork("skynet")
-	return network
-}