From fbccd268db63dee3404f213456f0b6cd239ff269 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Mon, 6 Jan 2025 13:50:18 +0100
Subject: [PATCH] changed tests to deal with changed verification due to
protovalidate package deprecated changes
---
controller/northbound/server/auth_test.go | 16 +++-
controller/northbound/server/role_test.go | 74 ++++++++++++++++---
controller/northbound/server/topology_test.go | 72 +++++++++++++++---
controller/northbound/server/user_test.go | 39 +++++++---
4 files changed, 168 insertions(+), 33 deletions(-)
diff --git a/controller/northbound/server/auth_test.go b/controller/northbound/server/auth_test.go
index e5c9e7389..956ef2be1 100644
--- a/controller/northbound/server/auth_test.go
+++ b/controller/northbound/server/auth_test.go
@@ -89,7 +89,13 @@ func TestAuth_Login(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("username"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("username"),
+ },
+ },
+ },
ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}},
@@ -160,7 +166,13 @@ func TestAuth_Logout(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("username"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("username"),
+ },
+ },
+ },
ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}},
diff --git a/controller/northbound/server/role_test.go b/controller/northbound/server/role_test.go
index bb787a416..0b415d857 100644
--- a/controller/northbound/server/role_test.go
+++ b/controller/northbound/server/role_test.go
@@ -84,10 +84,20 @@ func TestRole_CreateRoles(t *testing.T) {
wantErr: true,
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"),
Message: stringToPointer("value length must be at least 3 characters"),
- }},
+ },
+ },
},
{
name: "role with too short description should fail",
@@ -105,7 +115,16 @@ func TestRole_CreateRoles(t *testing.T) {
want: &apb.CreateRolesResponse{},
wantErr: true,
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"),
Message: stringToPointer("value length must be at least 3 characters"),
}},
@@ -181,9 +200,14 @@ func TestRole_GetRole(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("role_name"),
- ConstraintId: stringToPointer("required"),
- Message: stringToPointer("value is required"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("role_name"),
+ },
+ },
+ }, ConstraintId: stringToPointer("required"),
+ Message: stringToPointer("value is required"),
},
},
},
@@ -355,7 +379,16 @@ func TestRole_UpdateRoles(t *testing.T) {
wantErr: true,
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"),
Message: stringToPointer("value length must be at least 3 characters"),
},
@@ -379,7 +412,16 @@ func TestRole_UpdateRoles(t *testing.T) {
wantErr: true,
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"),
Message: stringToPointer("value length must be at least 3 characters"),
},
@@ -456,12 +498,24 @@ func TestRole_DeletePermissionsForRole(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("role_name"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("role_name"),
+ },
+ },
+ },
ConstraintId: stringToPointer("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"),
Message: stringToPointer("value is required"),
},
diff --git a/controller/northbound/server/topology_test.go b/controller/northbound/server/topology_test.go
index 44ce77b57..aca431a95 100644
--- a/controller/northbound/server/topology_test.go
+++ b/controller/northbound/server/topology_test.go
@@ -285,27 +285,69 @@ func TestTopology_AddLink(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("link.name"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("link"),
+ },
+ {
+ FieldName: stringToPointer("name"),
+ },
+ },
+ },
ConstraintId: stringToPointer("string.min_len"),
Message: stringToPointer("value length must be at least 1 characters"),
},
{
- FieldPath: stringToPointer("link.sourceNode"),
- ConstraintId: stringToPointer("required"),
- Message: stringToPointer("value is required"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("link"),
+ },
+ {
+ FieldName: stringToPointer("sourceNode"),
+ },
+ },
+ }, ConstraintId: stringToPointer("required"),
+ Message: stringToPointer("value is required"),
},
{
- FieldPath: stringToPointer("link.targetNode"),
- ConstraintId: stringToPointer("required"),
- Message: stringToPointer("value is required"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("link"),
+ },
+ {
+ FieldName: stringToPointer("targetNode"),
+ },
+ },
+ }, ConstraintId: stringToPointer("required"),
+ Message: stringToPointer("value is required"),
},
{
- FieldPath: stringToPointer("link.sourcePort"),
- ConstraintId: stringToPointer("required"),
- Message: stringToPointer("value is required"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ 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"),
Message: stringToPointer("value is required"),
},
@@ -461,7 +503,13 @@ func TestTopology_DeleteLink(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("id"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("id"),
+ },
+ },
+ },
ConstraintId: stringToPointer("required"),
Message: stringToPointer("value is required"),
}},
diff --git a/controller/northbound/server/user_test.go b/controller/northbound/server/user_test.go
index 4a1c66327..201382709 100644
--- a/controller/northbound/server/user_test.go
+++ b/controller/northbound/server/user_test.go
@@ -90,9 +90,17 @@ func TestUser_CreateUsers(t *testing.T) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("user[0].password"),
- ConstraintId: stringToPointer("string.min_len"),
- Message: stringToPointer("value length must be at least 5 characters"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ 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) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("user[0].name"),
- ConstraintId: stringToPointer("string.min_len"),
- Message: stringToPointer("value length must be at least 3 characters"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ 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) {
wantErr: true,
validationErrors: []*validate.Violation{
{
- FieldPath: stringToPointer("name"),
- ConstraintId: stringToPointer("required"),
- Message: stringToPointer("value is required"),
+ Field: &validate.FieldPath{
+ Elements: []*validate.FieldPathElement{
+ {
+ FieldName: stringToPointer("name"),
+ },
+ },
+ }, ConstraintId: stringToPointer("required"),
+ Message: stringToPointer("value is required"),
}},
},
}
--
GitLab