From 60929112fa4eaa3e5edc915247ccbb7c5740d6bf Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Fri, 11 Aug 2023 09:50:49 -0400 Subject: [PATCH] Make sure reply is sorted before comparison for cdre tests --- apier/v1/cdre_it_test.go | 11 ++++++----- apier/v2/cdrs_it_test.go | 7 +++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apier/v1/cdre_it_test.go b/apier/v1/cdre_it_test.go index 0a5d149ca..46865bb7b 100644 --- a/apier/v1/cdre_it_test.go +++ b/apier/v1/cdre_it_test.go @@ -227,13 +227,14 @@ func testCDReExportCDRs2(t *testing.T) { Verbose: true, } var rply *RplExportedCDRs - expExportedCdrs := []string{"Cdr7", "Cdr5"} + expExportedCdrs := []string{"Cdr5", "Cdr7"} if err := cdreRPC.Call(utils.APIerSv1ExportCDRs, attr, &rply); err != nil { t.Error("Unexpected error: ", err.Error()) - } else if sort.Slice(rply.ExportedCGRIDs, func(i, j int) bool { - return i < j - }); !reflect.DeepEqual(rply.ExportedCGRIDs, expExportedCdrs) { - t.Errorf("Expected CDRs %+v,Received %+v ", expExportedCdrs, rply.ExportedCGRIDs) + } else { + sort.Strings(rply.ExportedCGRIDs) + if !reflect.DeepEqual(rply.ExportedCGRIDs, expExportedCdrs) { + t.Errorf("Expected CDRs %+v,Received %+v ", expExportedCdrs, rply.ExportedCGRIDs) + } } } diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 91a5e0c9c..5a8558d32 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -937,8 +937,11 @@ func testV2ExportCDRsToFile(t *testing.T) { expCgrIds := []string{"879cd5e698af", "9b3cd5e698af94"} if err := cdrsRpc.Call(utils.APIerSv2ExportCdrsToFile, attr, &replyExp); err != nil { t.Error(err) - } else if sort.Slice(replyExp.ExportedCgrIds, func(i, j int) bool { return i < j }); !reflect.DeepEqual(expCgrIds, replyExp.ExportedCgrIds) { - t.Errorf("Expected CgrsIds %+v,Received %+v", expCgrIds, replyExp.ExportedCgrIds) + } else { + sort.Strings(replyExp.ExportedCgrIds) + if !reflect.DeepEqual(expCgrIds, replyExp.ExportedCgrIds) { + t.Errorf("Expected CgrsIds %+v,Received %+v", expCgrIds, replyExp.ExportedCgrIds) + } } }