From 2fb3c27bb777ee5fc7c99f60033fc3e001240c57 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 20 Jun 2016 16:13:25 +0300 Subject: [PATCH] changed cdr paths in tests --- apier/v2/cdrs_mongo_local_test.go | 2 +- cdrc/csv_test.go | 4 ++-- cdrc/fwv_test.go | 7 ++++--- config/config_defaults.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apier/v2/cdrs_mongo_local_test.go b/apier/v2/cdrs_mongo_local_test.go index 15446ab83..1f0d3b1e5 100644 --- a/apier/v2/cdrs_mongo_local_test.go +++ b/apier/v2/cdrs_mongo_local_test.go @@ -69,7 +69,7 @@ func TestV2CdrsMongoInjectUnratedCdr(t *testing.T) { return } mongoDb, err := engine.NewMongoStorage(cdrsMongoCfg.StorDBHost, cdrsMongoCfg.StorDBPort, cdrsMongoCfg.StorDBName, - cdrsMongoCfg.StorDBUser, cdrsMongoCfg.StorDBPass, cdrsMongoCfg.StorDBCDRSIndexes) + cdrsMongoCfg.StorDBUser, cdrsMongoCfg.StorDBPass, cdrsMongoCfg.StorDBCDRSIndexes, "") if err != nil { t.Error("Error on opening database connection: ", err) return diff --git a/cdrc/csv_test.go b/cdrc/csv_test.go index 24458cbd0..9a213adf0 100644 --- a/cdrc/csv_test.go +++ b/cdrc/csv_test.go @@ -30,7 +30,7 @@ import ( func TestCsvRecordForkCdr(t *testing.T) { cgrConfig, _ := config.NewDefaultCGRConfig() - cdrcConfig := cgrConfig.CdrcProfiles["/var/log/cgrates/cdrc/in"][0] + cdrcConfig := cgrConfig.CdrcProfiles["/var/spool/cgrates/cdrc/in"][0] cdrcConfig.CdrSourceId = "TEST_CDRC" cdrcConfig.ContentFields = append(cdrcConfig.ContentFields, &config.CfgCdrField{Tag: "SupplierTest", Type: utils.META_COMPOSED, FieldId: utils.SUPPLIER, Value: []*utils.RSRField{&utils.RSRField{Id: "14"}}}) cdrcConfig.ContentFields = append(cdrcConfig.ContentFields, &config.CfgCdrField{Tag: "DisconnectCauseTest", Type: utils.META_COMPOSED, FieldId: utils.DISCONNECT_CAUSE, @@ -76,7 +76,7 @@ func TestCsvRecordForkCdr(t *testing.T) { func TestCsvDataMultiplyFactor(t *testing.T) { cgrConfig, _ := config.NewDefaultCGRConfig() - cdrcConfig := cgrConfig.CdrcProfiles["/var/log/cgrates/cdrc/in"][0] + cdrcConfig := cgrConfig.CdrcProfiles["/var/spool/cgrates/cdrc/in"][0] cdrcConfig.CdrSourceId = "TEST_CDRC" cdrcConfig.ContentFields = []*config.CfgCdrField{&config.CfgCdrField{Tag: "TORField", Type: utils.META_COMPOSED, FieldId: utils.TOR, Value: []*utils.RSRField{&utils.RSRField{Id: "0"}}}, &config.CfgCdrField{Tag: "UsageField", Type: utils.META_COMPOSED, FieldId: utils.USAGE, Value: []*utils.RSRField{&utils.RSRField{Id: "1"}}}} diff --git a/cdrc/fwv_test.go b/cdrc/fwv_test.go index 7623ec124..8897b7c12 100644 --- a/cdrc/fwv_test.go +++ b/cdrc/fwv_test.go @@ -19,9 +19,10 @@ along with this program. If not, see package cdrc import ( + "testing" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "testing" ) func TestFwvValue(t *testing.T) { @@ -45,9 +46,9 @@ func TestFwvValue(t *testing.T) { func TestFwvRecordPassesCfgFilter(t *testing.T) { //record, configKey string) bool { cgrConfig, _ := config.NewDefaultCGRConfig() - cdrcConfig := cgrConfig.CdrcProfiles["/var/log/cgrates/cdrc/in"][0] // We don't really care that is for .csv since all we want to test are the filters + cdrcConfig := cgrConfig.CdrcProfiles["/var/spool/cgrates/cdrc/in"][0] // We don't really care that is for .csv since all we want to test are the filters cdrcConfig.CdrFilter = utils.ParseRSRFieldsMustCompile(`~52:s/^0(\d{9})/+49${1}/(^+49123123120)`, utils.INFIELD_SEP) - fwvRp := &FwvRecordsProcessor{cdrcCfgs: cgrConfig.CdrcProfiles["/var/log/cgrates/cdrc/in"]} + fwvRp := &FwvRecordsProcessor{cdrcCfgs: cgrConfig.CdrcProfiles["/var/spool/cgrates/cdrc/in"]} cdrLine := "CDR0000010 0 20120708181506000123451234 0040123123120 004 000018009980010001ISDN ABC 10Buiten uw regio EHV 00000009190000000009" if passesFilter := fwvRp.recordPassesCfgFilter(cdrLine, cdrcConfig); !passesFilter { t.Error("Not passes filter") diff --git a/config/config_defaults.go b/config/config_defaults.go index 29c1aaeda..18a69932b 100644 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -189,7 +189,7 @@ const CGRATES_CFG_JSON = ` "cost_shift_digits": 0, // shift digits in the cost on export (eg: convert from EUR to cents) "mask_destination_id": "MASKED_DESTINATIONS", // destination id containing called addresses to be masked on export "mask_length": 0, // length of the destination suffix to be masked - "export_folder": "/var/log/cgrates/cdre", // path where the exported CDRs will be placed + "export_folder": "/var/spool/cgrates/cdre", // path where the exported CDRs will be placed "header_fields": [], // template of the exported header fields "content_fields": [ // template of the exported content fields {"tag": "CGRID", "type": "*composed", "value": "CGRID"},