diff --git a/tests/ngcp.lua b/tests/ngcp.lua index d5589cf..b8bfc1c 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -31,7 +31,12 @@ else argv = {} end +require 'ngcp.ngcp' + local mc,env +local dp_vars = DPFetch:new() +local pp_vars = PPFetch:new() +local up_vars = UPFetch:new() TestNGCP = {} --class @@ -41,20 +46,12 @@ TestNGCP = {} --class self.con = mc:mock() self.cur = mc:mock() - package.loaded.luasql = nil - package.preload['luasql.mysql'] = function () - luasql = {} - luasql.mysql = function () - return env - end - end - - require 'ngcp.ngcp' - self.ngcp = NGCP:new() - self.dp_vars = DPFetch:new() - self.pp_vars = PPFetch:new() - self.up_vars = UPFetch:new() + self.ngcp.config.env = env + self.ngcp.config.con = nil + dp_vars:reset() + pp_vars:reset() + up_vars:reset() end function TestNGCP:tearDown() @@ -66,11 +63,13 @@ TestNGCP = {} --class sr.pv.unset("$xavp(callee_usr_prefs)") sr.pv.unset("$xavp(caller_real_prefs)") sr.pv.unset("$xavp(callee_real_prefs)") - sr.log("info", "---cleaned---") + self.ngcp = nil end function TestNGCP:test_config() assertTrue(self.ngcp.config) + assert(self.ngcp.config.env) + assertIsNil(self.ngcp.config.con) end function TestNGCP:test_config_get_defaults_all() @@ -84,6 +83,11 @@ TestNGCP = {} --class assertItemsEquals(defaults, usr_defaults) end + function TestNGCP:test_config_get_defaults_dom() + local defaults = NGCPConfig.get_defaults(self.ngcp.config, 'dom') + assertItemsEquals(defaults, self.ngcp.config.default.dom) + end + function TestNGCP:test_prefs_init() sr.log("dbg", "TestNGCP:test_prefs_init") assertTrue(self.ngcp) @@ -123,11 +127,11 @@ TestNGCP = {} --class local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -147,8 +151,8 @@ TestNGCP = {} --class local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) self.con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -171,18 +175,23 @@ TestNGCP = {} --class local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) self.con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() - + -- connection check + self.con:execute("SELECT 1") ;mc :returns(self.cur) + self.cur:fetch() ;mc :returns({}) + self.cur:numrows() ;mc :returns(1) + self.cur:close() + -- self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -207,17 +216,22 @@ TestNGCP = {} --class local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) self.con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() - - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + -- connection check + self.con:execute("SELECT 1") ;mc :returns(self.cur) + self.cur:fetch() ;mc :returns({}) + self.cur:numrows() ;mc :returns(1) + self.cur:close() + -- + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -240,9 +254,9 @@ TestNGCP = {} --class function TestNGCP:test_caller_peer_load() local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) - self.con:execute(mc.ANYARGS) ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_enable: "no" - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE" + self.con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) --sst_enable: "no" + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE" self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -262,9 +276,9 @@ TestNGCP = {} --class function TestNGCP:test_callee_peer_load() local c = self.ngcp.config env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con) - self.con:execute(mc.ANYARGS) ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_enable: "no" - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE" + self.con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) --sst_enable: "no" + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE" self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index 9b5ad15..f502d6d 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -28,7 +28,11 @@ if not sr then else argv = {} end + +require 'ngcp.dp' + local mc,env,con +local dp_vars = DPFetch:new() TestNGCPDomainPrefs = {} --class @@ -38,22 +42,13 @@ TestNGCPDomainPrefs = {} --class con = mc:mock() self.cur = mc:mock() - package.loaded.luasql = nil - package.preload['luasql.mysql'] = function () - luasql = {} - luasql.mysql = function () - return env - end - end - - require 'ngcp.dp' - self.config = NGCPConfig:new() + self.config.env = env self.config.getDBConnection = function () return con end self.d = NGCPDomainPrefs:new(self.config) - self.dp_vars = DPFetch:new() + dp_vars:reset() end function TestNGCPDomainPrefs:tearDown() @@ -97,8 +92,8 @@ TestNGCPDomainPrefs = {} --class function TestNGCPDomainPrefs:test_caller_load() assertTrue(self.d.config) con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -114,8 +109,8 @@ TestNGCPDomainPrefs = {} --class function TestNGCPDomainPrefs:test_callee_load() assertTrue(self.d.config) con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index d8f70f3..c95b4ed 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -28,7 +28,11 @@ if not sr then else argv = {} end + +require 'ngcp.dp' + local mc,env,con +local pp_vars = PPFetch:new() TestNGCPPeerPrefs = {} --class @@ -46,15 +50,14 @@ TestNGCPPeerPrefs = {} --class end end - require 'ngcp.dp' - self.config = NGCPConfig:new() + self.config.env = env self.config.getDBConnection = function () return con end self.d = NGCPPeerPrefs:new(self.config) - self.pp_vars = PPFetch:new() + pp_vars:reset() end function TestNGCPPeerPrefs:tearDown() @@ -107,8 +110,8 @@ TestNGCPPeerPrefs = {} --class function TestNGCPPeerPrefs:test_caller_load() assertTrue(self.d.config) con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -126,8 +129,8 @@ TestNGCPPeerPrefs = {} --class function TestNGCPPeerPrefs:test_callee_load() assertTrue(self.d.config) con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index 7389e94..fddd3b0 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -28,7 +28,11 @@ if not sr then else argv = {} end + +require 'ngcp.up' + local mc,env,con +local up_vars = UPFetch:new() TestNGCPUserPrefs = {} --class @@ -46,15 +50,14 @@ TestNGCPUserPrefs = {} --class end end - require 'ngcp.dp' - self.config = NGCPConfig:new() + self.config.env = env self.config.getDBConnection = function () return con end self.d = NGCPUserPrefs:new(self.config) - self.up_vars = UPFetch:new() + up_vars:reset() end function TestNGCPUserPrefs:tearDown() @@ -107,10 +110,10 @@ TestNGCPUserPrefs = {} --class function TestNGCPUserPrefs:test_caller_load() assertTrue(self.d.config) con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() @@ -129,10 +132,10 @@ TestNGCPUserPrefs = {} --class function TestNGCPUserPrefs:test_callee_load() assertTrue(self.d.config) con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) - self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) + self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close()