uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-12 02:26:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests after updating loaders

Browse Source
This commit is contained in:
ionutboangiu
2021-06-14 16:54:53 +03:00
committed by Dan Christian Bogos
parent 69b5179952
commit e29bae6e10
5 changed files with 139 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
config/config_json_test.go
View File

@@ -907,6 +907,34 @@ func TestDfLoaderJsonCfg(t *testing.T) {
Tp_in_dir: utils.StringPointer("/var/spool/cgrates/loader/in"),
Tp_out_dir: utils.StringPointer("/var/spool/cgrates/loader/out"),
Data: &[]*LoaderJsonDataType{
{
Type: utils.StringPointer(utils.MetaFilters),
File_name: utils.StringPointer(utils.FiltersCsv),
Fields: &[]*FcTemplateJsonCfg{
{Tag: utils.StringPointer(utils.Tenant),
Path: utils.StringPointer(utils.Tenant),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.0"),
Mandatory: utils.BoolPointer(true)},
{Tag: utils.StringPointer(utils.ID),
Path: utils.StringPointer(utils.ID),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.1"),
Mandatory: utils.BoolPointer(true)},
{Tag: utils.StringPointer("Type"),
Path: utils.StringPointer("Type"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.2")},
{Tag: utils.StringPointer("Element"),
Path: utils.StringPointer("Element"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.3")},
{Tag: utils.StringPointer("Values"),
Path: utils.StringPointer("Values"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.4")},
},
},
{
Type: utils.StringPointer(utils.MetaAttributes),
File_name: utils.StringPointer(utils.AttributesCsv),
@@ -951,34 +979,6 @@ func TestDfLoaderJsonCfg(t *testing.T) {
Value: utils.StringPointer("~*req.8")},
},
},
{
Type: utils.StringPointer(utils.MetaFilters),
File_name: utils.StringPointer(utils.FiltersCsv),
Fields: &[]*FcTemplateJsonCfg{
{Tag: utils.StringPointer(utils.Tenant),
Path: utils.StringPointer(utils.Tenant),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.0"),
Mandatory: utils.BoolPointer(true)},
{Tag: utils.StringPointer(utils.ID),
Path: utils.StringPointer(utils.ID),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.1"),
Mandatory: utils.BoolPointer(true)},
{Tag: utils.StringPointer("Type"),
Path: utils.StringPointer("Type"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.2")},
{Tag: utils.StringPointer("Element"),
Path: utils.StringPointer("Element"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.3")},
{Tag: utils.StringPointer("Values"),
Path: utils.StringPointer("Values"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.4")},
},
},
{
Type: utils.StringPointer(utils.MetaResources),
File_name: utils.StringPointer(utils.ResourcesCsv),
@@ -1537,7 +1537,7 @@ func TestDfLoaderJsonCfg(t *testing.T) {
if cfg, err := dfCgrJSONCfg.LoaderJsonCfg(); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eCfg, cfg) {
t.Errorf("Expecting: %s, received: %s ",
t.Errorf("Expecting: %s,\nreceived: %s ",
utils.ToJSON(eCfg), utils.ToJSON(cfg))
}
}

152
config/config_test.go
View File

File diff suppressed because one or more lines are too long

36
config/loaderscfg_test.go
View File

@@ -96,7 +96,7 @@ func TestLoaderSCfgloadFromJsonCfgCase1(t *testing.T) {
} else if err = newCfg.loadLoaderSCfg(jsonCfg); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, newCfg.loaderCfg) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(newCfg.loaderCfg))
t.Errorf("Expected %+v,\n received %+v", utils.ToJSON(expected), utils.ToJSON(newCfg.loaderCfg))
}
}
@@ -198,7 +198,7 @@ func TestLoaderSCfgloadFromJsonCfgCase5(t *testing.T) {
if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, msgTemplates, jsonCfg.generalCfg.RSRSep); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(jsonCfg.loaderCfg[0].Data[0].Fields[0], expectedFields[0].Data[0].Fields[0]) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedFields[0].Data[0].Fields[0]), utils.ToJSON(jsonCfg.loaderCfg[0].Data[0].Fields[0]))
t.Errorf("Expected %+v,\n received %+v", utils.ToJSON(expectedFields[0].Data[0].Fields[0]), utils.ToJSON(jsonCfg.loaderCfg[0].Data[0].Fields[0]))
}
}
@@ -268,7 +268,7 @@ func TestLoaderCfgAsMapInterfaceCase1(t *testing.T) {
"type": "*attributes",
"file_name": "Attributes.csv",
"fields": [
{"tag": "TenantID", "path": "Tenant", "type": "*variable", "value": "~req.0", "mandatory": true},
{"tag": "TenantID", "path": "Tenant", "type": "*variable", "value": "~*req.0", "mandatory": true},
{"tag": "ProfileID", "path": "ID", "type": "*variable", "value": "~*req.1", "mandatory": true},
],
},
@@ -314,21 +314,23 @@ func TestLoaderCfgAsMapInterfaceCase1(t *testing.T) {
if cfgCgr, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {
t.Error(err)
} else {
rcv := cgrCfg.loaderCfg.AsMapInterface(cfgCgr.generalCfg.RSRSep)
if !reflect.DeepEqual(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0],
rcv[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]),
utils.ToJSON(rcv[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]))
rcv := cfgCgr.loaderCfg.AsMapInterface(cfgCgr.generalCfg.RSRSep)
if len(cfgCgr.loaderCfg) != 2 {
t.Errorf("expected: <%+v>, \nreceived: <%+v>", 2, len(cfgCgr.loaderCfg))
} else if !reflect.DeepEqual(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0],
rcv[1][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]) {
t.Errorf("Expected %+v,\n received %+v", utils.ToJSON(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]),
utils.ToJSON(rcv[1][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[0]))
} else if !reflect.DeepEqual(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1],
rcv[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]),
utils.ToJSON(rcv[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]))
} else if !reflect.DeepEqual(eMap[0][utils.CachesConnsCfg], rcv[0][utils.CachesConnsCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.CachesConnsCfg], rcv[0][utils.CachesConnsCfg])
} else if !reflect.DeepEqual(eMap[0][utils.TpInDirCfg], rcv[0][utils.TpInDirCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.TpInDirCfg], rcv[0][utils.TpInDirCfg])
} else if !reflect.DeepEqual(eMap[0][utils.LockFileNameCfg], rcv[0][utils.LockFileNameCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.LockFileNameCfg], rcv[0][utils.LockFileNameCfg])
rcv[1][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]) {
t.Errorf("Expected %+v,\n received %+v", utils.ToJSON(eMap[0][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]),
utils.ToJSON(rcv[1][utils.DataCfg].([]map[string]interface{})[0][utils.FieldsCfg].([]map[string]interface{})[1]))
} else if !reflect.DeepEqual(eMap[0][utils.CachesConnsCfg], rcv[1][utils.CachesConnsCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.CachesConnsCfg], rcv[1][utils.CachesConnsCfg])
} else if !reflect.DeepEqual(eMap[0][utils.TpInDirCfg], rcv[1][utils.TpInDirCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.TpInDirCfg], rcv[1][utils.TpInDirCfg])
} else if !reflect.DeepEqual(eMap[0][utils.LockFileNameCfg], rcv[1][utils.LockFileNameCfg]) {
t.Errorf("Expected %+v, received %+v", eMap[0][utils.LockFileNameCfg], rcv[1][utils.LockFileNameCfg])
}
}
}

30
loaders/loader_it_test.go
View File

@@ -420,14 +420,10 @@ func testLoadFromFilesCsvActionProfile(t *testing.T) {
if err != nil {
t.Error(err)
}
newFile.Write([]byte(`
#Tenant[0],ID[1]
content := `#Tenant[0],ID[1]
cgrates.org,SET_ACTPROFILE_3
`))
content, err := os.ReadFile(path.Join(flPath, "ActionProfiles.csv"))
if err != nil {
t.Error(err)
}
`
newFile.Write([]byte(content))
newFile.Close()
data := engine.NewInternalDB(nil, nil, true)
@@ -437,7 +433,8 @@ cgrates.org,SET_ACTPROFILE_3
dm: engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil),
tpInDir: flPath,
tpOutDir: utils.EmptyString,
lockFilename: "ActionProfiles.csv",
lockFilename: "ActionProfiles.lks",
rdrTypes: []string{utils.MetaActionProfiles},
fieldSep: ",",
timezone: "UTC",
}
@@ -456,16 +453,9 @@ cgrates.org,SET_ACTPROFILE_3
},
}
rdr := io.NopCloser(strings.NewReader(string(content)))
csvRdr := csv.NewReader(rdr)
csvRdr.Comment = '#'
ldr.rdrs = map[string]map[string]*openedCSVFile{
utils.MetaActionProfiles: {
utils.ActionProfilesCsv: &openedCSVFile{
fileName: utils.ActionProfilesCsv,
rdr: rdr,
csvRdr: csvRdr,
},
utils.ActionProfilesCsv: nil,
},
}
if err := ldr.ProcessFolder(context.TODO(), utils.EmptyString, utils.MetaStore, true); err != nil {
@@ -485,11 +475,11 @@ cgrates.org,SET_ACTPROFILE_3
t.Errorf("Expected %+v, received %+v", utils.ToJSON(expACtPrf), utils.ToJSON(rcv))
}
//checking the error by adding a caching method
// checking the error by adding a caching method
ldr.connMgr = engine.NewConnManager(config.NewDefaultCGRConfig(), nil)
ldr.cacheConns = []string{utils.MetaInternal}
rdr = io.NopCloser(strings.NewReader(string(content)))
csvRdr = csv.NewReader(rdr)
rdr := io.NopCloser(strings.NewReader(string(content)))
csvRdr := csv.NewReader(rdr)
csvRdr.Comment = '#'
ldr.rdrs = map[string]map[string]*openedCSVFile{
utils.MetaActionProfiles: {
@@ -517,6 +507,7 @@ func testLoadFromFilesCsvActionProfileOpenError(t *testing.T) {
bufLoaderData: make(map[string][]LoaderData),
dm: engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil),
tpInDir: "/tmp/testLoadFromFilesCsvActionProfileOpenError",
rdrTypes: []string{utils.MetaActionProfiles},
timezone: "UTC",
}
ldr.rdrs = map[string]map[string]*openedCSVFile{
@@ -563,6 +554,7 @@ cgrates.org,SET_ACTPROFILE_3
dm: engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil),
tpInDir: flPath,
tpOutDir: utils.EmptyString,
rdrTypes: []string{utils.MetaActionProfiles},
lockFilename: "ActionProfiles.csv",
fieldSep: ",",
timezone: "UTC",

4
loaders/loaders_it_test.go
View File

@@ -128,6 +128,7 @@ cgrates.org,NewRes1
},
},
}
ldrs.ldrs["testV1LoadResource"].rdrTypes = []string{utils.MetaResources}
var reply string
expected := "ANOTHER_LOADER_RUNNING"
@@ -295,6 +296,7 @@ NOT_UINT
},
},
}
ldrs.ldrs["testV1LoadResource"].rdrTypes = []string{utils.MetaResources}
var reply string
expected := "SERVER_ERROR: open testV1LoadProcessFolderError/not_a_file: no such file or directory"
@@ -371,6 +373,7 @@ cgrates.org,NewRes1
},
},
}
ldrs.ldrs["testV1RemoveResource"].rdrTypes = []string{utils.MetaResources}
expRes := &engine.ResourceProfile{
Tenant: "cgrates.org",
@@ -578,6 +581,7 @@ func testV1RemoveProcessFolderError(t *testing.T) {
},
},
}
ldrs.ldrs["testV1RemoveProcessFolderError"].rdrTypes = []string{utils.MetaResources}
var reply string
expected := "SERVER_ERROR: open testV1RemoveProcessFolderError/not_a_file2: no such file or directory"