From 41cd0ce29e48fe523422965d61859cd4e15edad7 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 27 Nov 2018 17:42:06 +0200 Subject: [PATCH] Partially fixed cdrc integration tests --- cdrc/csv_it_test.go | 10 +++++++++- cdrc/flatstore_it_test.go | 19 ++++++++++++++++--- cdrc/fwv_it_test.go | 7 +++++++ cdrc/partialcsv_it_test.go | 7 +++++++ cdrc/xml_it_test.go | 7 +++++++ 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/cdrc/csv_it_test.go b/cdrc/csv_it_test.go index 1508455bd..8025cdcf0 100644 --- a/cdrc/csv_it_test.go +++ b/cdrc/csv_it_test.go @@ -80,6 +80,13 @@ func TestCsvITInitCdrDb(t *testing.T) { } } +// Remove data in both rating and accounting db +func TestCsvITResetDataDb(t *testing.T) { + if err := engine.InitDataDb(csvCfg); err != nil { + t.Fatal(err) + } +} + func TestCsvITCreateCdrDirs(t *testing.T) { for _, cdrcProfiles := range csvCfg.CdrcProfiles { for _, cdrcInst := range cdrcProfiles { @@ -149,10 +156,11 @@ func TestCsvITProcessedFiles(t *testing.T) { } func TestCsvITAnalyseCDRs(t *testing.T) { + time.Sleep(500 * time.Millisecond) var reply []*engine.ExternalCDR if err := cdrcRpc.Call("ApierV2.GetCdrs", utils.RPCCDRsFilter{}, &reply); err != nil { t.Error("Unexpected error: ", err.Error()) - } else if len(reply) != 6 { // 1 injected, 1 rated, 1 *raw and it's pair in *default run + } else if len(reply) != 5 { // 1 injected, 1 rated, 1 *raw and it's pair in *default run t.Error("Unexpected number of CDRs returned: ", len(reply)) } if err := cdrcRpc.Call("ApierV2.GetCdrs", utils.RPCCDRsFilter{DestinationPrefixes: []string{"08651"}}, &reply); err == nil || err.Error() != utils.NotFoundCaps { diff --git a/cdrc/flatstore_it_test.go b/cdrc/flatstore_it_test.go index e6a670ecb..fab45a2a0 100644 --- a/cdrc/flatstore_it_test.go +++ b/cdrc/flatstore_it_test.go @@ -56,7 +56,7 @@ var part1 = `BYE|f9d3d5c3|c863a6e3|214d8f52b566e33a9349b184e72a4ccb@0:0:0:0:0:0: ` var part2 = `INVITE|f9d3d5c3|c863a6e3|214d8f52b566e33a9349b184e72a4ccb@0:0:0:0:0:0:0:0|200|OK|1436454647|*postpaid|1002|1003||1877:893549742 -INVITE|2daec40c|548625ac|dd0c4c617a9919d29a6175cdff223a9e@0:0:0:0:0:0:0:0|200|OK|1436454408|*prepaid|1001|1002||3401:2069362475` +INVITE|2daec40c|548625ac|dd0c4c617a9919d29a6175cdff223a9p@0:0:0:0:0:0:0:0|200|OK|1436454408|*prepaid|1001|1002||3401:2069362475` func TestFlatstoreitInitCfg(t *testing.T) { var err error @@ -73,6 +73,13 @@ func TestFlatstoreitInitCdrDb(t *testing.T) { } } +// Remove data in both rating and accounting db +func TestFlatstoreitResetDataDb(t *testing.T) { + if err := engine.InitDataDb(flatstoreCfg); err != nil { + t.Fatal(err) + } +} + // Creates cdr files and moves them into processing folder func TestFlatstoreitCreateCdrFiles(t *testing.T) { if flatstoreCfg == nil { @@ -140,10 +147,10 @@ func TestFlatstoreitProcessFiles(t *testing.T) { if len(filesOutDir) != 5 { t.Errorf("In CdrcOutDir, expecting 5 files, got: %d", len(filesOutDir)) } - ePartContent := "INVITE|2daec40c|548625ac|dd0c4c617a9919d29a6175cdff223a9e@0:0:0:0:0:0:0:0|200|OK|1436454408|*prepaid|1001|1002||3401:2069362475\n" + ePartContent := "INVITE|2daec40c|548625ac|dd0c4c617a9919d29a6175cdff223a9p@0:0:0:0:0:0:0:0|200|OK|1436454408|*prepaid|1001|1002||3401:2069362475\n" if partContent, err := ioutil.ReadFile(path.Join(flatstoreCdrcCfg.CdrOutDir, "acc_3.log.unpaired")); err != nil { t.Error(err) - } else if len(ePartContent) != len(string(partContent)) { + } else if (ePartContent) != (string(partContent)) { t.Errorf("Expecting:\n%s\nReceived:\n%s", ePartContent, string(partContent)) } } @@ -161,3 +168,9 @@ func TestFlatstoreitAnalyseCDRs(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", len(reply)) } } + +func TestFlatstoreitKillEngine(t *testing.T) { + if err := engine.KillEngine(*waitRater); err != nil { + t.Error(err) + } +} diff --git a/cdrc/fwv_it_test.go b/cdrc/fwv_it_test.go index d774d7f53..1489a88f0 100644 --- a/cdrc/fwv_it_test.go +++ b/cdrc/fwv_it_test.go @@ -130,6 +130,13 @@ func TestFwvitInitCdrDb(t *testing.T) { } } +// Remove data in both rating and accounting db +func TestFwvitResetDataDb(t *testing.T) { + if err := engine.InitDataDb(fwvCfg); err != nil { + t.Fatal(err) + } +} + func TestFwvitProcessFiles(t *testing.T) { fileName := "test1.fwv" if err := ioutil.WriteFile(path.Join("/tmp", fileName), []byte(FW_CDR_FILE1), 0755); err != nil { diff --git a/cdrc/partialcsv_it_test.go b/cdrc/partialcsv_it_test.go index 34df94e20..d8f9408d1 100644 --- a/cdrc/partialcsv_it_test.go +++ b/cdrc/partialcsv_it_test.go @@ -65,6 +65,13 @@ func TestPartcsvITInitCdrDb(t *testing.T) { } } +// Remove data in both rating and accounting db +func TestPartcsvITResetDataDb(t *testing.T) { + if err := engine.InitDataDb(partcsvCfg); err != nil { + t.Fatal(err) + } +} + func TestPartcsvITCreateCdrDirs(t *testing.T) { for path, cdrcProfiles := range partcsvCfg.CdrcProfiles { for _, cdrcInst := range cdrcProfiles { diff --git a/cdrc/xml_it_test.go b/cdrc/xml_it_test.go index 7a7fa4cc3..b2e13c95d 100644 --- a/cdrc/xml_it_test.go +++ b/cdrc/xml_it_test.go @@ -55,6 +55,13 @@ func TestXmlITInitCdrDb(t *testing.T) { } } +// Remove data in both rating and accounting db +func TestXmlITResetDataDb(t *testing.T) { + if err := engine.InitDataDb(xmlCfg); err != nil { + t.Fatal(err) + } +} + func TestXmlITCreateCdrDirs(t *testing.T) { for _, cdrcProfiles := range xmlCfg.CdrcProfiles { for i, cdrcInst := range cdrcProfiles {