From 89f70440055b5ec659d2ff1a70755cfbaa212f6d Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Fri, 21 Jul 2023 10:04:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=9F=D0=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/setup/collection_test.go | 131 +++++++++--------------------------
 1 file changed, 34 insertions(+), 97 deletions(-)

diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index 5d9c3b01..0827c70e 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -203,100 +203,37 @@ func TestSetup_InstallCollections(t *testing.T) {
 	}
 }
 
-//todo после удаления флага alwaysSetSchema раскомментировать
-//func Test_isCollsSchemaMetadataEqual(t *testing.T) {
-//	type args struct {
-//	}
-//	tests := []struct {
-//		name       string
-//		collection *collections.Collection
-//		exist      *collections.Collection
-//		want       bool
-//	}{
-//		{
-//			"Not equal #1 (no metadata in exist coll)",
-//			&collections.Collection{
-//				ID:      "1",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll1",
-//				Schema:  schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test"),
-//			},
-//			&collections.Collection{
-//				ID:      "2",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll2",
-//				Schema:  schema.New("name", field.String()),
-//			},
-//			false,
-//		},
-//		{
-//			"Not equal #2 (different metadata)",
-//			&collections.Collection{
-//				ID:      "1",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll1",
-//				Schema:  schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test"),
-//			},
-//			&collections.Collection{
-//				ID:      "2",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll2",
-//				Schema:  schema.New("name", field.String()).WithMetadata("test", "test"),
-//			},
-//			false,
-//		},
-//		{
-//			"Equal #1 (no metadata)",
-//			&collections.Collection{
-//				ID:      "1",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll1",
-//				Schema:  schema.New("name", field.String()),
-//			},
-//			&collections.Collection{
-//				ID:      "2",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll2",
-//				Schema:  schema.New("name", field.String()),
-//			},
-//			true,
-//		},
-//		{
-//			"Equal #1 (both view colls)",
-//			&collections.Collection{
-//				ID:      "1",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll1",
-//				View: &collections.View{
-//					SpaceID:      "sp",
-//					EnvID:        "env",
-//					CollectionID: "3",
-//				},
-//			},
-//			&collections.Collection{
-//				ID:      "2",
-//				SpaceID: "sp",
-//				EnvID:   "env",
-//				Name:    "coll2",
-//				View: &collections.View{
-//					SpaceID:      "sp",
-//					EnvID:        "env",
-//					CollectionID: "4",
-//				},
-//			},
-//			true,
-//		},
-//	}
-//	for _, tt := range tests {
-//		t.Run(tt.name, func(t *testing.T) {
-//			assert.Equalf(t, tt.want, isCollsSchemaMetadataEqual(tt.collection, tt.exist), "isCollsSchemaMetadataEqual(%v, %v)", tt.collection, tt.exist)
-//		})
-//	}
-//}
+func Test_isCollsSchemaMetadataEqual(t *testing.T) {
+	type args struct {
+	}
+	tests := []struct {
+		name string
+		s1   *schema.Schema
+		s2   *schema.Schema
+		want bool
+	}{
+		{
+			"Not equal #1 (no metadata in exist coll)",
+			schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test"),
+			schema.New("name", field.String()),
+			false,
+		},
+		{
+			"Not equal #2 (different metadata)",
+			schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test"),
+			schema.New("name", field.String()).WithMetadata("test", "test"),
+			false,
+		},
+		{
+			"Equal #1 (no metadata)",
+			schema.New("name", field.String()),
+			schema.New("name", field.String()),
+			true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, isCollsSchemaMetadataEqual(tt.s1, tt.s2), "isCollsSchemaMetadataEqual(%v, %v)", tt.s1, tt.s2)
+		})
+	}
+}
-- 
GitLab