Skip to content
Snippets Groups Projects
Commit 5ee909c7 authored by ko_oler's avatar ko_oler
Browse files

правки по ПР

parent 7e3bfbb6
No related branches found
No related tags found
No related merge requests found
...@@ -11,73 +11,73 @@ import ( ...@@ -11,73 +11,73 @@ import (
func TestID_MarshalJSON(t *testing.T) { func TestID_MarshalJSON(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
Value ID ID ID
want string want string
}{ }{
{ {
name: Organization, name: Organization,
Value: ID{Descriptor: &OrganizationID{OrganizationID: "1"}}, ID: ID{Descriptor: &OrganizationID{OrganizationID: "1"}},
want: `"/orgs/1"`, want: `"/orgs/1"`,
}, },
{ {
name: User, name: User,
Value: ID{Descriptor: &UserID{UserID: "1"}}, ID: ID{Descriptor: &UserID{UserID: "1"}},
want: `"/users/1"`, want: `"/users/1"`,
}, },
{ {
name: Service, name: Service,
Value: ID{Descriptor: &ServiceID{ServiceID: "1"}}, ID: ID{Descriptor: &ServiceID{ServiceID: "1"}},
want: `"/services/1"`, want: `"/services/1"`,
}, },
{ {
name: Space, name: Space,
Value: ID{Descriptor: &SpaceID{SpaceID: "1"}}, ID: ID{Descriptor: &SpaceID{SpaceID: "1"}},
want: `"/spaces/1"`, want: `"/spaces/1"`,
}, },
{ {
name: Environment, name: Environment,
Value: ID{Descriptor: &EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, ID: ID{Descriptor: &EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
want: `"/spaces/1/envs/1"`, want: `"/spaces/1/envs/1"`,
}, },
{ {
name: Client, name: Client,
Value: ID{Descriptor: &ClientID{ClientID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, ID: ID{Descriptor: &ClientID{ClientID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
want: `"/spaces/1/clients/1"`, want: `"/spaces/1/clients/1"`,
}, },
{ {
name: Role, name: Role,
Value: ID{Descriptor: &RoleID{RoleID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, ID: ID{Descriptor: &RoleID{RoleID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
want: `"/spaces/1/roles/1"`, want: `"/spaces/1/roles/1"`,
}, },
{ {
name: Collection, name: Collection,
Value: ID{Descriptor: &CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}, ID: ID{Descriptor: &CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}},
want: `"/spaces/1/envs/1/cols/1"`, want: `"/spaces/1/envs/1/cols/1"`,
}, },
{ {
name: Schema, name: Schema,
Value: ID{Descriptor: &SchemaID{SchemaID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}, ID: ID{Descriptor: &SchemaID{SchemaID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}},
want: `"/spaces/1/envs/1/schema/1"`, want: `"/spaces/1/envs/1/schema/1"`,
}, },
{ {
name: Item, name: Item,
Value: ID{Descriptor: &ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}, ID: ID{Descriptor: &ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}},
want: `"/spaces/1/envs/1/cols/1/items/1"`, want: `"/spaces/1/envs/1/cols/1/items/1"`,
}, },
{ {
name: Revision, name: Revision,
Value: ID{Descriptor: &RevisionID{RevisionID: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}}, ID: ID{Descriptor: &RevisionID{RevisionID: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}},
want: `"/spaces/1/envs/1/cols/1/items/1/revs/1"`, want: `"/spaces/1/envs/1/cols/1/items/1/revs/1"`,
}, },
{ {
name: Field, name: Field,
Value: ID{Descriptor: &FieldID{FieldName: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}}, ID: ID{Descriptor: &FieldID{FieldName: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}},
want: `"/spaces/1/envs/1/cols/1/items/1/fields/1"`, want: `"/spaces/1/envs/1/cols/1/items/1/fields/1"`,
}, },
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
got, err := jsoniter.Marshal(&tt.Value) got, err := jsoniter.Marshal(&tt.ID)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, tt.want, string(got)) assert.Equal(t, tt.want, string(got))
}) })
...@@ -86,76 +86,76 @@ func TestID_MarshalJSON(t *testing.T) { ...@@ -86,76 +86,76 @@ func TestID_MarshalJSON(t *testing.T) {
func TestID_UnmarshalJSON(t *testing.T) { func TestID_UnmarshalJSON(t *testing.T) {
tests := []struct { tests := []struct {
name string id string
Value ID want ID
b []byte b []byte
}{ }{
{ {
name: Organization, id: Organization,
Value: ID{Descriptor: &OrganizationID{OrganizationID: "1"}}, want: ID{Descriptor: &OrganizationID{OrganizationID: "1"}},
b: []byte(`"/orgs/1"`), b: []byte(`"/orgs/1"`),
}, },
{ {
name: User, id: User,
Value: ID{Descriptor: &UserID{UserID: "1"}}, want: ID{Descriptor: &UserID{UserID: "1"}},
b: []byte(`"/users/1"`), b: []byte(`"/users/1"`),
}, },
{ {
name: Service, id: Service,
Value: ID{Descriptor: &ServiceID{ServiceID: "1"}}, want: ID{Descriptor: &ServiceID{ServiceID: "1"}},
b: []byte(`"/services/1"`), b: []byte(`"/services/1"`),
}, },
{ {
name: Space, id: Space,
Value: ID{Descriptor: &SpaceID{SpaceID: "1"}}, want: ID{Descriptor: &SpaceID{SpaceID: "1"}},
b: []byte(`"/spaces/1"`), b: []byte(`"/spaces/1"`),
}, },
{ {
name: Environment, id: Environment,
Value: ID{Descriptor: &EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, want: ID{Descriptor: &EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
b: []byte(`"/spaces/1/envs/1"`), b: []byte(`"/spaces/1/envs/1"`),
}, },
{ {
name: Client, id: Client,
Value: ID{Descriptor: &ClientID{ClientID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, want: ID{Descriptor: &ClientID{ClientID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
b: []byte(`"/spaces/1/clients/1"`), b: []byte(`"/spaces/1/clients/1"`),
}, },
{ {
name: Role, id: Role,
Value: ID{Descriptor: &RoleID{RoleID: "1", SpaceID: SpaceID{SpaceID: "1"}}}, want: ID{Descriptor: &RoleID{RoleID: "1", SpaceID: SpaceID{SpaceID: "1"}}},
b: []byte(`"/spaces/1/roles/1"`), b: []byte(`"/spaces/1/roles/1"`),
}, },
{ {
name: Collection, id: Collection,
Value: ID{Descriptor: &CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}, want: ID{Descriptor: &CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}},
b: []byte(`"/spaces/1/envs/1/cols/1"`), b: []byte(`"/spaces/1/envs/1/cols/1"`),
}, },
{ {
name: Schema, id: Schema,
Value: ID{Descriptor: &SchemaID{SchemaID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}, want: ID{Descriptor: &SchemaID{SchemaID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}},
b: []byte(`"/spaces/1/envs/1/schema/1"`), b: []byte(`"/spaces/1/envs/1/schema/1"`),
}, },
{ {
name: Item, id: Item,
Value: ID{Descriptor: &ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}, want: ID{Descriptor: &ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}},
b: []byte(`"/spaces/1/envs/1/cols/1/items/1"`), b: []byte(`"/spaces/1/envs/1/cols/1/items/1"`),
}, },
{ {
name: Revision, id: Revision,
Value: ID{Descriptor: &RevisionID{RevisionID: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}}, want: ID{Descriptor: &RevisionID{RevisionID: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}},
b: []byte(`"/spaces/1/envs/1/cols/1/items/1/revs/1"`), b: []byte(`"/spaces/1/envs/1/cols/1/items/1/revs/1"`),
}, },
{ {
name: Field, id: Field,
Value: ID{Descriptor: &FieldID{FieldName: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}}, want: ID{Descriptor: &FieldID{FieldName: "1", ItemID: ItemID{ItemID: "1", CollectionID: CollectionID{CollectionID: "1", EnvironmentID: EnvironmentID{EnvironmentID: "1", SpaceID: SpaceID{SpaceID: "1"}}}}}},
b: []byte(`"/spaces/1/envs/1/cols/1/items/1/fields/1"`), b: []byte(`"/spaces/1/envs/1/cols/1/items/1/fields/1"`),
}, },
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.id, func(t *testing.T) {
var i ID var i ID
require.NoError(t, i.UnmarshalJSON(tt.b)) require.NoError(t, i.UnmarshalJSON(tt.b))
assert.Equal(t, i, tt.Value) assert.Equal(t, i, tt.want)
}) })
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment