diff --git a/mocks/hdr.lua b/mocks/hdr.lua index d27e386..5a3104c 100644 --- a/mocks/hdr.lua +++ b/mocks/hdr.lua @@ -33,7 +33,7 @@ local hdrMock = { crit = logging.FATAL } } - function hdrMock.new() + function hdrMock:new() local t = {} t.__class__ = 'hdrMock' diff --git a/mocks/ksr.lua b/mocks/ksr.lua index bade5b8..43ac64b 100644 --- a/mocks/ksr.lua +++ b/mocks/ksr.lua @@ -39,14 +39,14 @@ local ksrMock = { } } local ksrMock_MT = { __index = ksrMock, __newindex = lemock.controller():mock() } - function ksrMock.new() + function ksrMock:new() local t = {} if os.getenv('RESULTS') then local file = os.getenv('RESULTS').."/"..logfile t._logger = log_file(file, "%Y-%m-%d") end - t.hdr = hdrMock.new() - t.pv = pvMock.new(t.hdr) + t.hdr = hdrMock:new() + t.pv = pvMock:new(t.hdr) function t.log(level, message) if not t._logger_levels[level] then error(string.format("level %s unknown", tostring(level))) @@ -71,7 +71,7 @@ local ksrMock_MT = { __index = ksrMock, __newindex = lemock.controller():mock() function t.crit(message) t._logger:log(logging.FATAL, message) end - t.pvx = pvxMock.new(t.pv) + t.pvx = pvxMock:new(t.pv) setmetatable(t, ksrMock_MT) return t end diff --git a/mocks/pv.lua b/mocks/pv.lua index 55ef7d3..66c730d 100644 --- a/mocks/pv.lua +++ b/mocks/pv.lua @@ -35,7 +35,7 @@ local pvMock = { crit = logging.FATAL } } - function pvMock.new(hdr) + function pvMock:new(hdr) local t = {} t.__class__ = 'pvMock' diff --git a/mocks/pvx.lua b/mocks/pvx.lua index 3971c0a..34bc73c 100644 --- a/mocks/pvx.lua +++ b/mocks/pvx.lua @@ -32,7 +32,7 @@ local pvxMock = { crit = logging.FATAL } } - function pvxMock.new(pv) + function pvxMock:new(pv) local t = {} t.__class__ = 'pvxMock' diff --git a/ngcp/api_client.lua b/ngcp/api_client.lua index 02ce039..84bf4f3 100644 --- a/ngcp/api_client.lua +++ b/ngcp/api_client.lua @@ -41,7 +41,7 @@ NGCPAPIClient_MT.__tostring = function (t) return string.format("config:%s", utable.tostring(t.config)) end -function NGCPAPIClient.new(config) +function NGCPAPIClient:new(config) local t = NGCPAPIClient.init(utils.merge_defaults(config, defaults)) setmetatable( t, NGCPAPIClient_MT ) return t diff --git a/ngcp/dlgcnt.lua b/ngcp/dlgcnt.lua index e4ee248..7558e6f 100644 --- a/ngcp/dlgcnt.lua +++ b/ngcp/dlgcnt.lua @@ -50,7 +50,7 @@ NGCPDlgCounters_MT.__tostring = function (t) utable.tostring(t.pair)); end -- luacheck: globals KSR - function NGCPDlgCounters.new(config) + function NGCPDlgCounters:new(config) local t = NGCPDlgCounters.init(utils.merge_defaults(config, defaults)) setmetatable( t, NGCPDlgCounters_MT ) return t @@ -59,8 +59,8 @@ end function NGCPDlgCounters.init(config) return { config = config, - central = NGCPRedis.new(config.central), - pair = NGCPRedis.new(config.pair) + central = NGCPRedis:new(config.central), + pair = NGCPRedis:new(config.pair) } end diff --git a/ngcp/dlglist.lua b/ngcp/dlglist.lua index 44a8091..717f2f6 100644 --- a/ngcp/dlglist.lua +++ b/ngcp/dlglist.lua @@ -49,7 +49,7 @@ NGCPDlgList_MT.__tostring = function (t) utable.tostring(t.pair)); end -- luacheck: globals KSR - function NGCPDlgList.new(config) + function NGCPDlgList:new(config) local t = NGCPDlgList.init(utils.merge_defaults(config, defaults)) setmetatable( t, NGCPDlgList_MT ) return t @@ -58,8 +58,8 @@ end function NGCPDlgList.init(config) return { config = config, - central = NGCPRedis.new(config.central), - pair = NGCPRedis.new(config.pair) + central = NGCPRedis:new(config.central), + pair = NGCPRedis:new(config.pair) } end diff --git a/ngcp/loop.lua b/ngcp/loop.lua index 21f6a48..001ad51 100644 --- a/ngcp/loop.lua +++ b/ngcp/loop.lua @@ -42,7 +42,7 @@ NGCPLoop_MT.__tostring = function (t) utable.tostring(t.config)); end -- luacheck: globals KSR - function NGCPLoop.new(config) + function NGCPLoop:new(config) local t = NGCPLoop.init(utils.merge_defaults(config, defaults)) setmetatable( t, NGCPLoop_MT ) return t @@ -51,7 +51,7 @@ end function NGCPLoop.init(config) return { config = config, - redis = NGCPRedis.new(config) + redis = NGCPRedis:new(config) } end diff --git a/ngcp/push.lua b/ngcp/push.lua index 7bc742d..024b20c 100644 --- a/ngcp/push.lua +++ b/ngcp/push.lua @@ -43,7 +43,7 @@ NGCPPush_MT.__tostring = function (t) return string.format("config:%s", utable.tostring(t.config)) end -function NGCPPush.new(config) +function NGCPPush:new(config) local t = NGCPPush.init(utils.merge_defaults(config, defaults)); setmetatable( t, NGCPPush_MT ) return t; @@ -53,7 +53,7 @@ function NGCPPush.init(config) return { config = config, c = curl.easy_init(), - redis = NGCPRedis.new(config.central) + redis = NGCPRedis:new(config.central) } end diff --git a/ngcp/recentcalls.lua b/ngcp/recentcalls.lua index 8d088a3..3ae123c 100644 --- a/ngcp/recentcalls.lua +++ b/ngcp/recentcalls.lua @@ -43,7 +43,7 @@ NGCPRecentCalls_MT.__tostring = function (t) utable.tostring(t.config), utable.tostring(t.redis)) end -- luacheck: globals KSR - function NGCPRecentCalls.new(config) + function NGCPRecentCalls:new(config) local t = NGCPRecentCalls.init(utils.merge_defaults(config, defaults)) setmetatable( t, NGCPRecentCalls_MT ) return t @@ -52,7 +52,7 @@ end function NGCPRecentCalls.init(config) return { config = config, - redis = NGCPRedis.new(config.central) + redis = NGCPRedis:new(config.central) } end diff --git a/ngcp/redis.lua b/ngcp/redis.lua index 21ae64b..087d2ed 100644 --- a/ngcp/redis.lua +++ b/ngcp/redis.lua @@ -36,7 +36,7 @@ NGCPRedis.__tostring = function (t) return string.format("config:%s", utable.tostring(t.config)) end -function NGCPRedis.new(config) +function NGCPRedis:new(config) local t = NGCPRedis:create() t.config = utils.merge_defaults(config, defaults) return t; diff --git a/ngcp/utils.lua b/ngcp/utils.lua index 1476193..1345e46 100644 --- a/ngcp/utils.lua +++ b/ngcp/utils.lua @@ -385,7 +385,7 @@ local Stack_MT = { } -- Create a Table with stack functions -function Stack.new() +function Stack:new() local t = { _et = {} } setmetatable(t, Stack_MT) return t diff --git a/scripts/ngcp-dlglist-clean b/scripts/ngcp-dlglist-clean index b48087d..ccb5766 100644 --- a/scripts/ngcp-dlglist-clean +++ b/scripts/ngcp-dlglist-clean @@ -51,7 +51,7 @@ local args = parser:parse() get_config() -local dlg = NGCPDlgList.new() +local dlg = NGCPDlgList:new() if dlg_config then dlg.config.central.host = dlg_config.central.host dlg.config.central.port = dlg_config.central.port diff --git a/tests/mocks_hdr.lua b/tests/mocks_hdr.lua index ffdf483..b1f3191 100644 --- a/tests/mocks_hdr.lua +++ b/tests/mocks_hdr.lua @@ -24,7 +24,7 @@ local hdrMock = require 'mocks.hdr' -- luacheck: ignore TestHDRMock TestHDRMock = {} function TestHDRMock:setUp() - self.hdr = hdrMock.new() + self.hdr = hdrMock:new() end function TestHDRMock:tearDown() diff --git a/tests/mocks_ksr.lua b/tests/mocks_ksr.lua index a7e7432..010d279 100644 --- a/tests/mocks_ksr.lua +++ b/tests/mocks_ksr.lua @@ -24,7 +24,7 @@ local ksrMock = require 'mocks.ksr' -- luacheck: ignore TestKEMIMock TestKEMIMock = {} function TestKEMIMock:setUp() - self.KSR = ksrMock.new() + self.KSR = ksrMock:new() end function TestKEMIMock:test_hdr_get() diff --git a/tests/mocks_pv.lua b/tests/mocks_pv.lua index a41454a..c12ccba 100644 --- a/tests/mocks_pv.lua +++ b/tests/mocks_pv.lua @@ -25,8 +25,8 @@ local pvMock = require 'mocks.pv' -- luacheck: ignore TestPVMock TestPVMock = {} function TestPVMock:setUp() - local hdr = hdrMock.new() - self.pv = pvMock.new(hdr) + local hdr = hdrMock:new() + self.pv = pvMock:new(hdr) end function TestPVMock:tearDown() diff --git a/tests/mocks_pvx.lua b/tests/mocks_pvx.lua index 8e40756..34efa53 100644 --- a/tests/mocks_pvx.lua +++ b/tests/mocks_pvx.lua @@ -25,8 +25,8 @@ local pvxMock = require 'mocks.pvx' -- luacheck: ignore TestPVXMock TestPVXMock = {} function TestPVXMock:setUp() - self.pv = pvMock.new() - self.pvx = pvxMock.new(self.pv) + self.pv = pvMock:new() + self.pvx = pvxMock:new(self.pv) self.pv.sets("$xavp(test=>uno)", "uno") lu.assertEquals(self.pv.get("$xavp(test[0]=>uno)"), "uno") diff --git a/tests/ngcp.lua b/tests/ngcp.lua index 8f66d56..514da12 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -29,7 +29,7 @@ local utils = require 'ngcp.utils' local utable = utils.table local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env local dp_vars = DPFetch:new() diff --git a/tests/ngcp_api_client.lua b/tests/ngcp_api_client.lua index 06aa8b6..e8b5a8d 100644 --- a/tests/ngcp_api_client.lua +++ b/tests/ngcp_api_client.lua @@ -36,7 +36,7 @@ TestNGCPAPIClient = {} --class local NGCPAPIClient = require 'ngcp.api_client' - self.client = NGCPAPIClient.new() + self.client = NGCPAPIClient:new() lu.assertNotNil(self.client) self.client.c = self.c; diff --git a/tests/ngcp_avp.lua b/tests/ngcp_avp.lua index a7ca169..dd7d891 100644 --- a/tests/ngcp_avp.lua +++ b/tests/ngcp_avp.lua @@ -21,7 +21,7 @@ local lu = require('luaunit') local ksrMock = require 'mocks.ksr' local NGCPAvp = require 'ngcp.avp' -KSR = ksrMock.new() +KSR = ksrMock:new() -- luacheck: ignore TestNGCPAvp TestNGCPAvp = {} --class diff --git a/tests/ngcp_cp.lua b/tests/ngcp_cp.lua index 5078649..e8d9af8 100644 --- a/tests/ngcp_cp.lua +++ b/tests/ngcp_cp.lua @@ -22,7 +22,7 @@ local lemock = require('lemock') local CPFetch = require 'tests_v.cp_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local cp_vars = CPFetch:new() diff --git a/tests/ngcp_dlgcnt.lua b/tests/ngcp_dlgcnt.lua index 83b2665..691bb61 100644 --- a/tests/ngcp_dlgcnt.lua +++ b/tests/ngcp_dlgcnt.lua @@ -36,7 +36,7 @@ TestNGCPDlgCnt = {} --class package.loaded.redis = self.fake_redis local NGCPDlg = require 'ngcp.dlgcnt' - self.dlg = NGCPDlg.new() + self.dlg = NGCPDlg:new() lu.assertEvalToTrue(self.dlg) self.dlg.central.client = self.central; diff --git a/tests/ngcp_dlglist.lua b/tests/ngcp_dlglist.lua index 04c254e..9db6b69 100644 --- a/tests/ngcp_dlglist.lua +++ b/tests/ngcp_dlglist.lua @@ -38,7 +38,7 @@ function TestNGCPDlgList:setUp() package.loaded.redis = self.fake_redis local NGCPDlgList = require 'ngcp.dlglist' - self.dlg = NGCPDlgList.new() + self.dlg = NGCPDlgList:new() lu.assertEvalToTrue(self.dlg) self.dlg.central.client = self.central; diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index 8417d48..7b463e2 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -24,7 +24,7 @@ local lemock = require('lemock') local DPFetch = require 'tests_v.dp_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local dp_vars = DPFetch:new() diff --git a/tests/ngcp_fp.lua b/tests/ngcp_fp.lua index b371cc0..525d963 100644 --- a/tests/ngcp_fp.lua +++ b/tests/ngcp_fp.lua @@ -22,7 +22,7 @@ local lemock = require('lemock') local FPFetch = require 'tests_v.fp_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local fp_vars = FPFetch:new() diff --git a/tests/ngcp_loop.lua b/tests/ngcp_loop.lua index bb3a677..f0dd39e 100644 --- a/tests/ngcp_loop.lua +++ b/tests/ngcp_loop.lua @@ -37,7 +37,7 @@ function TestNGCPLoop:setUp() package.loaded.redis = self.fake_redis local NGCPLoop = require 'ngcp.loop' - self.loop = NGCPLoop.new() + self.loop = NGCPLoop:new() lu.assertNotNil(self.loop) self.loop.redis.client = self.client; diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index 04a06a7..af494da 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -25,7 +25,7 @@ local PPFetch = require 'tests_v.pp_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local pp_vars = PPFetch:new() diff --git a/tests/ngcp_pprof.lua b/tests/ngcp_pprof.lua index 0551817..6d65d89 100644 --- a/tests/ngcp_pprof.lua +++ b/tests/ngcp_pprof.lua @@ -22,7 +22,7 @@ local lemock = require('lemock') local PProfFetch = require 'tests_v.pprof_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local pprof_vars = PProfFetch:new() diff --git a/tests/ngcp_pref.lua b/tests/ngcp_pref.lua index bdbd706..f80d17a 100644 --- a/tests/ngcp_pref.lua +++ b/tests/ngcp_pref.lua @@ -21,7 +21,7 @@ local lu = require('luaunit') local NGCPPrefs = require 'ngcp.pref' -- luacheck: globals KSR local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() -- luacheck: ignore TestNGCPPrefs TestNGCPPrefs = {} --class diff --git a/tests/ngcp_recentcalls.lua b/tests/ngcp_recentcalls.lua index 6d5556f..574b6da 100644 --- a/tests/ngcp_recentcalls.lua +++ b/tests/ngcp_recentcalls.lua @@ -37,7 +37,7 @@ TestNGCPRecentCalls = {} --class package.loaded.redis = self.fake_redis local NGCPRecentCalls = require 'ngcp.recentcalls' - self.rcalls = NGCPRecentCalls.new() + self.rcalls = NGCPRecentCalls:new() lu.assertNotNil(self.rcalls) lu.assertNotNil(self.rcalls.redis) lu.assertNotNil(self.rcalls.redis.config) @@ -46,7 +46,7 @@ TestNGCPRecentCalls = {} --class function TestNGCPRecentCalls:test_config() local NGCPRecentCalls = require 'ngcp.recentcalls' - rcalls = NGCPRecentCalls.new({central = {db = 10}}) + rcalls = NGCPRecentCalls:new({central = {db = 10}}) lu.assertEquals(rcalls.config.central.db, 10) lu.assertNotNil(rcalls.config.central.port) end diff --git a/tests/ngcp_redis.lua b/tests/ngcp_redis.lua index 6cca368..0d8358f 100644 --- a/tests/ngcp_redis.lua +++ b/tests/ngcp_redis.lua @@ -41,7 +41,7 @@ TestNGCPRedis = {} --class package.loaded.redis = self.fake_redis local NGCPRedis = require 'ngcp.redis' - self.ngcp_redis = NGCPRedis.new() + self.ngcp_redis = NGCPRedis:new() lu.assertNotNil(self.ngcp_redis) lu.assertNotNil(self.ngcp_redis.config) self.ngcp_redis.client = self.client; diff --git a/tests/ngcp_rp.lua b/tests/ngcp_rp.lua index 2f780e0..b786d0c 100644 --- a/tests/ngcp_rp.lua +++ b/tests/ngcp_rp.lua @@ -24,7 +24,7 @@ local NGCPPeerPrefs = require 'ngcp.pp' local NGCPRealPrefs = require 'ngcp.rp' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() -- luacheck: ignore TestNGCPRealPrefs TestNGCPRealPrefs = {} --class diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index 530b0c1..936dee8 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -25,7 +25,7 @@ local UPFetch = require 'tests_v.up_vars' local bp_vars = require 'tests_v.bp_vars' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local mc,env,con local up_vars = UPFetch:new() diff --git a/tests/ngcp_xavp.lua b/tests/ngcp_xavp.lua index b69fbdb..b82cb25 100644 --- a/tests/ngcp_xavp.lua +++ b/tests/ngcp_xavp.lua @@ -21,7 +21,7 @@ local lu = require('luaunit') local NGCPXAvp = require 'ngcp.xavp' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() local vals = { { diff --git a/tests/use_cases.lua b/tests/use_cases.lua index da34209..70f0866 100644 --- a/tests/use_cases.lua +++ b/tests/use_cases.lua @@ -22,7 +22,7 @@ local NGCPXAvp = require 'ngcp.xavp' local NGCPAvp = require 'ngcp.avp' local ksrMock = require 'mocks.ksr' -KSR = ksrMock.new() +KSR = ksrMock:new() -- luacheck: ignore TestUseCases TestUseCases = {} diff --git a/tests/utils_stack.lua b/tests/utils_stack.lua index 57dc20b..cbd897d 100644 --- a/tests/utils_stack.lua +++ b/tests/utils_stack.lua @@ -24,7 +24,7 @@ local Stack = utils.Stack -- luacheck: ignore TestStack TestStack = {} function TestStack:test() - local s = Stack.new() + local s = Stack:new() lu.assertEquals(type(s), 'table') lu.assertEquals(s.__class__, 'Stack') end diff --git a/tests_v/cp_vars.lua b/tests_v/cp_vars.lua index 030d505..c474ea2 100644 --- a/tests_v/cp_vars.lua +++ b/tests_v/cp_vars.lua @@ -50,7 +50,7 @@ local CPFetch = { __class__ = 'CPFetch', _i = 1 } - function CPFetch.new() + function CPFetch:new() local t = {} return setmetatable(t, { __index = CPFetch }) end diff --git a/tests_v/dp_vars.lua b/tests_v/dp_vars.lua index c41d5f7..b70ba06 100644 --- a/tests_v/dp_vars.lua +++ b/tests_v/dp_vars.lua @@ -171,7 +171,7 @@ local DPFetch = { __class__ = 'DPFetch', _i = 1 } - function DPFetch.new() + function DPFetch:new() local t = {} return setmetatable(t, { __index = DPFetch }) end diff --git a/tests_v/fp_vars.lua b/tests_v/fp_vars.lua index dea0778..92a2b16 100644 --- a/tests_v/fp_vars.lua +++ b/tests_v/fp_vars.lua @@ -51,7 +51,7 @@ local fp_vars = { local FPFetch = { __class__ = 'FPFetch', } - function FPFetch.new() + function FPFetch:new() local t = {} return setmetatable(t, { __index = FPFetch }) end diff --git a/tests_v/pp_vars.lua b/tests_v/pp_vars.lua index 09b12fa..e1de171 100644 --- a/tests_v/pp_vars.lua +++ b/tests_v/pp_vars.lua @@ -178,7 +178,7 @@ local PPFetch = { __class__ = 'PPFetch', _i = 1 } - function PPFetch.new() + function PPFetch:new() local t = {} return setmetatable(t, { __index = PPFetch }) end diff --git a/tests_v/pprof_vars.lua b/tests_v/pprof_vars.lua index 127d26e..e3c7c4b 100644 --- a/tests_v/pprof_vars.lua +++ b/tests_v/pprof_vars.lua @@ -178,7 +178,7 @@ local PProfFetch = { __class__ = 'PProfFetch', _i = 1 } - function PProfFetch.new() + function PProfFetch:new() local t = {} return setmetatable(t, { __index = PProfFetch }) end diff --git a/tests_v/up_vars.lua b/tests_v/up_vars.lua index 3a450ee..964ab10 100644 --- a/tests_v/up_vars.lua +++ b/tests_v/up_vars.lua @@ -162,7 +162,7 @@ local UPFetch = { __class__ = 'UPFetch', _i = 1 } - function UPFetch.new() + function UPFetch:new() local t = {} return setmetatable(t, { __index = UPFetch }) end