sipwise
/
lua-ngcp-kamailio
mirror of https://github.com/sipwise/lua-ngcp-kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#56753 mocks.pv: pv name can have ':' char

Browse Source 
Change-Id: I4ecd5ad7b02165405eb319afd18597efb1d54165
mr11.3
Victor Seva 3 years ago
parent 37c926597c
commit a1c80262d4
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File

41
mocks/pv.lua
Unescape View File

@ -37,6 +37,7 @@ local pvMock = {
} }
function pvMock:new(hdr) function pvMock:new(hdr)
local t = {} local t = {}
local name_fmt = '%w:_%-'
t.__class__ = 'pvMock' t.__class__ = 'pvMock'
-- fake pseudo vars go here -- fake pseudo vars go here
@ -57,10 +58,10 @@ local pvMock = {
function t._is_pvheader(id) function t._is_pvheader(id)
local patterns = { local patterns = {
'%$(x_%l+)%(([%w_%-]+)%)$', '%$(x_%l+)%((['..name_fmt..']+)%)$',
'%$%((x_%l+)%(([%w_%-]+)%)%)$', '%$%((x_%l+)%((['..name_fmt..']+)%)%)$',
'%$%((x_%l+)%(([%w_%-]+)%)%[%*%]%)$', '%$%((x_%l+)%((['..name_fmt..']+)%)%[%*%]%)$',
'%$%((x_%l+)%(([%w_%-]+)%)%[(%d+)%]%)$', '%$%((x_%l+)%((['..name_fmt..']+)%)%[(%d+)%]%)$',
} }
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
for _type, key, indx in string.gmatch(id, v) do for _type, key, indx in string.gmatch(id, v) do
@ -76,7 +77,7 @@ local pvMock = {
function t._is_sht(id) function t._is_sht(id)
local patterns = { local patterns = {
'%$sht%(([%w_%-^%[]+)=>(.*)%)$', '%$sht%((['..name_fmt..'^%[]+)=>(.*)%)$',
} }
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
for table, key in string.gmatch(id, v) do for table, key in string.gmatch(id, v) do
@ -89,13 +90,13 @@ local pvMock = {
function t._is_xav(id, xtype) function t._is_xav(id, xtype)
local patterns = { local patterns = {
'%$'..xtype..'%(([%w_%-^%[]+)%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)%)$',
'%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]%)$',
'%$'..xtype..'%(([%w_%-^%[]+)=>([%w_%-^%[]+)%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)=>(['..name_fmt..'^%[]+)%)$',
'%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%)$',
'%$'..xtype..'%(([%w_%-^%[]+)=>([%w_%-^%[]+)%[(%d+)%]%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)=>(['..name_fmt..'^%[]+)%[(%d+)%]%)$',
'%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%[(%d+)%]%)$', '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%[(%d+)%]%)$',
'%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%[%*%]%)$' '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%[%*%]%)$'
} }
local logger = logging.file('reports/sr_pv_%s.log', '%Y-%m-%d') local logger = logging.file('reports/sr_pv_%s.log', '%Y-%m-%d')
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
@ -157,10 +158,10 @@ local pvMock = {
function t._is_avp(id) function t._is_avp(id)
local _id local _id
local patterns = { local patterns = {
'%$avp%(([%w_%-]+)%)$', '%$avp%((['..name_fmt..']+)%)$',
'%$%(avp%(([%w_%-]+)%)%)$', '%$%(avp%((['..name_fmt..']+)%)%)$',
'%$%(avp%(([%w_%-]+)%)%[%*%]%)$', '%$%(avp%((['..name_fmt..']+)%)%[%*%]%)$',
'%$%(avp%(([%w_%-]+)%)%[(%d+)%]%)$', '%$%(avp%((['..name_fmt..']+)%)%[(%d+)%]%)$',
} }
_id = t._clean_id(id) _id = t._clean_id(id)
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
@ -175,8 +176,8 @@ local pvMock = {
function t._is_var(id) function t._is_var(id)
local patterns = { local patterns = {
'%$var%(([%w_%-]+)%)$', '%$var%((['..name_fmt..']+)%)$',
'%$%(var%(([%w_%-]+)%)%)$', '%$%(var%((['..name_fmt..']+)%)%)$',
} }
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
for key in string.gmatch(id, v) do for key in string.gmatch(id, v) do
@ -187,8 +188,8 @@ local pvMock = {
function t._is_dlg_var(id) function t._is_dlg_var(id)
local patterns = { local patterns = {
'%$dlg_var%(([%w_%-]+)%)$', '%$dlg_var%((['..name_fmt..']+)%)$',
'%$%(dlg_var%(([%w_%-]+)%)%)$', '%$%(dlg_var%((['..name_fmt..']+)%)%)$',
} }
for _,v in pairs(patterns) do for _,v in pairs(patterns) do
for key in string.gmatch(id, v) do for key in string.gmatch(id, v) do

14
tests/mocks_pv.lua
Unescape View File

@ -276,9 +276,11 @@ TestPVMock = {}
self.pv.sets("$var(hithere)", "value") self.pv.sets("$var(hithere)", "value")
lu.assertEquals(self.pv.get("$var(hithere)"), "value") lu.assertEquals(self.pv.get("$var(hithere)"), "value")
lu.assertError(self.pv.sets, "$var(hithere)", 1) lu.assertError(self.pv.sets, "$var(hithere)", 1)
lu.assertError(self.pv.sets, "$var(s:hithere)", "1") self.pv.sets("$var(s:hithere)", "1")
lu.assertEquals(self.pv.get("$var(s:hithere)"), "1")
lu.assertError(self.pv.sets, "$(var(hithere)[*])", "1") lu.assertError(self.pv.sets, "$(var(hithere)[*])", "1")
lu.assertError(self.pv.sets, "$(var(s:hithere))", "1") self.pv.sets("$(var(s:hithere))", "1")
lu.assertEquals(self.pv.get("$(var(s:hithere))"), "1")
self.pv.sets("$(var(hithere))", "new_value") self.pv.sets("$(var(hithere))", "new_value")
lu.assertEquals(self.pv.get("$var(hithere)"), "new_value") lu.assertEquals(self.pv.get("$var(hithere)"), "new_value")
lu.assertEquals(self.pv.vars["var:hithere"], "new_value") lu.assertEquals(self.pv.vars["var:hithere"], "new_value")
@ -288,9 +290,11 @@ TestPVMock = {}
self.pv.seti("$var(hithere)", 0) self.pv.seti("$var(hithere)", 0)
lu.assertEquals(self.pv.get("$var(hithere)"), 0) lu.assertEquals(self.pv.get("$var(hithere)"), 0)
lu.assertError(self.pv.seti, "$var(hithere)", "1") lu.assertError(self.pv.seti, "$var(hithere)", "1")
lu.assertError(self.pv.sets, "$var(s:hithere)", 1) self.pv.seti("$var(s:hithere)", 1)
lu.assertError(self.pv.sets, "$(var(hithere)[*])", 1) lu.assertEquals(self.pv.get("$var(s:hithere)"), 1)
lu.assertError(self.pv.sets, "$(var(s:hithere))", 1) lu.assertError(self.pv.seti, "$(var(hithere)[*])", 1)
self.pv.seti("$(var(s:hithere))", 1)
lu.assertEquals(self.pv.get("$(var(s:hithere))"), 1)
lu.assertEquals(self.pv.get("$var(hithere)"), 0) lu.assertEquals(self.pv.get("$var(hithere)"), 0)
self.pv.seti("$var(hithere)", 1) self.pv.seti("$var(hithere)", 1)
lu.assertEquals(self.pv.get("$var(hithere)"), 1) lu.assertEquals(self.pv.get("$var(hithere)"), 1)

Write Preview
Loading…
Cancel
Save