diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index a01eb3f..f3c1e6b 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -72,7 +72,7 @@ TestNGCPDomainPrefs = {} --class assertTrue(self.d.xavp) assertEquals(self.d.xavp("sst_enable"),"no") - print(table.tostring(sr.pv.vars)) + --print(table.tostring(sr.pv.vars)) assertFalse(sr.pv.vars["$xavp(domain[1]=>dummy)"]) assertEquals(sr.pv.vars["$xavp(domain[1]=>sst_enable)"],"no") assertFalse(self.d.xavp("error_key")) diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index 4c77840..20474cf 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -2,31 +2,31 @@ require('luaunit') require 'mocks.sr' require 'ngcp.utils' +require 'tests_v.pp_vars' sr = srMock:new() +local mc = nil -local mc = lemock.controller() -local config = mc:mock() -local mysql = mc:mock() -local env = mc:mock() -local con = mc:mock() -local cur = mc:mock() +TestNGCPPeerPrefs = {} --class -package.loaded.luasql = nil -package.preload['luasql.mysql'] = function () - luasql = {} - luasql.mysql = mysql - return mysql -end + function TestNGCPPeerPrefs:setUp() + mc = lemock.controller() + self.config = mc:mock() + self.mysql = mc:mock() + self.env = mc:mock() + self.con = mc:mock() + self.cur = mc:mock() -require 'ngcp.pp' -require 'tests_v.pp_vars' + package.loaded.luasql = nil + package.preload['luasql.mysql'] = function () + luasql = {} + luasql.mysql = mysql + return mysql + end -TestNGCPPeerPrefs = {} --class + require 'ngcp.pp' - function TestNGCPPeerPrefs:setUp() - --print("TestNGCPPeerPrefs:setUp") - self.d = NGCPPeerPrefs:new(config) + self.d = NGCPPeerPrefs:new(self.config) end function TestNGCPPeerPrefs:tearDown() @@ -40,11 +40,11 @@ TestNGCPPeerPrefs = {} --class function TestNGCPPeerPrefs:test_caller_load() assertTrue(self.d.config) - config:getDBConnection() ;mc :returns(con) - con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(cur) - cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars["p_2"]) - cur:close() - con:close() + self.config:getDBConnection() ;mc :returns(self.con) + self.con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars["p_2"]) + self.cur:close() + self.con:close() mc:replay() self.d:caller_load("2") @@ -56,6 +56,25 @@ TestNGCPPeerPrefs = {} --class assertEquals(self.d.xavp("use_rtpproxy"),"ice_strip_candidates") assertEquals(self.d.xavp("rewrite_caller_in_dpid"),1) end + + function TestNGCPPeerPrefs:test_callee_load() + assertTrue(self.d.config) + self.config:getDBConnection() ;mc :returns(self.con) + self.con:execute("SELECT * FROM peer_preferences WHERE uuid = '2'") ;mc :returns(self.cur) + self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars["p_2"]) + self.cur:close() + self.con:close() + + mc:replay() + self.d:callee_load("2") + mc:verify() + + assertTrue(self.d.xavp) + assertEquals(self.d.xavp("sst_enable"),"no") + assertFalse(self.d.xavp("cc"),"43") + assertEquals(self.d.xavp("use_rtpproxy"),"ice_strip_candidates") + assertEquals(self.d.xavp("rewrite_caller_in_dpid"),1) + end -- class TestNGCPPeerPrefs ---- Control test output: