From a1c80262d41eb5791d1c92853313cc382556bdfb Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Fri, 24 Feb 2023 13:00:51 +0100
Subject: [PATCH] MT#56753 mocks.pv: pv name can have ':' char

Change-Id: I4ecd5ad7b02165405eb319afd18597efb1d54165
---
 mocks/pv.lua       | 41 +++++++++++++++++++++--------------------
 tests/mocks_pv.lua | 14 +++++++++-----
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/mocks/pv.lua b/mocks/pv.lua
index 66c730d..a44d89e 100644
--- a/mocks/pv.lua
+++ b/mocks/pv.lua
@@ -37,6 +37,7 @@ local pvMock = {
 }
     function pvMock:new(hdr)
         local t = {}
+        local name_fmt = '%w:_%-'
 
         t.__class__ = 'pvMock'
         -- fake pseudo vars go here
@@ -57,10 +58,10 @@ local pvMock = {
 
         function t._is_pvheader(id)
             local patterns = {
-                '%$(x_%l+)%(([%w_%-]+)%)$',
-                '%$%((x_%l+)%(([%w_%-]+)%)%)$',
-                '%$%((x_%l+)%(([%w_%-]+)%)%[%*%]%)$',
-                '%$%((x_%l+)%(([%w_%-]+)%)%[(%d+)%]%)$',
+                '%$(x_%l+)%((['..name_fmt..']+)%)$',
+                '%$%((x_%l+)%((['..name_fmt..']+)%)%)$',
+                '%$%((x_%l+)%((['..name_fmt..']+)%)%[%*%]%)$',
+                '%$%((x_%l+)%((['..name_fmt..']+)%)%[(%d+)%]%)$',
             }
             for _,v in pairs(patterns) do
                 for _type, key, indx in string.gmatch(id, v) do
@@ -76,7 +77,7 @@ local pvMock = {
 
         function t._is_sht(id)
             local patterns = {
-                '%$sht%(([%w_%-^%[]+)=>(.*)%)$',
+                '%$sht%((['..name_fmt..'^%[]+)=>(.*)%)$',
             }
             for _,v in pairs(patterns) do
                 for table, key in string.gmatch(id, v) do
@@ -89,13 +90,13 @@ local pvMock = {
 
         function t._is_xav(id, xtype)
             local patterns = {
-                '%$'..xtype..'%(([%w_%-^%[]+)%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)=>([%w_%-^%[]+)%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)=>([%w_%-^%[]+)%[(%d+)%]%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%[(%d+)%]%)$',
-                '%$'..xtype..'%(([%w_%-^%[]+)%[(%d+)%]=>([%w_%-^%[]+)%[%*%]%)$'
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)=>(['..name_fmt..'^%[]+)%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)=>(['..name_fmt..'^%[]+)%[(%d+)%]%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%[(%d+)%]%)$',
+                '%$'..xtype..'%((['..name_fmt..'^%[]+)%[(%d+)%]=>(['..name_fmt..'^%[]+)%[%*%]%)$'
             }
             local logger = logging.file('reports/sr_pv_%s.log', '%Y-%m-%d')
             for _,v in pairs(patterns) do
@@ -157,10 +158,10 @@ local pvMock = {
         function t._is_avp(id)
             local _id
             local patterns = {
-                '%$avp%(([%w_%-]+)%)$',
-                '%$%(avp%(([%w_%-]+)%)%)$',
-                '%$%(avp%(([%w_%-]+)%)%[%*%]%)$',
-                '%$%(avp%(([%w_%-]+)%)%[(%d+)%]%)$',
+                '%$avp%((['..name_fmt..']+)%)$',
+                '%$%(avp%((['..name_fmt..']+)%)%)$',
+                '%$%(avp%((['..name_fmt..']+)%)%[%*%]%)$',
+                '%$%(avp%((['..name_fmt..']+)%)%[(%d+)%]%)$',
             }
             _id = t._clean_id(id)
             for _,v in pairs(patterns) do
@@ -175,8 +176,8 @@ local pvMock = {
 
         function t._is_var(id)
             local patterns = {
-                '%$var%(([%w_%-]+)%)$',
-                '%$%(var%(([%w_%-]+)%)%)$',
+                '%$var%((['..name_fmt..']+)%)$',
+                '%$%(var%((['..name_fmt..']+)%)%)$',
             }
             for _,v in pairs(patterns) do
                 for key in string.gmatch(id, v) do
@@ -187,8 +188,8 @@ local pvMock = {
 
         function t._is_dlg_var(id)
             local patterns = {
-                '%$dlg_var%(([%w_%-]+)%)$',
-                '%$%(dlg_var%(([%w_%-]+)%)%)$',
+                '%$dlg_var%((['..name_fmt..']+)%)$',
+                '%$%(dlg_var%((['..name_fmt..']+)%)%)$',
             }
             for _,v in pairs(patterns) do
                 for key in string.gmatch(id, v) do
diff --git a/tests/mocks_pv.lua b/tests/mocks_pv.lua
index c12ccba..9653ab8 100644
--- a/tests/mocks_pv.lua
+++ b/tests/mocks_pv.lua
@@ -276,9 +276,11 @@ TestPVMock = {}
         self.pv.sets("$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(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(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")
         lu.assertEquals(self.pv.get("$var(hithere)"), "new_value")
         lu.assertEquals(self.pv.vars["var:hithere"], "new_value")
@@ -288,9 +290,11 @@ TestPVMock = {}
         self.pv.seti("$var(hithere)", 0)
         lu.assertEquals(self.pv.get("$var(hithere)"), 0)
         lu.assertError(self.pv.seti, "$var(hithere)", "1")
-        lu.assertError(self.pv.sets, "$var(s:hithere)", 1)
-        lu.assertError(self.pv.sets, "$(var(hithere)[*])", 1)
-        lu.assertError(self.pv.sets, "$(var(s:hithere))", 1)
+        self.pv.seti("$var(s:hithere)", 1)
+        lu.assertEquals(self.pv.get("$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)
         self.pv.seti("$var(hithere)", 1)
         lu.assertEquals(self.pv.get("$var(hithere)"), 1)