Skip to content

Commit

Permalink
fix t.Errorf %w -> %v
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaitoyama
kaitoyama committed Aug 4, 2023
1 parent 6bd37c9 commit 6999548
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
16 changes: 8 additions & 8 deletions model/administrators_test.go
View file
Expand Up @@ -57,7 +57,7 @@ func setupAdministratorTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(&administratorTestQuestionnaireDatas[i].questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", questionnaireData, err)
t.Errorf("failed to create questionnaire(%+v): %v", questionnaireData, err)
}

for _, administrator := range questionnaireData.administrators {
Expand All @@ -68,7 +68,7 @@ func setupAdministratorTest(t *testing.T) {
UserTraqid: administrator,
}).Error
if err != nil {
t.Errorf("failed to create administrator(%s): %w", administrator, err)
t.Errorf("failed to create administrator(%s): %v", administrator, err)
}
}
}
Expand Down Expand Up @@ -105,7 +105,7 @@ func insertAdministratorsTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -176,7 +176,7 @@ func insertAdministratorsTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(&testCase.args.questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", testCase.args.questionnaire, err)
t.Errorf("failed to create questionnaire(%+v): %v", testCase.args.questionnaire, err)
}

err = administratorImpl.InsertAdministrators(ctx, testCase.args.questionnaire.ID, testCase.args.administrators)
Expand All @@ -198,7 +198,7 @@ func insertAdministratorsTest(t *testing.T) {
First(&actualAdministrators).Error

if errors.Is(err, gorm.ErrRecordNotFound) {
t.Errorf("no administrator(%s): %w", administrator, err)
t.Errorf("no administrator(%s): %v", administrator, err)
}
}
}
Expand Down Expand Up @@ -289,7 +289,7 @@ func deleteAdministratorsTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(&testCase.args.questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", testCase.args.questionnaire, err)
t.Errorf("failed to create questionnaire(%+v): %v", testCase.args.questionnaire, err)
}

err = administratorImpl.DeleteAdministrators(ctx, testCase.args.questionnaire.ID)
Expand All @@ -309,7 +309,7 @@ func deleteAdministratorsTest(t *testing.T) {
Where("questionnaire_id = ?", testCase.args.questionnaire.ID).
Find(&administrators).Error
if err != nil {
t.Errorf("failed to get administrators(%s): %w", testCase.description, err)
t.Errorf("failed to get administrators(%s): %v", testCase.description, err)
}

assertion.Len(administrators, 0, testCase.description, "administrator length")
Expand Down Expand Up @@ -434,7 +434,7 @@ func checkQuestionnaireAdminTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down
40 changes: 20 additions & 20 deletions model/questionnaires_test.go
View file
Expand Up @@ -282,7 +282,7 @@ func setupQuestionnairesTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(data.questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", data, err)
t.Errorf("failed to create questionnaire(%+v): %v", data, err)
}

for _, target := range data.targets {
Expand All @@ -299,7 +299,7 @@ func setupQuestionnairesTest(t *testing.T) {
UserTraqid: target,
}).Error
if err != nil {
t.Errorf("failed to create target: %w", err)
t.Errorf("failed to create target: %v", err)
}
}

Expand All @@ -317,7 +317,7 @@ func setupQuestionnairesTest(t *testing.T) {
UserTraqid: administrator,
}).Error
if err != nil {
t.Errorf("failed to create target: %w", err)
t.Errorf("failed to create target: %v", err)
}
}

Expand Down Expand Up @@ -468,7 +468,7 @@ func insertQuestionnaireTest(t *testing.T) {
Where("id = ?", questionnaireID).
First(&questionnaire).Error
if err != nil {
t.Errorf("failed to get questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to get questionnaire(%s): %v", testCase.description, err)
}

assertion.Equal(testCase.args.title, questionnaire.Title, testCase.description, "title")
Expand Down Expand Up @@ -657,7 +657,7 @@ func updateQuestionnaireTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(&questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to create questionnaire(%s): %v", testCase.description, err)
}

createdAt := questionnaire.CreatedAt
Expand All @@ -680,7 +680,7 @@ func updateQuestionnaireTest(t *testing.T) {
Where("id = ?", questionnaireID).
First(&questionnaire).Error
if err != nil {
t.Errorf("failed to get questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to get questionnaire(%s): %v", testCase.description, err)
}

assertion.Equal(after.title, questionnaire.Title, testCase.description, "title")
Expand All @@ -702,7 +702,7 @@ func updateQuestionnaireTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -732,7 +732,7 @@ func updateQuestionnaireTest(t *testing.T) {
if err == nil {
t.Errorf("Succeeded with invalid questionnaireID")
} else {
t.Errorf("failed to update questionnaire(invalid questionnireID): %w", err)
t.Errorf("failed to update questionnaire(invalid questionnireID): %v", err)
}
}
}
Expand Down Expand Up @@ -783,7 +783,7 @@ func deleteQuestionnaireTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(&questionnaire).Error
if err != nil {
t.Errorf("failed to create questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to create questionnaire(%s): %v", testCase.description, err)
}

questionnaireID := questionnaire.ID
Expand All @@ -805,7 +805,7 @@ func deleteQuestionnaireTest(t *testing.T) {
Where("id = ?", questionnaireID).
Find(&questionnaire).Error
if err != nil {
t.Errorf("failed to get questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to get questionnaire(%s): %v", testCase.description, err)
}

assertion.True(questionnaire.DeletedAt.Valid, testCase.description, "id")
Expand All @@ -822,7 +822,7 @@ func deleteQuestionnaireTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand All @@ -836,7 +836,7 @@ func deleteQuestionnaireTest(t *testing.T) {
if err == nil {
t.Errorf("Succeeded with invalid questionnaireID")
} else {
t.Errorf("failed to update questionnaire(invalid questionnireID): %w", err)
t.Errorf("failed to update questionnaire(invalid questionnireID): %v", err)
}
}
}
Expand Down Expand Up @@ -1075,7 +1075,7 @@ func getQuestionnairesTest(t *testing.T) {
Where("deleted_at IS NULL").
Count(&questionnaireNum).Error
if err != nil {
t.Errorf("failed to count questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to count questionnaire(%s): %v", testCase.description, err)
}

actualQuestionnaireIDs := []int{}
Expand Down Expand Up @@ -1190,7 +1190,7 @@ func getAdminQuestionnairesTest(t *testing.T) {
Where("id IN (?)", actualQuestionnaireIDs).
Find(&expectQuestionnaires).Error
if err != nil {
t.Errorf("failed to get questionnaires(%s): %w", testCase.description, err)
t.Errorf("failed to get questionnaires(%s): %v", testCase.description, err)
}

for _, expectQuestionnaire := range expectQuestionnaires {
Expand Down Expand Up @@ -1234,7 +1234,7 @@ func getQuestionnaireInfoTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -1568,7 +1568,7 @@ func getQuestionnaireLimitTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -1655,7 +1655,7 @@ func getQuestionnaireLimitByResponseIDTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get response(make invalid responseID): %w", err)
t.Errorf("failed to get response(make invalid responseID): %v", err)
break
}

Expand Down Expand Up @@ -1746,7 +1746,7 @@ func getResponseReadPrivilegeInfoByResponseIDTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand All @@ -1763,7 +1763,7 @@ func getResponseReadPrivilegeInfoByResponseIDTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get response(make invalid responseID): %w", err)
t.Errorf("failed to get response(make invalid responseID): %v", err)
break
}

Expand Down Expand Up @@ -1917,7 +1917,7 @@ func getResponseReadPrivilegeInfoByQuestionnaireIDTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down
24 changes: 12 additions & 12 deletions model/questions_test.go
View file
Expand Up @@ -65,7 +65,7 @@ func setupQuestionsTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(questionnaireData.Questionnaires).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", questionnaireData, err)
t.Errorf("failed to create questionnaire(%+v): %v", questionnaireData, err)
}

for _, administrator := range questionnaireData.administrators {
Expand All @@ -76,7 +76,7 @@ func setupQuestionsTest(t *testing.T) {
UserTraqid: administrator,
}).Error
if err != nil {
t.Errorf("failed to create administrator(%s): %w", administrator, err)
t.Errorf("failed to create administrator(%s): %v", administrator, err)
}
}
}
Expand Down Expand Up @@ -192,7 +192,7 @@ func setupQuestionsTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(questionData.Questions).Error
if err != nil {
t.Errorf("failed to create questionnaire(%+v): %w", questionData, err)
t.Errorf("failed to create questionnaire(%+v): %v", questionData, err)
}

if !questionData.Questions.DeletedAt.Valid {
Expand Down Expand Up @@ -235,7 +235,7 @@ func insertQuestionTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -423,7 +423,7 @@ func insertQuestionTest(t *testing.T) {
Where("id = ?", questionID).
First(&question).Error
if err != nil {
t.Errorf("failed to get question(%s): %w", testCase.description, err)
t.Errorf("failed to get question(%s): %v", testCase.description, err)
}

assertion.Equal(testCase.args.QuestionnaireID, question.QuestionnaireID, testCase.description, "questionnaire_id")
Expand Down Expand Up @@ -472,7 +472,7 @@ func updateQuestionTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down Expand Up @@ -675,7 +675,7 @@ func updateQuestionTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(question).Error
if err != nil {
t.Errorf("failed to insert question(%s): %w", testCase.description, err)
t.Errorf("failed to insert question(%s): %v", testCase.description, err)
}

err = questionImpl.UpdateQuestion(ctx, testCase.after.QuestionnaireID, testCase.after.PageNum, testCase.after.QuestionNum, testCase.after.Type, testCase.after.Body, testCase.after.IsRequired, question.ID)
Expand All @@ -695,7 +695,7 @@ func updateQuestionTest(t *testing.T) {
Where("id = ?", question.ID).
First(&actualQuestion).Error
if err != nil {
t.Errorf("failed to get question(%s): %w", testCase.description, err)
t.Errorf("failed to get question(%s): %v", testCase.description, err)
}

assertion.Equal(testCase.after.QuestionnaireID, actualQuestion.QuestionnaireID, testCase.description, "questionnaire_id")
Expand Down Expand Up @@ -740,7 +740,7 @@ func deleteQuestionTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand All @@ -763,7 +763,7 @@ func deleteQuestionTest(t *testing.T) {
Session(&gorm.Session{NewDB: true}).
Create(question).Error
if err != nil {
t.Errorf("failed to insert question: %w", err)
t.Errorf("failed to insert question: %v", err)
}
}

Expand Down Expand Up @@ -805,7 +805,7 @@ func deleteQuestionTest(t *testing.T) {
Where("id = ?", testCase.args.questionID).
First(&actualQuestion).Error
if err != nil {
t.Errorf("failed to get question(%s): %w", testCase.description, err)
t.Errorf("failed to get question(%s): %v", testCase.description, err)
}

assertion.True(actualQuestion.DeletedAt.Valid, testCase.description, "deleted_at")
Expand Down Expand Up @@ -842,7 +842,7 @@ func getQuestionsTest(t *testing.T) {
break
}
if err != nil {
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %w", err)
t.Errorf("failed to get questionnaire(make invalid questionnaireID): %v", err)
break
}

Expand Down
4 changes: 2 additions & 2 deletions model/responses_test.go
View file
Expand Up @@ -125,7 +125,7 @@ func TestInsertResponses(t *testing.T) {
Where("response_id = ?", responseID).
First(&response).Error
if err != nil {
t.Errorf("failed to get questionnaire(%s): %w", testCase.description, err)
t.Errorf("failed to get questionnaire(%s): %v", testCase.description, err)
}

assertion.Equal(responseID, response.ResponseID, testCase.description, "responseID")
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestDeleteResponse(t *testing.T) {
Where("response_id = ?", responseID).
First(&response).Error
if err != nil {
t.Errorf("failed to get responses(%s): %w", testCase.description, err)
t.Errorf("failed to get responses(%s): %v", testCase.description, err)
}

assertion.WithinDuration(time.Now(), response.DeletedAt.Time, 2*time.Second)
Expand Down

0 comments on commit 6999548

Please sign in to comment.