Skip to content
Snippets Groups Projects
Commit fbccd268 authored by Fabian Seidl's avatar Fabian Seidl
Browse files

changed tests to deal with changed verification due to protovalidate package deprecated changes

parent 17b52956
No related branches found
No related tags found
1 merge request!1131[renovate] Update module github.com/bufbuild/protovalidate-go to v0.8.2
Pipeline #246924 passed
Stage: build
Stage: build-testing
Stage: test
Stage: analyze
Stage: test-legacy
Hide whitespace changes
Inline Side-by-side
controller/northbound/server/auth_test.go
+ 14
− 2
View file @ fbccd268
...@@ -89,7 +89,13 @@ func TestAuth_Login(t *testing.T) { ...@@ -89,7 +89,13 @@ func TestAuth_Login(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("username"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("username"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}}, }},
...@@ -160,7 +166,13 @@ func TestAuth_Logout(t *testing.T) { ...@@ -160,7 +166,13 @@ func TestAuth_Logout(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("username"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("username"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}}, }},
......
controller/northbound/server/role_test.go
+ 64
− 10
View file @ fbccd268
...@@ -84,10 +84,20 @@ func TestRole_CreateRoles(t *testing.T) { ...@@ -84,10 +84,20 @@ func TestRole_CreateRoles(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("roles[0].name"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("roles"),
},
{
FieldName: stringToPointer("name"),
},
},
},
ConstraintId: stringToPointer("string.min_len"), ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 3 characters"), Message: stringToPointer("value length must be at least 3 characters"),
}}, },
},
}, },
{ {
name: "role with too short description should fail", name: "role with too short description should fail",
...@@ -105,7 +115,16 @@ func TestRole_CreateRoles(t *testing.T) { ...@@ -105,7 +115,16 @@ func TestRole_CreateRoles(t *testing.T) {
want: &apb.CreateRolesResponse{}, want: &apb.CreateRolesResponse{},
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{{ validationErrors: []*validate.Violation{{
FieldPath: stringToPointer("roles[0].description"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("roles"),
},
{
FieldName: stringToPointer("description"),
},
},
},
ConstraintId: stringToPointer("string.min_len"), ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 3 characters"), Message: stringToPointer("value length must be at least 3 characters"),
}}, }},
...@@ -181,9 +200,14 @@ func TestRole_GetRole(t *testing.T) { ...@@ -181,9 +200,14 @@ func TestRole_GetRole(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("role_name"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("required"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value is required"), {
FieldName: stringToPointer("role_name"),
},
},
}, ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}, },
}, },
}, },
...@@ -355,7 +379,16 @@ func TestRole_UpdateRoles(t *testing.T) { ...@@ -355,7 +379,16 @@ func TestRole_UpdateRoles(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("roles[0].name"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("roles"),
},
{
FieldName: stringToPointer("name"),
},
},
},
ConstraintId: stringToPointer("string.min_len"), ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 3 characters"), Message: stringToPointer("value length must be at least 3 characters"),
}, },
...@@ -379,7 +412,16 @@ func TestRole_UpdateRoles(t *testing.T) { ...@@ -379,7 +412,16 @@ func TestRole_UpdateRoles(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("roles[0].description"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("roles"),
},
{
FieldName: stringToPointer("description"),
},
},
},
ConstraintId: stringToPointer("string.min_len"), ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 3 characters"), Message: stringToPointer("value length must be at least 3 characters"),
}, },
...@@ -456,12 +498,24 @@ func TestRole_DeletePermissionsForRole(t *testing.T) { ...@@ -456,12 +498,24 @@ func TestRole_DeletePermissionsForRole(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("role_name"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("role_name"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}, },
{ {
FieldPath: stringToPointer("permissions_to_delete"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("permissions_to_delete"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}, },
......
controller/northbound/server/topology_test.go
+ 60
− 12
View file @ fbccd268
...@@ -285,27 +285,69 @@ func TestTopology_AddLink(t *testing.T) { ...@@ -285,27 +285,69 @@ func TestTopology_AddLink(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("link.name"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("link"),
},
{
FieldName: stringToPointer("name"),
},
},
},
ConstraintId: stringToPointer("string.min_len"), ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 1 characters"), Message: stringToPointer("value length must be at least 1 characters"),
}, },
{ {
FieldPath: stringToPointer("link.sourceNode"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("required"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value is required"), {
FieldName: stringToPointer("link"),
},
{
FieldName: stringToPointer("sourceNode"),
},
},
}, ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}, },
{ {
FieldPath: stringToPointer("link.targetNode"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("required"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value is required"), {
FieldName: stringToPointer("link"),
},
{
FieldName: stringToPointer("targetNode"),
},
},
}, ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}, },
{ {
FieldPath: stringToPointer("link.sourcePort"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("required"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value is required"), {
FieldName: stringToPointer("link"),
},
{
FieldName: stringToPointer("sourcePort"),
},
},
}, ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}, },
{ {
FieldPath: stringToPointer("link.targetPort"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("link"),
},
{
FieldName: stringToPointer("targetPort"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}, },
...@@ -461,7 +503,13 @@ func TestTopology_DeleteLink(t *testing.T) { ...@@ -461,7 +503,13 @@ func TestTopology_DeleteLink(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("id"), Field: &validate.FieldPath{
Elements: []*validate.FieldPathElement{
{
FieldName: stringToPointer("id"),
},
},
},
ConstraintId: stringToPointer("required"), ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"), Message: stringToPointer("value is required"),
}}, }},
......
controller/northbound/server/user_test.go
+ 30
− 9
View file @ fbccd268
...@@ -90,9 +90,17 @@ func TestUser_CreateUsers(t *testing.T) { ...@@ -90,9 +90,17 @@ func TestUser_CreateUsers(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("user[0].password"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("string.min_len"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value length must be at least 5 characters"), {
FieldName: stringToPointer("user"),
},
{
FieldName: stringToPointer("password"),
},
},
}, ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 5 characters"),
}}, }},
}, },
{ {
...@@ -116,9 +124,17 @@ func TestUser_CreateUsers(t *testing.T) { ...@@ -116,9 +124,17 @@ func TestUser_CreateUsers(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("user[0].name"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("string.min_len"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value length must be at least 3 characters"), {
FieldName: stringToPointer("user"),
},
{
FieldName: stringToPointer("name"),
},
},
}, ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 3 characters"),
}}, }},
}, },
} }
...@@ -190,9 +206,14 @@ func TestUser_GetUser(t *testing.T) { ...@@ -190,9 +206,14 @@ func TestUser_GetUser(t *testing.T) {
wantErr: true, wantErr: true,
validationErrors: []*validate.Violation{ validationErrors: []*validate.Violation{
{ {
FieldPath: stringToPointer("name"), Field: &validate.FieldPath{
ConstraintId: stringToPointer("required"), Elements: []*validate.FieldPathElement{
Message: stringToPointer("value is required"), {
FieldName: stringToPointer("name"),
},
},
}, ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}}, }},
}, },
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment