change assert to require in admin_test

traPtitech · Dec 28, 2024 · 3a79c5d · 3a79c5d
1 parent c3dbb3b
commit 3a79c5d
Showing 1 changed file with 36 additions and 39 deletions.
diff --git a/router/admin_test.go b/router/admin_test.go
@@ -40,7 +40,7 @@ func TestHandler_GetAdmins(t *testing.T) {
 		c := e.NewContext(req, rec)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			GetAdmins(c.Request().Context()).
@@ -52,10 +52,9 @@ func TestHandler_GetAdmins(t *testing.T) {
 		resBody, err := json.Marshal(res)
 		require.NoError(t, err)
 
-		if assert.NoError(t, h.Handlers.GetAdmins(c)) {
-			assert.Equal(t, http.StatusOK, rec.Code)
-			assert.Equal(t, string(resBody), strings.TrimRight(rec.Body.String(), "\n"))
-		}
+		require.NoError(t, h.Handlers.GetAdmins(c))
+		assert.Equal(t, http.StatusOK, rec.Code)
+		assert.Equal(t, string(resBody), strings.TrimRight(rec.Body.String(), "\n"))
 	})
 
 	t.Run("Success2", func(t *testing.T) {
@@ -71,7 +70,7 @@ func TestHandler_GetAdmins(t *testing.T) {
 		c := e.NewContext(req, rec)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			GetAdmins(c.Request().Context()).
@@ -81,10 +80,9 @@ func TestHandler_GetAdmins(t *testing.T) {
 		resBody, err := json.Marshal(res)
 		require.NoError(t, err)
 
-		if assert.NoError(t, h.Handlers.GetAdmins(c)) {
-			assert.Equal(t, http.StatusOK, rec.Code)
-			assert.Equal(t, string(resBody), strings.TrimRight(rec.Body.String(), "\n"))
-		}
+		require.NoError(t, h.Handlers.GetAdmins(c))
+		assert.Equal(t, http.StatusOK, rec.Code)
+		assert.Equal(t, string(resBody), strings.TrimRight(rec.Body.String(), "\n"))
 	})
 
 	t.Run("FailedWithError", func(t *testing.T) {
@@ -101,16 +99,16 @@ func TestHandler_GetAdmins(t *testing.T) {
 		resErr := errors.New("failed to get admins")
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			GetAdmins(c.Request().Context()).
 			Return(nil, resErr)
 
 		err = h.Handlers.GetAdmins(c)
-		if assert.Error(t, err) {
-			assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
-		}
+
+		require.Error(t, err)
+		assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
 	})
 }
 
@@ -134,15 +132,14 @@ func TestHandler_PostAdmin(t *testing.T) {
 		c := e.NewContext(req, rec)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			AddAdmins(c.Request().Context(), admin).
 			Return(nil)
 
-		if assert.NoError(t, h.Handlers.PostAdmins(c)) {
-			assert.Equal(t, http.StatusOK, rec.Code)
-		}
+		require.NoError(t, h.Handlers.PostAdmins(c))
+		assert.Equal(t, http.StatusOK, rec.Code)
 	})
 
 	t.Run("FailedWithError", func(t *testing.T) {
@@ -164,16 +161,16 @@ func TestHandler_PostAdmin(t *testing.T) {
 		resErr := errors.New("failed to create admin")
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			AddAdmins(c.Request().Context(), []uuid.UUID{adminID}).
 			Return(resErr)
 
 		err = h.Handlers.PostAdmins(c)
-		if assert.Error(t, err) {
-			assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
-		}
+
+		require.Error(t, err)
+		assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
 	})
 
 	t.Run("FailedWithEntConstraintError", func(t *testing.T) {
@@ -196,16 +193,16 @@ func TestHandler_PostAdmin(t *testing.T) {
 		errors.As(errors.New("failed to create admin"), &resErr)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			AddAdmins(c.Request().Context(), []uuid.UUID{adminID}).
 			Return(resErr)
 
 		err = h.Handlers.PostAdmins(c)
-		if assert.Error(t, err) {
-			assert.Equal(t, echo.NewHTTPError(http.StatusBadRequest, resErr), err)
-		}
+
+		require.Error(t, err)
+		assert.Equal(t, echo.NewHTTPError(http.StatusBadRequest, resErr), err)
 	})
 }
 
@@ -229,15 +226,14 @@ func TestHandler_DeleteAdmin(t *testing.T) {
 		c := e.NewContext(req, rec)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			DeleteAdmins(c.Request().Context(), admin).
 			Return(nil)
 
-		if assert.NoError(t, h.Handlers.DeleteAdmins(c)) {
-			assert.Equal(t, http.StatusOK, rec.Code)
-		}
+		require.NoError(t, h.Handlers.DeleteAdmins(c))
+		assert.Equal(t, http.StatusOK, rec.Code)
 	})
 
 	t.Run("FailedWithError", func(t *testing.T) {
@@ -259,16 +255,16 @@ func TestHandler_DeleteAdmin(t *testing.T) {
 		resErr := errors.New("failed to delete admin")
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			DeleteAdmins(c.Request().Context(), []uuid.UUID{adminID}).
 			Return(resErr)
 
 		err = h.Handlers.DeleteAdmins(c)
-		if assert.Error(t, err) {
-			assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
-		}
+
+		require.Error(t, err)
+		assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
 	})
 
 	t.Run("InvalidAdminID", func(t *testing.T) {
@@ -286,9 +282,10 @@ func TestHandler_DeleteAdmin(t *testing.T) {
 		c := e.NewContext(req, rec)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		err = h.Handlers.DeleteAdmins(c)
+
 		assert.Error(t, err)
 	})
 
@@ -312,15 +309,15 @@ func TestHandler_DeleteAdmin(t *testing.T) {
 		errors.As(errors.New("failed to delete admin"), &resErr)
 
 		h, err := NewTestHandlers(t, ctrl)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		h.Repository.MockAdminRepository.
 			EXPECT().
 			DeleteAdmins(c.Request().Context(), []uuid.UUID{adminID}).
 			Return(resErr)
 
 		err = h.Handlers.DeleteAdmins(c)
-		if assert.Error(t, err) {
-			assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
-		}
+
+		require.Error(t, err)
+		assert.Equal(t, echo.NewHTTPError(http.StatusInternalServerError, resErr), err)
 	})
 }