From 5f801c8b6713cc19b6f41b8eebfd207d4b5ebb09 Mon Sep 17 00:00:00 2001 From: gezimbll Date: Fri, 17 Nov 2023 06:42:23 -0500 Subject: [PATCH] Revise integration tests --- ees/poster_it_test.go | 10 ++++++++-- engine/storage_mongo_datadb.go | 11 +++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ees/poster_it_test.go b/ees/poster_it_test.go index 84f435564..939370658 100644 --- a/ees/poster_it_test.go +++ b/ees/poster_it_test.go @@ -111,8 +111,14 @@ func TestHttpJsonPoster(t *testing.T) { } else if len(ev.Events) == 0 { t.Fatal("Expected at least one event") } - if !reflect.DeepEqual(jsn, ev.Events[0]) { - t.Errorf("Expecting: %q, received: %q", string(jsn), ev.Events[0]) + + evBody, cancast := ev.Events[0].(*HTTPPosterRequest) + if !cancast { + t.Error("Can't cast the event ") + } + + if string(evBody.Body.([]uint8)) != string(jsn) { + t.Errorf("Expecting: %q, received: %q", utils.ToJSON(evBody.Body), utils.ToJSON(ev.Events[0])) } os.Remove(fs[0]) } diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index d94d57c3f..53e86b665 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -1745,10 +1745,7 @@ func (ms *MongoStorage) SetDispatcherProfileDrv(r *DispatcherProfile) error { func (ms *MongoStorage) RemoveDispatcherProfileDrv(tenant, id string) error { return ms.query(func(sctx mongo.SessionContext) error { - dr, err := ms.getCol(ColDpp).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) - if dr.DeletedCount == 0 { - return utils.ErrNotFound - } + _, err := ms.getCol(ColDpp).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) return err }) } @@ -1778,10 +1775,8 @@ func (ms *MongoStorage) SetDispatcherHostDrv(r *DispatcherHost) error { func (ms *MongoStorage) RemoveDispatcherHostDrv(tenant, id string) error { return ms.query(func(sctx mongo.SessionContext) error { - dr, err := ms.getCol(ColDph).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) - if dr.DeletedCount == 0 { - return utils.ErrNotFound - } + _, err := ms.getCol(ColDph).DeleteOne(sctx, bson.M{"tenant": tenant, "id": id}) + return err }) }