refactor

GenerateNU · Jan 21, 2024 · 0fb99d0 · 0fb99d0
1 parent 326338a
commit 0fb99d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/backend/tests/api/category_test.go b/backend/tests/api/category_test.go
@@ -19,7 +19,7 @@ func CreateSampleCategory(t *testing.T, categoryName string) ExistingAppAssert {
 		Body: &map[string]interface{}{
 			"category_name": categoryName,
 		},
-	}.TestOnStatusAndDBKeepDB(t, nil,
+	}.TestOnStatusAndDB(t, nil,
 		DBTesterWithStatus{
 			Status: 201,
 			DBTester: func(app TestApp, assert *assert.A, resp *http.Response) {
@@ -137,7 +137,7 @@ func TestCreateCategoryFailsIfCategoryWithThatNameAlreadyExists(t *testing.T) {
 			Body: &map[string]interface{}{
 				"category_name": permutation,
 			},
-		}.TestOnStatusMessageAndDBKeepDB(t, &existingAppAssert,
+		}.TestOnStatusMessageAndDB(t, &existingAppAssert,
 			StatusMessageDBTester{
 				MessageWithStatus: MessageWithStatus{
 					Status:  400,

diff --git a/backend/tests/api/helpers.go b/backend/tests/api/helpers.go
@@ -192,11 +192,7 @@ type MessageWithStatus struct {
 	Message string
 }
 
-func (request TestRequest) TestOnStatusAndMessage(t *testing.T, existingAppAssert *ExistingAppAssert, messagedStatus MessageWithStatus) {
-	request.TestOnStatusAndMessageKeepDB(t, existingAppAssert, messagedStatus)
-}
-
-func (request TestRequest) TestOnStatusAndMessageKeepDB(t *testing.T, existingAppAssert *ExistingAppAssert, messagedStatus MessageWithStatus) ExistingAppAssert {
+func (request TestRequest) TestOnStatusAndMessage(t *testing.T, existingAppAssert *ExistingAppAssert, messagedStatus MessageWithStatus) ExistingAppAssert {
 	appAssert, resp := request.TestWithJSONBody(t, existingAppAssert)
 	assert := appAssert.Assert
 
@@ -220,12 +216,8 @@ type StatusMessageDBTester struct {
 	DBTester          DBTester
 }
 
-func (request TestRequest) TestOnStatusMessageAndDB(t *testing.T, existingAppAssert *ExistingAppAssert, statusMessageDBTester StatusMessageDBTester) {
-	request.TestOnStatusMessageAndDBKeepDB(t, existingAppAssert, statusMessageDBTester)
-}
-
-func (request TestRequest) TestOnStatusMessageAndDBKeepDB(t *testing.T, existingAppAssert *ExistingAppAssert, statusMessageDBTester StatusMessageDBTester) ExistingAppAssert {
-	appAssert := request.TestOnStatusAndMessageKeepDB(t, existingAppAssert, statusMessageDBTester.MessageWithStatus)
+func (request TestRequest) TestOnStatusMessageAndDB(t *testing.T, existingAppAssert *ExistingAppAssert, statusMessageDBTester StatusMessageDBTester) ExistingAppAssert {
+	appAssert := request.TestOnStatusAndMessage(t, existingAppAssert, statusMessageDBTester.MessageWithStatus)
 	statusMessageDBTester.DBTester(appAssert.App, appAssert.Assert, nil)
 	return appAssert
 }
@@ -237,11 +229,7 @@ type DBTesterWithStatus struct {
 	DBTester
 }
 
-func (request TestRequest) TestOnStatusAndDB(t *testing.T, existingAppAssert *ExistingAppAssert, dbTesterStatus DBTesterWithStatus) {
-	request.TestOnStatusAndDBKeepDB(t, existingAppAssert, dbTesterStatus)
-}
-
-func (request TestRequest) TestOnStatusAndDBKeepDB(t *testing.T, existingAppAssert *ExistingAppAssert, dbTesterStatus DBTesterWithStatus) ExistingAppAssert {
+func (request TestRequest) TestOnStatusAndDB(t *testing.T, existingAppAssert *ExistingAppAssert, dbTesterStatus DBTesterWithStatus) ExistingAppAssert {
 	appAssert, resp := request.TestWithJSONBody(t, existingAppAssert)
 	app, assert := appAssert.App, appAssert.Assert
 	defer resp.Body.Close()