MT#7679 fix mock, allow [*] at kindx

mr3.4.1
Victor Seva 11 years ago
parent 60e271a3cc
commit abf574241d

@ -137,7 +137,8 @@ pvMock = {
'%$xavp%(([%w_^%[]+)=>([%w_^%[]+)%)$',
'%$xavp%(([%w_^%[]+)%[(%d+)%]=>([%w_^%[]+)%)$',
'%$xavp%(([%w_^%[]+)=>([%w_^%[]+)%[(%d+)%]%)$',
'%$xavp%(([%w_^%[]+)%[(%d+)%]=>([%w_^%[]+)%[(%d+)%]%)$'
'%$xavp%(([%w_^%[]+)%[(%d+)%]=>([%w_^%[]+)%[(%d+)%]%)$',
'%$xavp%(([%w_^%[]+)%[(%d+)%]=>([%w_^%[]+)%[%*%]%)$'
}
local logger = logging.file('reports/sr_pv_%s.log', '%Y-%m-%d')
for _,v in pairs(patterns) do
@ -154,7 +155,8 @@ pvMock = {
kindx = tonumber(kindx)
end
return { id=_id, key=key,
indx=indx, kindx=kindx, type='xavp' }
indx=indx, kindx=kindx, clean=(v==patterns[7]),
type='xavp' }
end
end
end
@ -272,6 +274,9 @@ pvMock = {
end
if t.vars[result.private_id][result.indx] then
if t.vars[result.private_id][result.indx][result.key] then
if result.clean then
return t.vars[result.private_id][result.indx][result.key]
end
if t.vars[result.private_id][result.indx][result.key][result.kindx] then
return t.vars[result.private_id][result.indx][result.key][result.kindx]
end

@ -183,6 +183,17 @@ TestSRMock = {}
assertFalse(result.clean)
end
function TestSRMock:test_is_xavp_complex_indx2()
result = self.sr.pv._is_xavp("$xavp(gogo[9]=>gogo[*])")
assertTrue(result)
assertEquals(result.type, 'xavp')
assertEquals(result.id, 'gogo')
assertEquals(result.key, 'gogo')
assertEquals(result.indx, 9)
assertFalse(result.kindx)
assertTrue(result.clean)
end
function TestSRMock:test_is_xavp_simple_nokey()
local result
result = self.sr.pv._is_xavp("$xavp(id1[8])")

Loading…
Cancel
Save