3pp-mirror/pushbits
1
0
Fork 0
mirror of https://github.com/pushbits/server.git synced 2025-05-11 07:56:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make test feedback a bit more consistent

Browse source
This commit is contained in:
eikendev 2021-09-15 20:24:18 +02:00
parent e597d4d8b6
commit 8b90541a8f
No known key found for this signature in database
GPG key ID: A1BDB1B28C8EF694
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/api/application_test.go
View file

@ -130,7 +130,7 @@ func TestApi_RegisterApplication(t *testing.T) {
SuccessAplications[user.ID] = append(SuccessAplications[user.ID], application)
}
assert.Equalf(w.Code, req.ShouldStatus, "CreateApplication (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "CreateApplication (Test case: \"%s\") Expected status code %v but received %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}
@ -169,7 +169,7 @@ func TestApi_GetApplications(t *testing.T) {
assert.Equalf(len(applications), len(SuccessAplications[user.ID]), "Created %d application(s) but got %d back", len(SuccessAplications[user.ID]), len(applications))
}
assert.Equalf(w.Code, req.ShouldStatus, "GetApplications (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "GetApplications (Test case: \"%s\") Expected status code %v but received %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}
@ -210,7 +210,7 @@ func TestApi_GetApplicationErrors(t *testing.T) {
c.Set("id", id)
TestApplicationHandler.GetApplication(c)
assert.Equalf(w.Code, req.ShouldStatus, "GetApplication (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "GetApplication (Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}
@ -249,7 +249,7 @@ func TestApi_GetApplication(t *testing.T) {
}
assert.Equalf(w.Code, req.ShouldStatus, "GetApplication (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "GetApplication (Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}
@ -289,7 +289,7 @@ func TestApi_UpdateApplication(t *testing.T) {
c.Set("id", id)
TestApplicationHandler.UpdateApplication(c)
assert.Equalf(w.Code, req.ShouldStatus, "UpdateApplication (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "UpdateApplication (Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}
@ -317,7 +317,7 @@ func TestApi_DeleteApplication(t *testing.T) {
c.Set("id", id)
TestApplicationHandler.DeleteApplication(c)
assert.Equalf(w.Code, req.ShouldStatus, "DeleteApplication (Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "DeleteApplication (Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
}

4
internal/api/notification_test.go
View file

@ -59,7 +59,7 @@ func TestApi_CreateNotification(t *testing.T) {
assert.Equalf(shouldNotification.Priority, notification.Priority, "(Test case %s) Notification priority should be %s but is %s", req.Name, shouldNotification.Priority, notification.Priority)
}
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
@ -91,7 +91,7 @@ func TestApi_DeleteNotification(t *testing.T) {
c.Set("messageid", id)
TestNotificationHandler.DeleteNotification(c)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}

22
internal/api/user_test.go
View file

@ -50,7 +50,7 @@ func TestApi_CreateUser(t *testing.T) {
TestUserHandler.CreateUser(c)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
}
@ -127,7 +127,7 @@ func TestApi_UpdateUser(t *testing.T) {
c.Set("user", admin)
TestUserHandler.UpdateUser(c)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") should return status code %v but is %v.", req.Name, req.ShouldStatus, w.Code)
assert.Equalf(w.Code, req.ShouldStatus, "(Test case: \"%s\") Expected status code %v but have %v.", req.Name, req.ShouldStatus, w.Code)
}
// Invalid without user set
@ -168,24 +168,24 @@ func TestApi_GetUser(t *testing.T) {
c.Set("id", id)
TestUserHandler.GetUser(c)
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) should return code %d but returned %d", testCase.Name, testCase.ShouldStatus, w.Code)
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) Expected status code %d but have %d", testCase.Name, testCase.ShouldStatus, w.Code)
// Check content for successful requests
if testCase.ShouldReturn == 200 {
user := &model.ExternalUser{}
userBytes, err := ioutil.ReadAll(w.Body)
require.NoErrorf(err, "(Test case %s) can not read body", testCase.Name)
require.NoErrorf(err, "(Test case %s) Can not read body", testCase.Name)
err = json.Unmarshal(userBytes, user)
require.NoErrorf(err, "(Test case %s) can not unmarshal body", testCase.Name)
require.NoErrorf(err, "(Test case %s) Can not unmarshal body", testCase.Name)
shouldUser, ok := testCase.ShouldReturn.(*model.User)
assert.Truef(ok, "(Test case %s) successful response but no should response", testCase.Name)
assert.Truef(ok, "(Test case %s) Successful response but no should response", testCase.Name)
// Check if the returned user match
assert.Equalf(user.ID, shouldUser.ID, "(Test case %s) user ID should be %d but is %d", testCase.Name, user.ID, shouldUser.ID)
assert.Equalf(user.Name, shouldUser.Name, "(Test case %s) user name should be %s but is %s", testCase.Name, user.Name, shouldUser.Name)
assert.Equalf(user.MatrixID, shouldUser.MatrixID, "(Test case %s) user matrix ID should be %s but is %s", testCase.Name, user.MatrixID, shouldUser.MatrixID)
assert.Equalf(user.IsAdmin, shouldUser.IsAdmin, "(Test case %s) user is admin should be %v but is %v", testCase.Name, user.IsAdmin, shouldUser.IsAdmin)
assert.Equalf(user.ID, shouldUser.ID, "(Test case %s) User ID should be %d but is %d", testCase.Name, user.ID, shouldUser.ID)
assert.Equalf(user.Name, shouldUser.Name, "(Test case %s) User name should be %s but is %s", testCase.Name, user.Name, shouldUser.Name)
assert.Equalf(user.MatrixID, shouldUser.MatrixID, "(Test case %s) User matrix ID should be %s but is %s", testCase.Name, user.MatrixID, shouldUser.MatrixID)
assert.Equalf(user.IsAdmin, shouldUser.IsAdmin, "(Test case %s) User is admin should be %v but is %v", testCase.Name, user.IsAdmin, shouldUser.IsAdmin)
}
}
}
@ -214,7 +214,7 @@ func TestApi_DeleteUser(t *testing.T) {
c.Set("id", id)
TestUserHandler.DeleteUser(c)
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) should return code %d but returned %d", testCase.Name, testCase.ShouldStatus, w.Code)
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) Expected status code %d but have %d", testCase.Name, testCase.ShouldStatus, w.Code)
}
}

10
internal/api/util_test.go
View file

@ -30,10 +30,10 @@ func TestApi_SuccessOrAbort(t *testing.T) {
aborted := successOrAbort(c, testCase.ShouldStatus, forcedErr)
if forcedErr != nil {
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) should return code %d but returned %d", testCase.Name, testCase.ShouldStatus, w.Code)
assert.Equalf(testCase.ShouldStatus, w.Code, "(Test case %s) Expected status code %d but have %d", testCase.Name, testCase.ShouldStatus, w.Code)
}
assert.Equalf(forcedErr == nil, aborted, "(Test case %s) should return %v but returned %v", testCase.Name, forcedErr == nil, aborted)
assert.Equalf(forcedErr == nil, aborted, "(Test case %s) Expected %v but have %v", testCase.Name, forcedErr == nil, aborted)
}
}
@ -55,10 +55,10 @@ func TestApi_IsCurrentUser(t *testing.T) {
isCurrentUser := isCurrentUser(c, id)
if testCase.ShouldStatus == 200 {
assert.Truef(isCurrentUser, "(Test case %s) should be true but is false", testCase.Name)
assert.Truef(isCurrentUser, "(Test case %s) Should be true but is false", testCase.Name)
} else {
assert.Falsef(isCurrentUser, "(Test case %s) should be false but is true", testCase.Name)
assert.Equalf(w.Code, testCase.ShouldStatus, "(Test case %s) should return status %d but returned %d", testCase.Name, testCase.ShouldStatus, w.Code)
assert.Falsef(isCurrentUser, "(Test case %s) Should be false but is true", testCase.Name)
assert.Equalf(w.Code, testCase.ShouldStatus, "(Test case %s) Expected status code %d but have %d", testCase.Name, testCase.ShouldStatus, w.Code)
}
}
}