mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-11 18:16:24 +05:00
Change utils.PrefixSliceItems function signature to start with prefix
This commit is contained in:
committed by
Dan Christian Bogos
parent
54ebc68ab3
commit
1db0390b16
@@ -297,7 +297,7 @@ func (rs Resources) resIDsMp() (mp utils.StringSet) {
|
||||
return mp
|
||||
}
|
||||
|
||||
func (rs Resources) tenatIDs() []string {
|
||||
func (rs Resources) tenantIDs() []string {
|
||||
ids := make([]string, len(rs))
|
||||
for i, r := range rs {
|
||||
ids[i] = r.TenantID()
|
||||
|
||||
@@ -2236,7 +2236,7 @@ func TestResourceResIDsMp(t *testing.T) {
|
||||
t.Errorf("Expecting: %+v, received: %+v", expected, rcv)
|
||||
}
|
||||
}
|
||||
func TestResourceTenatIDs(t *testing.T) {
|
||||
func TestResourceTenantIDs(t *testing.T) {
|
||||
resprf := []*ResourceProfile{
|
||||
{
|
||||
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
|
||||
@@ -2306,7 +2306,7 @@ func TestResourceTenatIDs(t *testing.T) {
|
||||
"cgrates.org:ResourceProfile2",
|
||||
"cgrates.org:ResourceProfile3",
|
||||
}
|
||||
if rcv := resourceTest.tenatIDs(); !reflect.DeepEqual(rcv, expected) {
|
||||
if rcv := resourceTest.tenantIDs(); !reflect.DeepEqual(rcv, expected) {
|
||||
t.Errorf("Expecting: %+v, received: %+v", expected, rcv)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,10 +37,12 @@ func SliceHasMember(ss []string, s string) bool {
|
||||
}
|
||||
|
||||
// PrefixSliceItems iterates through slice and add a prefix before every element
|
||||
func PrefixSliceItems(slc []string, prfx string) (out []string) {
|
||||
out = make([]string, len(slc))
|
||||
for i, itm := range slc {
|
||||
out[i] = prfx + itm
|
||||
func PrefixSliceItems(prfx string, slc []string) (out []string) {
|
||||
out = make([]string, 0, len(slc))
|
||||
for _, itm := range slc {
|
||||
if itm != EmptyString {
|
||||
out = append(out, prfx+itm)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ func TestHasPrefixSlice(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPrefixSliceItems(t *testing.T) {
|
||||
rcv := PrefixSliceItems([]string{"1", "2", "3", "4", "5"}, "*")
|
||||
rcv := PrefixSliceItems("*", []string{"1", "2", "3", "4", "5"})
|
||||
sort.Strings(rcv)
|
||||
eOut := []string{"*1", "*2", "*3", "*4", "*5"}
|
||||
if !reflect.DeepEqual(eOut, rcv) {
|
||||
|
||||
Reference in New Issue
Block a user