From 280c58fad244683ae5426a59e07f1f9b555f109b Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Wed, 3 Jul 2019 08:29:02 +0200 Subject: [PATCH] TT#62001 Fix tests after update of LuaUnit In the new version of LuaUnit assertTrue() and assertFalse() functions are changed to striclty evaluate that the data is True or false. Where necessary the fuctions have been substituted in the test with the new assertEvalToTrue() or assertNil(). Change-Id: I0c728323752a4458e93f516c7529670433c516d1 --- tests/mocks_hdr.lua | 4 +-- tests/mocks_pv.lua | 54 +++++++++++++++++++------------------- tests/mocks_sr.lua | 2 +- tests/mocks_xavp.lua | 12 ++++----- tests/ngcp.lua | 22 ++++++++-------- tests/ngcp_api_client.lua | 4 +-- tests/ngcp_avp.lua | 2 +- tests/ngcp_cp.lua | 18 ++++++------- tests/ngcp_dlg_var.lua | 2 +- tests/ngcp_dlgcnt.lua | 2 +- tests/ngcp_dlglist.lua | 2 +- tests/ngcp_dp.lua | 18 ++++++------- tests/ngcp_fp.lua | 18 ++++++------- tests/ngcp_loop.lua | 2 +- tests/ngcp_pp.lua | 18 ++++++------- tests/ngcp_pprof.lua | 18 ++++++------- tests/ngcp_recentcalls.lua | 2 +- tests/ngcp_rp.lua | 12 ++++----- tests/ngcp_up.lua | 16 +++++------ tests/ngcp_xavp.lua | 4 +-- tests/utils.lua | 4 +-- 21 files changed, 118 insertions(+), 118 deletions(-) diff --git a/tests/mocks_hdr.lua b/tests/mocks_hdr.lua index 5a19269..569b857 100644 --- a/tests/mocks_hdr.lua +++ b/tests/mocks_hdr.lua @@ -42,7 +42,7 @@ TestHDRMock = {} end function TestHDRMock:test_append() - assertFalse(self.hdr._get_header("From")) + assertNil(self.hdr._get_header("From")) self.hdr.append("From: hi@there.com\r\n") assertEquals(self.hdr.headers, {"From: hi@there.com\r\n"}) self.hdr.append("To: bye@there.com\r\n") @@ -50,7 +50,7 @@ TestHDRMock = {} end function TestHDRMock:test_insert() - assertFalse(self.hdr._get_header("From")) + assertNil(self.hdr._get_header("From")) self.hdr.insert("From: hi@there.com\r\n") assertEquals(self.hdr.headers, {"From: hi@there.com\r\n"}) self.hdr.insert("To: bye@there.com\r\n") diff --git a/tests/mocks_pv.lua b/tests/mocks_pv.lua index c49edc9..6dd22dc 100644 --- a/tests/mocks_pv.lua +++ b/tests/mocks_pv.lua @@ -34,7 +34,7 @@ TestPVMock = {} end function TestPVMock:test_ini() - assertTrue(self.pv) + assertEvalToTrue(self.pv) end function TestPVMock:test_clean_id() @@ -45,7 +45,7 @@ TestPVMock = {} function TestPVMock:test_is_pv_simple() local result = self.pv._is_pv("$si") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'pv') assertEquals(result.id, 'si') assertEquals(result.key, nil) @@ -55,7 +55,7 @@ TestPVMock = {} function TestPVMock:test_is_pv_rw() local result = self.pv._is_pv("$rU") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'pv') assertEquals(result.id, 'rU') assertEquals(result.key, nil) @@ -65,7 +65,7 @@ TestPVMock = {} function TestPVMock:test_is_hdr_simple() local result = self.pv._is_hdr("$hdr(id)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'hdr') assertEquals(result.id, 'id') assertEquals(result.key, nil) @@ -74,7 +74,7 @@ TestPVMock = {} function TestPVMock:test_is_hdr_complex() local result = self.pv._is_hdr("$hdr($si)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'hdr') assertEquals(result.id, '$si') assertEquals(result.key, nil) @@ -83,7 +83,7 @@ TestPVMock = {} function TestPVMock:test_is_xavp_simple() local result = self.pv._is_xavp("$xavp(id=>key)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id') assertEquals(result.key, 'key') @@ -94,7 +94,7 @@ TestPVMock = {} function TestPVMock:test_is_xavp_complex() local result = self.pv._is_xavp("$xavp(id1[8]=>key3g2)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id1') assertEquals(result.key, 'key3g2') @@ -102,7 +102,7 @@ TestPVMock = {} assertIsNil(result.kindx) assertFalse(result.clean) result = self.pv._is_xavp("$xavp(id2g1f[9]=>keygg33_f)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id2g1f') assertEquals(result.key, 'keygg33_f') @@ -113,7 +113,7 @@ TestPVMock = {} function TestPVMock:test_is_xavp_complex_indx() local result = self.pv._is_xavp("$xavp(id1[8]=>key3g2)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id1') assertEquals(result.key, 'key3g2') @@ -121,7 +121,7 @@ TestPVMock = {} assertIsNil(result.kindx) assertFalse(result.clean) result = self.pv._is_xavp("$xavp(id2g1f[9]=>keygg33_f[2])") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id2g1f') assertEquals(result.key, 'keygg33_f') @@ -132,31 +132,31 @@ TestPVMock = {} function TestPVMock:test_is_xavp_complex_indx2() local result = self.pv._is_xavp("$xavp(gogo[9]=>gogo[*])") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'gogo') assertEquals(result.key, 'gogo') assertEquals(result.indx, 9) - assertFalse(result.kindx) + assertNil(result.kindx) assertTrue(result.clean) end function TestPVMock:test_is_xavp_simple_nokey() local result = self.pv._is_xavp("$xavp(id1[8])") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id1') - assertFalse(result.key) + assertNil(result.key) assertEquals(result.indx, 8) assertFalse(result.clean) end function TestPVMock:test_is_xavp_simple_nokey_noindx() local result = self.pv._is_xavp("$xavp(id1)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'xavp') assertEquals(result.id, 'id1') - assertFalse(result.key) + assertNil(result.key) assertIsNil(result.indx) assertIsNil(result.kindx) assertFalse(result.clean) @@ -164,7 +164,7 @@ TestPVMock = {} function TestPVMock:test_is_avp_simple() local result = self.pv._is_avp("$avp(id2_f)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'avp') assertEquals(result.id, 'id2_f') assertIsNil(result.indx) @@ -173,7 +173,7 @@ TestPVMock = {} function TestPVMock:test_is_avp_simple1() local result = self.pv._is_avp("$(avp(s:id))") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'avp') assertEquals(result.id, 'id') assertIsNil(result.indx) @@ -182,7 +182,7 @@ TestPVMock = {} function TestPVMock:test_is_avp_simple2() local result = self.pv._is_avp("$(avp(id))") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'avp') assertEquals(result.id, 'id') assertIsNil(result.indx) @@ -191,7 +191,7 @@ TestPVMock = {} function TestPVMock:test_is_avp_simple3() local result = self.pv._is_avp("$(avp(s:id)[*])") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'avp') assertEquals(result.id, 'id') assertIsNil(result.indx) @@ -200,7 +200,7 @@ TestPVMock = {} function TestPVMock:test_is_avp_simple4() local result = self.pv._is_avp("$(avp(s:id)[1])") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'avp') assertEquals(result.id, 'id') assertEquals(result.indx, 1) @@ -209,7 +209,7 @@ TestPVMock = {} function TestPVMock:test_is_var_simple() local result = self.pv._is_var("$var(id)") - assertTrue(result) + assertEvalToTrue(result) assertEquals(result.type, 'var') assertEquals(result.id, 'id') --print(table.tostring(result)) @@ -315,7 +315,7 @@ TestPVMock = {} function TestPVMock:test_xavp_get() self.pv.sets("$xavp(g=>hithere)", "value") - assertTrue(self.pv.get, "$xavp(g)") + assertEvalToTrue(self.pv.get, "$xavp(g)") end function TestPVMock:test_xavp_get_multi() @@ -346,7 +346,7 @@ TestPVMock = {} self.pv.seti("$avp(s:hithere)", vals[i]) end local l = self.pv.get("$(avp(s:hithere)[*])") - assertTrue(type(l), 'table') + assertEquals(type(l), 'table') assertEquals(#l,#vals) --print(table.tostring(l)) local v = 1 @@ -444,7 +444,7 @@ TestPVMock = {} assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") -- self.pv.unset("$xavp(g[1])") - assertFalse(self.pv.get("$xavp(g[1])")) + assertNil(self.pv.get("$xavp(g[1])")) self.pv.unset("$xavp(g)") assertEquals(self.pv.get("$xavp(g)"), nil) end @@ -462,10 +462,10 @@ TestPVMock = {} assertEquals(self.pv.get("$xavp(g[0]=>t)"), nil) assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") assertEquals(self.pv.get("$xavp(g[1]=>z)"), "value_z") - assertFalse(self.pv.get("$xavp(g[0])")) + assertNil(self.pv.get("$xavp(g[0])")) -- self.pv.unset("$xavp(g[1])") - assertFalse(self.pv.get("$xavp(g[1])")) + assertNil(self.pv.get("$xavp(g[1])")) self.pv.unset("$xavp(g)") assertEquals(self.pv.get("$xavp(g)"), nil) end diff --git a/tests/mocks_sr.lua b/tests/mocks_sr.lua index 0bec81a..c735497 100644 --- a/tests/mocks_sr.lua +++ b/tests/mocks_sr.lua @@ -34,7 +34,7 @@ TestSRMock = {} end function TestSRMock:test_log() - assertTrue(self.sr.log) + assertEvalToTrue(self.sr.log) self.sr.log("dbg", "Hi dude!") assertError(self.sr.log, "debug", "Hi dude!") end diff --git a/tests/mocks_xavp.lua b/tests/mocks_xavp.lua index 499c233..85e8b98 100644 --- a/tests/mocks_xavp.lua +++ b/tests/mocks_xavp.lua @@ -51,37 +51,37 @@ TestXAVPMock = {} function TestXAVPMock:test_get_keys() local l = self.xavp.get_keys("test", 0) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {"uno", "dos", "tres"}) end function TestXAVPMock:test_get_keys_1() local l = self.xavp.get_keys("test", 1) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {"uno", "dos"}) end function TestXAVPMock:test_get_simple() local l = self.xavp.get("test", 0, 1) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {uno=1, dos="dos", tres=3}) end function TestXAVPMock:test_get_simple_1() local l = self.xavp.get("test", 1, 1) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {uno="uno", dos=2}) end function TestXAVPMock:test_get() local l = self.xavp.get("test", 0, 0) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {uno={1,3}, dos={"dos"}, tres={3}}) end function TestXAVPMock:test_get_1() local l = self.xavp.get("test", 1, 0) - assertTrue(l) + assertEvalToTrue(l) assertItemsEquals(l, {uno={"uno"}, dos={2,4}}) end --EOF diff --git a/tests/ngcp.lua b/tests/ngcp.lua index 4ff9e96..a985f3b 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -85,7 +85,7 @@ TestNGCP = {} --class end function TestNGCP:test_config() - assertTrue(self.ngcp.config) + assertEvalToTrue(self.ngcp.config) assert(self.ngcp.config.env) assertIsNil(self.ngcp.config.con) end @@ -108,24 +108,24 @@ TestNGCP = {} --class function TestNGCP:test_prefs_init() sr.log("dbg", "TestNGCP:test_prefs_init") - assertTrue(self.ngcp) - assertTrue(self.ngcp.prefs) - assertTrue(self.ngcp.prefs.peer) + assertEvalToTrue(self.ngcp) + assertEvalToTrue(self.ngcp.prefs) + assertEvalToTrue(self.ngcp.prefs.peer) assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") - assertTrue(self.ngcp.prefs.usr) + assertEvalToTrue(self.ngcp.prefs.usr) assertEquals(sr.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") - assertTrue(self.ngcp.prefs.dom) + assertEvalToTrue(self.ngcp.prefs.dom) assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") - assertTrue(self.ngcp.prefs.real) + assertEvalToTrue(self.ngcp.prefs.real) assertEquals(sr.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") - assertTrue(self.ngcp.prefs.prof) + assertEvalToTrue(self.ngcp.prefs.prof) assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") - assertTrue(self.ngcp.prefs.fax) + assertEvalToTrue(self.ngcp.prefs.fax) assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") end @@ -694,8 +694,8 @@ TestNGCP = {} --class assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.ngcp:clean('caller') assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_peer_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_peer_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_api_client.lua b/tests/ngcp_api_client.lua index 466145b..12d9257 100644 --- a/tests/ngcp_api_client.lua +++ b/tests/ngcp_api_client.lua @@ -37,7 +37,7 @@ TestNGCPAPIClient = {} --class local NGCPAPIClient = require 'ngcp.api_client' self.client = NGCPAPIClient.new() - assertTrue(self.client) + assertEvalToTrue(self.client) self.client.c = self.c; self.client.j = self.j; @@ -81,7 +81,7 @@ TestNGCPAPIClient = {} --class local res = self.client:request(method, request) mc:verify() - assertTrue(res) + assertEvalToTrue(res) assertIs(self.client.c, self.c) end diff --git a/tests/ngcp_avp.lua b/tests/ngcp_avp.lua index 5bb0fd1..de94550 100644 --- a/tests/ngcp_avp.lua +++ b/tests/ngcp_avp.lua @@ -100,7 +100,7 @@ TestNGCPAvp = {} --class function TestNGCPAvp:test_clean() self.avp(1) self.avp:clean() - assertFalse(self.avp()) + assertNil(self.avp()) end function TestNGCPAvp:test_log() diff --git a/tests/ngcp_cp.lua b/tests/ngcp_cp.lua index a9049ac..aed8283 100644 --- a/tests/ngcp_cp.lua +++ b/tests/ngcp_cp.lua @@ -85,17 +85,17 @@ TestNGCPContractPrefs = {} --class end function TestNGCPContractPrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPContractPrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end function TestNGCPContractPrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT * FROM contract_preferences WHERE uuid ='1' AND location_id IS NULL") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(cp_vars:val("cp_1")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) @@ -111,7 +111,7 @@ TestNGCPContractPrefs = {} --class end function TestNGCPContractPrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT location_id FROM provisioning.voip_contract_locations cl JOIN provisioning.voip_contract_location_blocks cb ON cb.location_id = cl.id WHERE cl.contract_id = 2 AND _ipv4_net_from <= UNHEX(HEX(INET_ATON('172.16.15.1'))) AND _ipv4_net_to >= UNHEX(HEX(INET_ATON('172.16.15.1'))) ORDER BY cb.ip DESC, cb.mask DESC LIMIT 1") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns({location_id = 1 }) self.cur:close() @@ -140,7 +140,7 @@ TestNGCPContractPrefs = {} --class self.d:clean() assertEquals(sr.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") - assertFalse(sr.pv.get("$xavp(prof)")) + assertNil(sr.pv.get("$xavp(prof)")) end function TestNGCPContractPrefs:test_callee_clean() @@ -158,8 +158,8 @@ TestNGCPContractPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_contract_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_contract_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_contract_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_contract_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_contract_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_contract_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") @@ -180,8 +180,8 @@ TestNGCPContractPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_contract_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_contract_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_contract_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_contract_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_dlg_var.lua b/tests/ngcp_dlg_var.lua index cf55654..84f1b77 100644 --- a/tests/ngcp_dlg_var.lua +++ b/tests/ngcp_dlg_var.lua @@ -53,7 +53,7 @@ TestNGCPDlgVar = {} --class function TestNGCPDlgVar:test_clean() self.var(1) self.var:clean() - assertFalse(self.var()) + assertNil(self.var()) end function TestNGCPDlgVar:test_log() diff --git a/tests/ngcp_dlgcnt.lua b/tests/ngcp_dlgcnt.lua index 38cf581..6e91550 100644 --- a/tests/ngcp_dlgcnt.lua +++ b/tests/ngcp_dlgcnt.lua @@ -37,7 +37,7 @@ TestNGCPDlgCnt = {} --class local NGCPDlg = require 'ngcp.dlgcnt' self.dlg = NGCPDlg.new() - assertTrue(self.dlg) + assertEvalToTrue(self.dlg) self.dlg.central = self.central; self.dlg.pair = self.pair diff --git a/tests/ngcp_dlglist.lua b/tests/ngcp_dlglist.lua index 41db1e3..5b065c1 100644 --- a/tests/ngcp_dlglist.lua +++ b/tests/ngcp_dlglist.lua @@ -39,7 +39,7 @@ function TestNGCPDlgList:setUp() local NGCPDlgList = require 'ngcp.dlglist' self.dlg = NGCPDlgList.new() - assertTrue(self.dlg) + assertEvalToTrue(self.dlg) self.dlg.central = self.central; self.dlg.pair = self.pair diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index 3fb6a23..16c75e3 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -75,12 +75,12 @@ TestNGCPDomainPrefs = {} --class end function TestNGCPDomainPrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPDomainPrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end @@ -95,7 +95,7 @@ TestNGCPDomainPrefs = {} --class end function TestNGCPDomainPrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(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(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) @@ -112,7 +112,7 @@ TestNGCPDomainPrefs = {} --class end function TestNGCPDomainPrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(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(dp_vars:val("d_192_168_51_56")) self.cur:fetch(mc.ANYARGS) ;mc :returns(dp_vars:val("d_192_168_51_56")) @@ -138,7 +138,7 @@ TestNGCPDomainPrefs = {} --class self.d:clean() assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") - assertFalse(sr.pv.get("$xavp(domain)")) + assertNil(sr.pv.get("$xavp(domain)")) end function TestNGCPDomainPrefs:test_callee_clean() @@ -156,8 +156,8 @@ TestNGCPDomainPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_dom_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_dom_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_dom_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_dom_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") @@ -178,8 +178,8 @@ TestNGCPDomainPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_dom_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_dom_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_dom_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_dom_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_fp.lua b/tests/ngcp_fp.lua index 16756af..c2dbdde 100644 --- a/tests/ngcp_fp.lua +++ b/tests/ngcp_fp.lua @@ -84,17 +84,17 @@ TestNGCPFaxPrefs = {} --class end function TestNGCPFaxPrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPFaxPrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end function TestNGCPFaxPrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT fp.* FROM provisioning.voip_fax_preferences fp, provisioning.voip_subscribers s WHERE s.uuid = 'ah736f72-21d1-4ea6-a3ea-4d7f56b3887c' AND fp.subscriber_id = s.id") ;mc :returns(self.cur) self.cur:getcolnames() ;mc :returns(fp_vars:val("fp_keys")) self.cur:fetch(mc.ANYARGS) ;mc :returns(fp_vars:val("fp_1")) @@ -115,7 +115,7 @@ TestNGCPFaxPrefs = {} --class end function TestNGCPFaxPrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT fp.* FROM provisioning.voip_fax_preferences fp, provisioning.voip_subscribers s WHERE s.uuid = 'ah736f72-21d1-4ea6-a3ea-4d7f56b3887c' AND fp.subscriber_id = s.id") ;mc :returns(self.cur) self.cur:getcolnames() ;mc :returns(fp_vars:val("fp_keys")) self.cur:fetch(mc.ANYARGS) ;mc :returns(fp_vars:val("fp_2")) @@ -146,7 +146,7 @@ TestNGCPFaxPrefs = {} --class self.d:clean() assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") - assertFalse(sr.pv.get("$xavp(fax)")) + assertNil(sr.pv.get("$xavp(fax)")) end function TestNGCPFaxPrefs:test_callee_clean() @@ -164,8 +164,8 @@ TestNGCPFaxPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_fax_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_fax_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_fax_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_fax_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") @@ -186,8 +186,8 @@ TestNGCPFaxPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_fax_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_fax_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_fax_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_fax_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_loop.lua b/tests/ngcp_loop.lua index ae752f4..00dea98 100644 --- a/tests/ngcp_loop.lua +++ b/tests/ngcp_loop.lua @@ -38,7 +38,7 @@ function TestNGCPLoop:setUp() local NGCPLoop = require 'ngcp.loop' self.loop = NGCPLoop.new() - assertTrue(self.loop) + assertEvalToTrue(self.loop) self.loop.client = self.client; self.loop.config.max = 5; diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index 5474328..beb3087 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -103,17 +103,17 @@ TestNGCPPeerPrefs = {} --class end function TestNGCPPeerPrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPPeerPrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end function TestNGCPPeerPrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) 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")) self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) @@ -146,7 +146,7 @@ TestNGCPPeerPrefs = {} --class end function TestNGCPPeerPrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) 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")) self.cur:fetch(mc.ANYARGS) ;mc :returns(pp_vars:val("p_2")) @@ -189,7 +189,7 @@ TestNGCPPeerPrefs = {} --class self.d:clean() assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") - assertFalse(sr.pv.get("$xavp(peer)")) + assertNil(sr.pv.get("$xavp(peer)")) end function TestNGCPPeerPrefs:test_callee_clean() @@ -207,8 +207,8 @@ TestNGCPPeerPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_peer_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_peer_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_peer_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_peer_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") @@ -229,8 +229,8 @@ TestNGCPPeerPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_peer_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_peer_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_pprof.lua b/tests/ngcp_pprof.lua index 45a5d08..d59a345 100644 --- a/tests/ngcp_pprof.lua +++ b/tests/ngcp_pprof.lua @@ -83,17 +83,17 @@ TestNGCPProfilePrefs = {} --class end function TestNGCPProfilePrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPProfilePrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end function TestNGCPProfilePrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT prefs.* FROM provisioning.voip_subscribers as usr LEFT JOIN prof_preferences AS prefs ON usr.profile_id = prefs.uuid WHERE usr.uuid = 'ah736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(pprof_vars:val("prof_2")) self.cur:fetch(mc.ANYARGS) ;mc :returns(pprof_vars:val("prof_2")) @@ -113,7 +113,7 @@ TestNGCPProfilePrefs = {} --class end function TestNGCPProfilePrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT prefs.* FROM provisioning.voip_subscribers as usr LEFT JOIN prof_preferences AS prefs ON usr.profile_id = prefs.uuid WHERE usr.uuid = 'ah736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(pprof_vars:val("prof_2")) self.cur:fetch(mc.ANYARGS) ;mc :returns(pprof_vars:val("prof_2")) @@ -143,7 +143,7 @@ TestNGCPProfilePrefs = {} --class self.d:clean() assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") - assertFalse(sr.pv.get("$xavp(prof)")) + assertNil(sr.pv.get("$xavp(prof)")) end function TestNGCPProfilePrefs:test_callee_clean() @@ -161,8 +161,8 @@ TestNGCPProfilePrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_prof_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_prof_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_prof_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_prof_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") @@ -183,8 +183,8 @@ TestNGCPProfilePrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_prof_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_prof_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_prof_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_prof_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_recentcalls.lua b/tests/ngcp_recentcalls.lua index 4424d15..f479a1f 100644 --- a/tests/ngcp_recentcalls.lua +++ b/tests/ngcp_recentcalls.lua @@ -38,7 +38,7 @@ TestNGCPRecentCalls = {} --class local NGCPRecentCalls = require 'ngcp.recentcalls' self.rcalls = NGCPRecentCalls.new() - assertTrue(self.rcalls) + assertEvalToTrue(self.rcalls) self.rcalls.central = self.central; end diff --git a/tests/ngcp_rp.lua b/tests/ngcp_rp.lua index 37da13b..c24ea34 100644 --- a/tests/ngcp_rp.lua +++ b/tests/ngcp_rp.lua @@ -141,8 +141,8 @@ TestNGCPRealPrefs = {} --class function TestNGCPRealPrefs:test_set() assertEquals(sr.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") assertEquals(sr.pv.get("$xavp(caller_real_prefs=>dummy)"), "caller") - assertFalse(sr.pv.get("$xavp(callee_real_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_real_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_real_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_real_prefs=>foo)")) local callee_xavp = NGCPRealPrefs:xavp("callee") assertEquals(sr.pv.get("$xavp(callee_real_prefs=>dummy)"),'callee') @@ -189,8 +189,8 @@ TestNGCPRealPrefs = {} --class self.real:clean('callee') assertEquals(sr.pv.get("$xavp(caller_real_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_real_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_real_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_real_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_real_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_real_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") @@ -216,8 +216,8 @@ TestNGCPRealPrefs = {} --class self.real:clean('caller') assertEquals(sr.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_real_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_real_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_real_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_real_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_real_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index f6607ec..5161dd8 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -79,12 +79,12 @@ TestNGCPUserPrefs = {} --class end function TestNGCPUserPrefs:test_caller_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:caller_load(), {}) end function TestNGCPUserPrefs:test_callee_load_empty() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) assertEquals(self.d:callee_load(), {}) end @@ -113,7 +113,7 @@ TestNGCPUserPrefs = {} --class end function TestNGCPUserPrefs:test_caller_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id DESC") ;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")) @@ -146,7 +146,7 @@ TestNGCPUserPrefs = {} --class end function TestNGCPUserPrefs:test_callee_load() - assertTrue(self.d.config) + assertEvalToTrue(self.d.config) con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id DESC") ;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")) @@ -205,8 +205,8 @@ TestNGCPUserPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") self.d:clean('callee') assertEquals(sr.pv.get("$xavp(caller_usr_prefs=>dummy)"),'caller') - assertFalse(sr.pv.get("$xavp(callee_usr_prefs=>testid)")) - assertFalse(sr.pv.get("$xavp(callee_usr_prefs=>foo)")) + assertNil(sr.pv.get("$xavp(callee_usr_prefs=>testid)")) + assertNil(sr.pv.get("$xavp(callee_usr_prefs=>foo)")) assertEquals(sr.pv.get("$xavp(caller_usr_prefs=>other)"),1) assertEquals(sr.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") @@ -227,8 +227,8 @@ TestNGCPUserPrefs = {} --class assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") self.d:clean('caller') assertEquals(sr.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertFalse(sr.pv.get("$xavp(caller_usr_prefs=>other)")) - assertFalse(sr.pv.get("$xavp(caller_usr_prefs=>otherfoo)")) + assertNil(sr.pv.get("$xavp(caller_usr_prefs=>other)")) + assertNil(sr.pv.get("$xavp(caller_usr_prefs=>otherfoo)")) assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>testid)"),1) assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") assertEquals(sr.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") diff --git a/tests/ngcp_xavp.lua b/tests/ngcp_xavp.lua index 2d53623..4688e40 100644 --- a/tests/ngcp_xavp.lua +++ b/tests/ngcp_xavp.lua @@ -105,8 +105,8 @@ TestNGCPXAvp = {} --class assertEquals(sr.pv.get("$xavp(caller_peer=>dummy)"),"caller") xavp:clean() assertEquals(sr.pv.get("$xavp(caller_peer=>dummy)"),"caller") - assertFalse(xavp("testid")) - assertFalse(sr.pv.get("$xavp(caller_peer=>testid)")) + assertNil(xavp("testid")) + assertNil(sr.pv.get("$xavp(caller_peer=>testid)")) end function TestNGCPXAvp:test_clean_all() diff --git a/tests/utils.lua b/tests/utils.lua index fbee6d7..3002ab8 100644 --- a/tests/utils.lua +++ b/tests/utils.lua @@ -144,9 +144,9 @@ TestUtils = {} function TestUtils:test_table_tostring() assertError(utils.table.tostring, "nil") assertEquals(utils.table.tostring(self.simple_list), "{1,2,3}") - assertTrue(utils.table.tostring(self.simple_hash)) + assertEvalToTrue(utils.table.tostring(self.simple_hash)) --print(table.tostring(self.simple_hash) .. "\n") - assertTrue(utils.table.tostring(self.complex_hash)) + assertEvalToTrue(utils.table.tostring(self.complex_hash)) --print(table.tostring(self.complex_hash)) end