From d2fdb60482c946c41c93b5741344af5e79e09dbb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Wed, 13 Jan 2021 10:38:42 +0200
Subject: [PATCH] Updated orderednavigablemap tests

---
 analyzers/codec_test.go           |  2 +-
 utils/orderednavigablemap_test.go | 22 +++++++++++++++++++---
 utils/pathitem_test.go            |  7 ++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/analyzers/codec_test.go b/analyzers/codec_test.go
index 7f1f0d8fa..106ecd7e5 100644
--- a/analyzers/codec_test.go
+++ b/analyzers/codec_test.go
@@ -86,7 +86,7 @@ func TestNewServerCodec(t *testing.T) {
 	if err = codec.Close(); err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(200 * time.Millisecond)
 	runtime.Gosched()
 	if cnt, err := anz.db.DocCount(); err != nil {
 		t.Fatal(err)
diff --git a/utils/orderednavigablemap_test.go b/utils/orderednavigablemap_test.go
index 6b158da05..f7f662b46 100644
--- a/utils/orderednavigablemap_test.go
+++ b/utils/orderednavigablemap_test.go
@@ -946,9 +946,25 @@ func TestOrderedNavigableMapOrderedFields(t *testing.T) {
 		PathItems: PathItems{{Field: "Field1"}, {Field: "Field2", Index: StringPointer("0")}},
 		Path:      "Field1.Field2[0]",
 	}, NewNMData("1003"))
+	nm.Set(&FullPath{
+		PathItems: PathItems{{Field: "Field1"}, {Field: "Field3", Index: StringPointer("0")}},
+		Path:      "Field1.Field3[0]",
+	}, NewNMData("1004"))
+	nm.Set(&FullPath{
+		PathItems: PathItems{{Field: "Field5"}},
+		Path:      "Field5",
+	}, NewNMData("1005"))
+	nm.Set(&FullPath{
+		PathItems: PathItems{{Field: "Field6"}},
+		Path:      "Field6",
+	}, NewNMData("1006"))
+	nm.Remove(&FullPath{
+		PathItems: PathItems{{Field: "Field5"}},
+		Path:      "Field5",
+	})
+	exp := []interface{}{"1003", "1004", "1006"}
 	rcv := nm.OrderedFields()
-	newRcv := rcv[0].(string)
-	if newRcv != "1003" {
-		t.Errorf("Expected %+v, received %+v", "1003", newRcv)
+	if !reflect.DeepEqual(exp, rcv) {
+		t.Errorf("Expected %+v, received %+v", exp, rcv)
 	}
 }
diff --git a/utils/pathitem_test.go b/utils/pathitem_test.go
index e872aba26..095337631 100644
--- a/utils/pathitem_test.go
+++ b/utils/pathitem_test.go
@@ -167,9 +167,6 @@ func TestPathItemsSlice(t *testing.T) {
 func TestNewFullPath(t *testing.T) {
 	expected := &FullPath{
 		PathItems: []PathItem{
-			{
-				Field: EmptyString,
-			},
 			{
 				Field: "test",
 			},
@@ -177,9 +174,9 @@ func TestNewFullPath(t *testing.T) {
 				Field: "path",
 			},
 		},
-		Path: "/test/path",
+		Path: "test.path",
 	}
-	if rcv := NewFullPath("/test/path", Slash); !reflect.DeepEqual(rcv, expected) {
+	if rcv := NewFullPath("test.path", NestingSep); !reflect.DeepEqual(rcv, expected) {
 		t.Errorf("Expected %+v \n, received %+v", ToJSON(expected), ToJSON(rcv))
 	}
 }