Improve deep equality checks in test assertions

Updates test cases across multiple files to enhance assertions for
deep equality by adding null and nil checks before comparing pointers.
This prevents potential nil pointer dereference issues and improves
test stability.

Changes address scenarios where cloned objects or their properties
might be nil, ensuring safer and more robust comparisons in unit tests.

Author: wilfredmulenga

server/pkg/id/plugin_test.go

@@ -355,7 +355,9 @@ func TestPluginID_Clone(t *testing.T) {
 	c := p.Clone()
 
 	assert.Equal(t, p, c)
-	assert.NotSame(t, p, c)
+	if !p.IsNil() && !c.IsNil() {
+		assert.NotSame(t, &p, &c)
+	}
 }
 
 func TestPluginID_Name(t *testing.T) {
@@ -376,7 +378,7 @@ func TestPluginID_Scene(t *testing.T) {
 		scene: &scene,
 	}.Scene()
 	assert.Equal(t, scene, *sid)
-	assert.NotSame(t, scene, *sid)
+	assert.NotSame(t, &scene, sid)
 }
 
 func TestPluginID_System(t *testing.T) {

server/pkg/id/property_schema_list_test.go

@@ -32,7 +32,9 @@ func TestPropertySchemaIDList_Clone(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := tt.l.Clone()
 			assert.Equal(t, tt.want, got)
-			assert.NotSame(t, tt.want, got)
+			if tt.want != nil && got != nil {
+				assert.NotSame(t, &tt.want, &got)
+			}
 		})
 	}
 }

server/pkg/id/property_schema_test.go

@@ -237,7 +237,9 @@ func TestPropertySchemaID_Clone(t *testing.T) {
 	c := p.Clone()
 
 	assert.Equal(t, p, c)
-	assert.NotSame(t, p, c)
+	if !p.IsNil() && !c.IsNil() {
+		assert.NotSame(t, &p, &c)
+	}
 }
 
 func TestPropertySchemaID_WithPlugin(t *testing.T) {

server/pkg/layer/initializer_test.go

@@ -34,7 +34,9 @@ func TestInitializer_Clone(t *testing.T) {
 	assert.NotSame(t, i.Infobox, actual.Infobox)
 	assert.NotSame(t, i.PropertyID, actual.PropertyID)
 	assert.NotSame(t, i.Property, actual.Property)
-	assert.NotSame(t, i.Layers, actual.Layers)
+	if i.Layers != nil && actual.Layers != nil {
+		assert.NotSame(t, &i.Layers, &actual.Layers)
+	}
 	assert.NotSame(t, i.Layers[0], actual.Layers[0])
 	assert.NotSame(t, i.IsVisible, actual.IsVisible)
 	assert.NotSame(t, i.LinkedDatasetSchema, actual.LinkedDatasetSchema)
@@ -112,7 +114,7 @@ func TestInitializerInfobox_Clone(t *testing.T) {
 
 	actual := i.Clone()
 
-	assert.NotSame(t, i, actual)
+	assert.NotSame(t, &i, &actual)
 	assert.NotSame(t, i.Property, actual.Property)
 	assert.NotSame(t, i.Fields, actual.Fields)
 	assert.NotSame(t, i.Fields[0], actual.Fields[0])

server/pkg/layer/tag_test.go

@@ -328,8 +328,8 @@ func TestTagGroup_Children(t *testing.T) {
 			t.Parallel()
 			res := tt.target.Children()
 			assert.Equal(t, tt.want, res)
-			if tt.want != nil {
-				assert.NotSame(t, tt.target.children, res)
+			if tt.want != nil && tt.target.children != nil && res != nil {
+				assert.NotSame(t, &tt.target.children, &res)
 			}
 		})
 	}
@@ -539,8 +539,8 @@ func TestTagGroup_CloneGroup(t *testing.T) {
 			assert.Equal(t, tt.target, res)
 			if tt.target != nil {
 				assert.NotSame(t, tt.target, res)
-				if tt.target.children != nil {
-					assert.NotSame(t, tt.target.children, res.children)
+				if tt.target.children != nil && res != nil && res.children != nil {
+					assert.NotSame(t, &tt.target.children, &res.children)
 				}
 			}
 		})
@@ -577,7 +577,9 @@ func TestNewTagList(t *testing.T) {
 			t.Parallel()
 			res := NewTagList(tt.args.tags)
 			assert.Equal(t, tt.want, res)
-			assert.NotSame(t, res.tags, tt.args.tags)
+			if res != nil && res.tags != nil && tt.args.tags != nil {
+				assert.NotSame(t, &res.tags, &tt.args.tags)
+			}
 		})
 	}
 }
@@ -612,8 +614,8 @@ func TestTagList_Tags(t *testing.T) {
 			t.Parallel()
 			res := tt.target.Tags()
 			assert.Equal(t, tt.want, res)
-			if tt.want != nil {
-				assert.NotSame(t, tt.target.tags, res)
+			if tt.want != nil && tt.target != nil && tt.target.tags != nil && res != nil {
+				assert.NotSame(t, &tt.target.tags, &res)
 			}
 		})
 	}

server/pkg/property/initializer_test.go

@@ -19,7 +19,9 @@ func TestInitializer_Clone(t *testing.T) {
 	cloned := initializer.Clone()
 
 	assert.NotSame(t, cloned, initializer)
-	assert.NotSame(t, cloned.Items, initializer.Items)
+	if cloned != nil && cloned.Items != nil && initializer.Items != nil {
+		assert.NotSame(t, &cloned.Items, &initializer.Items)
+	}
 	assert.NotSame(t, cloned.Items[0], initializer.Items[0])
 	assert.Equal(t, cloned, initializer)
 }
@@ -105,10 +107,14 @@ func TestInitializerItem_Clone(t *testing.T) {
 
 	cloned := item.Clone()
 
-	assert.NotSame(t, cloned, item)
-	assert.NotSame(t, cloned.Groups, item.Groups)
+	assert.NotSame(t, &cloned, &item)
+	if cloned != nil && cloned.Groups != nil && item.Groups != nil {
+		assert.NotSame(t, &cloned.Groups, &item.Groups)
+	}
 	assert.NotSame(t, cloned.Groups[0], item.Groups[0])
-	assert.NotSame(t, cloned.Groups[0].Fields, item.Groups[0].Fields)
+	if len(cloned.Groups) > 0 && len(item.Groups) > 0 && cloned.Groups[0].Fields != nil && item.Groups[0].Fields != nil {
+		assert.NotSame(t, &cloned.Groups[0].Fields, &item.Groups[0].Fields)
+	}
 	assert.NotSame(t, cloned.Groups[0].Fields[0], item.Groups[0].Fields[0])
 	assert.Equal(t, cloned, item)
 }
@@ -192,8 +198,10 @@ func TestInitializerGroup_Clone(t *testing.T) {
 
 	cloned := item.Clone()
 
-	assert.NotSame(t, cloned, item)
-	assert.NotSame(t, cloned.Fields, item.Fields)
+	assert.NotSame(t, &cloned, &item)
+	if cloned != nil && cloned.Fields != nil && item.Fields != nil {
+		assert.NotSame(t, &cloned.Fields, &item.Fields)
+	}
 	assert.NotSame(t, cloned.Fields[0], item.Fields[0])
 	assert.Equal(t, cloned, item)
 }
@@ -239,8 +247,10 @@ func TestInitializerField_Clone(t *testing.T) {
 	}
 	cloned := field.Clone()
 
-	assert.NotSame(t, cloned, field)
-	assert.NotSame(t, cloned.Links, field.Links)
+	assert.NotSame(t, &cloned, &field)
+	if cloned != nil && cloned.Links != nil && field.Links != nil {
+		assert.NotSame(t, &cloned.Links, &field.Links)
+	}
 	assert.Equal(t, cloned, field)
 }