From d2aba08773a15b33abd320eb62b50b076b309b91 Mon Sep 17 00:00:00 2001 From: Reza Behzadan Date: Sun, 18 Feb 2024 06:22:53 +0330 Subject: [PATCH] Move "copy" functions to their own file --- internal/dict/dict.go | 45 ---------- internal/dict/dict_copy.go | 46 ++++++++++ internal/dict/dict_copy_test.go | 81 +++++++++++++++++ internal/dict/dict_test.go | 153 -------------------------------- internal/dict/testutils_test.go | 79 +++++++++++++++++ 5 files changed, 206 insertions(+), 198 deletions(-) create mode 100644 internal/dict/dict_copy.go create mode 100644 internal/dict/dict_copy_test.go diff --git a/internal/dict/dict.go b/internal/dict/dict.go index 713e842..a52c420 100644 --- a/internal/dict/dict.go +++ b/internal/dict/dict.go @@ -15,48 +15,3 @@ func (d Dict) HasKey(key string) bool { _, ok := d[key] return ok } - -func Copy(dest *Dict, src Dict) { - if *dest == nil { - *dest = make(Dict) - } - for k, v := range src { - if vv, ok := v.(Dict); ok { - t := make(Dict) - Copy(&t, vv) - (*dest)[k] = t - } else { - (*dest)[k] = v - } - } -} - -func (dest *Dict) CopyFrom(src Dict) { - if *dest == nil { - *dest = make(Dict) - } - for k, v := range src { - if vv, ok := v.(Dict); ok { - t := make(Dict) - t.CopyFrom(vv) - (*dest)[k] = t - } else { - (*dest)[k] = v - } - } -} - -func (src Dict) CopyTo(dest *Dict) { - if *dest == nil { - *dest = make(Dict) - } - for k, v := range src { - if vv, ok := v.(Dict); ok { - t := make(Dict) - vv.CopyTo(&t) - (*dest)[k] = t - } else { - (*dest)[k] = v - } - } -} diff --git a/internal/dict/dict_copy.go b/internal/dict/dict_copy.go new file mode 100644 index 0000000..26455cc --- /dev/null +++ b/internal/dict/dict_copy.go @@ -0,0 +1,46 @@ +package dict + +func Copy(dest *Dict, src Dict) { + if *dest == nil { + *dest = make(Dict) + } + for k, v := range src { + if vv, ok := v.(Dict); ok { + t := make(Dict) + Copy(&t, vv) + (*dest)[k] = t + } else { + (*dest)[k] = v + } + } +} + +func (dest *Dict) CopyFrom(src Dict) { + if *dest == nil { + *dest = make(Dict) + } + for k, v := range src { + if vv, ok := v.(Dict); ok { + t := make(Dict) + t.CopyFrom(vv) + (*dest)[k] = t + } else { + (*dest)[k] = v + } + } +} + +func (src Dict) CopyTo(dest *Dict) { + if *dest == nil { + *dest = make(Dict) + } + for k, v := range src { + if vv, ok := v.(Dict); ok { + t := make(Dict) + vv.CopyTo(&t) + (*dest)[k] = t + } else { + (*dest)[k] = v + } + } +} diff --git a/internal/dict/dict_copy_test.go b/internal/dict/dict_copy_test.go new file mode 100644 index 0000000..7bef393 --- /dev/null +++ b/internal/dict/dict_copy_test.go @@ -0,0 +1,81 @@ +package dict + +import ( + "reflect" + "testing" +) + +func TestCopy(t *testing.T) { + originalDict, err := loadYaml("test_data/dict2.yaml") + if err != nil { + t.Fatalf("loadYaml() returned an error: %v", err) + } + + newDict1 := Dict{} + Copy(&newDict1, originalDict) + if !reflect.DeepEqual(newDict1, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) + } + + newDict2 := make(Dict) + Copy(&newDict2, originalDict) + if !reflect.DeepEqual(newDict2, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) + } + + var newDict3 Dict + Copy(&newDict3, originalDict) + if !reflect.DeepEqual(newDict3, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) + } +} + +func TestCopyFrom(t *testing.T) { + originalDict, err := loadYaml("test_data/dict2.yaml") + if err != nil { + t.Fatalf("loadYaml() returned an error: %v", err) + } + + newDict1 := Dict{} + newDict1.CopyFrom(originalDict) + if !reflect.DeepEqual(newDict1, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) + } + + newDict2 := make(Dict) + newDict2.CopyFrom(originalDict) + if !reflect.DeepEqual(newDict2, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) + } + + var newDict3 Dict + newDict3.CopyFrom(originalDict) + if !reflect.DeepEqual(newDict3, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) + } +} + +func TestCopyTo(t *testing.T) { + originalDict, err := loadYaml("test_data/dict2.yaml") + if err != nil { + t.Fatalf("loadYaml() returned an error: %v", err) + } + + newDict1 := Dict{} + originalDict.CopyTo(&newDict1) + if !reflect.DeepEqual(newDict1, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) + } + + newDict2 := make(Dict) + originalDict.CopyTo(&newDict2) + if !reflect.DeepEqual(newDict2, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) + } + + var newDict3 Dict + originalDict.CopyTo(&newDict3) + if !reflect.DeepEqual(newDict3, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) + } +} diff --git a/internal/dict/dict_test.go b/internal/dict/dict_test.go index 093be63..3a8c9af 100644 --- a/internal/dict/dict_test.go +++ b/internal/dict/dict_test.go @@ -1,87 +1,9 @@ package dict import ( - "reflect" "testing" ) -func sampleDict() Dict { - return Dict{ - "name": "Test Project", - "version": 1.0, - "active": true, - "description": "This is a sample YAML file for testing the Dict package.", - "metadata": Dict{ - "author": "John Doe", - "license": "MIT", - "tags": []interface{}{"sample", "test", "yaml"}, - }, - "configuration": Dict{ - "threads": 4, - "verbose": true, - "features": []interface{}{"logging", "monitoring"}, - }, - "resources": []interface{}{ - Dict{ - "type": "database", - "name": "primary-db", - "properties": Dict{ - "host": "localhost", - "port": 5432, - "credentials": Dict{ - "username": "admin", - "password": "secret", - }, - }, - }, - Dict{ - "type": "cache", - "name": "redis-cache", - "properties": Dict{ - "host": "localhost", - "port": 6379, - "ttl": 3600, - }, - }, - }, - "nested": Dict{ - "level1": Dict{ - "level2": Dict{ - "level3": Dict{ - "key": "value", - "array": []interface{}{1, 2, 3, 4.5}, - "nestedArray": []interface{}{ - Dict{"key1": "val1"}, - Dict{ - "key2": "val2", - "subNested": Dict{ - "subKey1": "subVal1", - "subKey2": 2, - }, - }, - }, - }, - }, - }, - }, - "additionalNotes": "This is a multiline string.\nIt can contain new lines and spaces.\nIt's useful for longer descriptions or content.", - } -} - -func TestSampleDict(t *testing.T) { - originalDict, err := loadYaml("test_data/dict2.yaml") - if err != nil { - t.Fatalf("loadYaml() returned an error: %v", err) - } - - dict := sampleDict() - - if !reflect.DeepEqual(dict, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, dict) - } - -} - func TestNew(t *testing.T) { d := New() if d == nil { @@ -130,78 +52,3 @@ func TestIsDict(t *testing.T) { t.Errorf("Expected false, got %v", r) } } - -func TestCopy(t *testing.T) { - originalDict, err := loadYaml("test_data/dict2.yaml") - if err != nil { - t.Fatalf("loadYaml() returned an error: %v", err) - } - - newDict1 := Dict{} - Copy(&newDict1, originalDict) - if !reflect.DeepEqual(newDict1, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) - } - - newDict2 := make(Dict) - Copy(&newDict2, originalDict) - if !reflect.DeepEqual(newDict2, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) - } - - var newDict3 Dict - Copy(&newDict3, originalDict) - if !reflect.DeepEqual(newDict3, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) - } -} - -func TestCopyFrom(t *testing.T) { - originalDict, err := loadYaml("test_data/dict2.yaml") - if err != nil { - t.Fatalf("loadYaml() returned an error: %v", err) - } - - newDict1 := Dict{} - newDict1.CopyFrom(originalDict) - if !reflect.DeepEqual(newDict1, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) - } - - newDict2 := make(Dict) - newDict2.CopyFrom(originalDict) - if !reflect.DeepEqual(newDict2, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) - } - - var newDict3 Dict - newDict3.CopyFrom(originalDict) - if !reflect.DeepEqual(newDict3, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) - } -} - -func TestCopyTo(t *testing.T) { - originalDict, err := loadYaml("test_data/dict2.yaml") - if err != nil { - t.Fatalf("loadYaml() returned an error: %v", err) - } - - newDict1 := Dict{} - originalDict.CopyTo(&newDict1) - if !reflect.DeepEqual(newDict1, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict1) - } - - newDict2 := make(Dict) - originalDict.CopyTo(&newDict2) - if !reflect.DeepEqual(newDict2, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict2) - } - - var newDict3 Dict - originalDict.CopyTo(&newDict3) - if !reflect.DeepEqual(newDict3, originalDict) { - t.Errorf("Expected dict to be %v, got %v", originalDict, newDict3) - } -} diff --git a/internal/dict/testutils_test.go b/internal/dict/testutils_test.go index bb61515..96845b7 100644 --- a/internal/dict/testutils_test.go +++ b/internal/dict/testutils_test.go @@ -2,6 +2,8 @@ package dict import ( "os" + "reflect" + "testing" "gopkg.in/yaml.v3" ) @@ -25,3 +27,80 @@ func loadDictDictToDictTestCases(fn string) []dictDictToDictTestCase { } return testCases } + +func sampleDict() Dict { + return Dict{ + "name": "Test Project", + "version": 1.0, + "active": true, + "description": "This is a sample YAML file for testing the Dict package.", + "metadata": Dict{ + "author": "John Doe", + "license": "MIT", + "tags": []interface{}{"sample", "test", "yaml"}, + }, + "configuration": Dict{ + "threads": 4, + "verbose": true, + "features": []interface{}{"logging", "monitoring"}, + }, + "resources": []interface{}{ + Dict{ + "type": "database", + "name": "primary-db", + "properties": Dict{ + "host": "localhost", + "port": 5432, + "credentials": Dict{ + "username": "admin", + "password": "secret", + }, + }, + }, + Dict{ + "type": "cache", + "name": "redis-cache", + "properties": Dict{ + "host": "localhost", + "port": 6379, + "ttl": 3600, + }, + }, + }, + "nested": Dict{ + "level1": Dict{ + "level2": Dict{ + "level3": Dict{ + "key": "value", + "array": []interface{}{1, 2, 3, 4.5}, + "nestedArray": []interface{}{ + Dict{"key1": "val1"}, + Dict{ + "key2": "val2", + "subNested": Dict{ + "subKey1": "subVal1", + "subKey2": 2, + }, + }, + }, + }, + }, + }, + }, + "additionalNotes": "This is a multiline string.\nIt can contain new lines and spaces.\nIt's useful for longer descriptions or content.", + } +} + +func TestSampleDict(t *testing.T) { + originalDict, err := loadYaml("test_data/dict2.yaml") + if err != nil { + t.Fatalf("loadYaml() returned an error: %v", err) + } + + dict := sampleDict() + + if !reflect.DeepEqual(dict, originalDict) { + t.Errorf("Expected dict to be %v, got %v", originalDict, dict) + } + +}