diff --git a/modules/validation/validatable.go b/modules/validation/validatable.go index ec69da14f9..8ff282b50d 100644 --- a/modules/validation/validatable.go +++ b/modules/validation/validatable.go @@ -25,7 +25,7 @@ func IsValid(v Validateable) (bool, error) { return true, nil } -func ValidateNotEmpty(value any, fieldName string) []string { +func ValidateNotEmpty(value any, name string) []string { isValid := true switch v := value.(type) { case string: @@ -47,12 +47,12 @@ func ValidateNotEmpty(value any, fieldName string) []string { if isValid { return []string{} } - return []string{fmt.Sprintf("Field %v should not be empty", fieldName)} + return []string{fmt.Sprintf("%v should not be empty", name)} } -func ValidateMaxLen(value string, maxLen int, fieldName string) []string { +func ValidateMaxLen(value string, maxLen int, name string) []string { if utf8.RuneCountInString(value) > maxLen { - return []string{fmt.Sprintf("Value in field %v was longer than %v", fieldName, maxLen)} + return []string{fmt.Sprintf("Value %v was longer than %v", name, maxLen)} } return []string{} } diff --git a/modules/validation/validatable_test.go b/modules/validation/validatable_test.go index daa3678683..19bda27173 100644 --- a/modules/validation/validatable_test.go +++ b/modules/validation/validatable_test.go @@ -9,6 +9,29 @@ import ( "code.gitea.io/gitea/modules/timeutil" ) +type Sut struct { + valid bool +} + +func (sut Sut) Validate() []string { + if sut.valid { + return []string{} + } else { + return []string{"invalid"} + } +} + +func Test_IsValid(t *testing.T) { + sut := Sut{valid: true} + if res, _ := IsValid(sut); !res { + t.Errorf("sut expected to be valid: %v\n", sut.Validate()) + } + sut = Sut{valid: false} + if res, _ := IsValid(sut); res { + t.Errorf("sut expected to be invalid: %v\n", sut.Validate()) + } +} + func Test_ValidateNotEmpty_ForString(t *testing.T) { sut := "" if len(ValidateNotEmpty(sut, "dummyField")) == 0 {