diff --git a/run_tests.sh b/run_tests.sh index cd51ff0..6246d83 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -31,21 +31,19 @@ function do_test() { echo "testing $1 -> ${RES}" if ${OUT_FORCE} ; then cat< "${RES}" -EXPORT_ASSERT_TO_GLOBALS = true +local lu = require('luaunit') require "tests/${1}" ---- Control test output: -local lu = LuaUnit -lu:setOutputType('${FORMAT}') -lu:run() +lu.LuaUnit:setOutputType('${FORMAT}') +lu.LuaUnit:run() EOF else cat< +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local hdrMock = require 'mocks.hdr' -- luacheck: ignore TestHDRMock @@ -33,36 +33,36 @@ TestHDRMock = {} end function TestHDRMock:test_is_header() - assertTrue(self.hdr._is_header("From: hi@there.com\r\n")) - assertFalse(self.hdr._is_header("From hi@there.com\r\n")) - assertFalse(self.hdr._is_header("From: hi@there.com\r")) - assertFalse(self.hdr._is_header("From : hi@there.com\n")) - assertFalse(self.hdr._is_header("From : hi@there.com\n\r")) - assertTrue(self.hdr._is_header("From: hi@there.com:8080\r\n")) + lu.assertTrue(self.hdr._is_header("From: hi@there.com\r\n")) + lu.assertFalse(self.hdr._is_header("From hi@there.com\r\n")) + lu.assertFalse(self.hdr._is_header("From: hi@there.com\r")) + lu.assertFalse(self.hdr._is_header("From : hi@there.com\n")) + lu.assertFalse(self.hdr._is_header("From : hi@there.com\n\r")) + lu.assertTrue(self.hdr._is_header("From: hi@there.com:8080\r\n")) end function TestHDRMock:test_append() - assertNil(self.hdr._get_header("From")) + lu.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"}) + lu.assertEquals(self.hdr.headers, {"From: hi@there.com\r\n"}) self.hdr.append("To: bye@there.com\r\n") - assertEquals(self.hdr.headers, {"From: hi@there.com\r\n", "To: bye@there.com\r\n"}) + lu.assertEquals(self.hdr.headers, {"From: hi@there.com\r\n", "To: bye@there.com\r\n"}) end function TestHDRMock:test_insert() - assertNil(self.hdr._get_header("From")) + lu.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"}) + lu.assertEquals(self.hdr.headers, {"From: hi@there.com\r\n"}) self.hdr.insert("To: bye@there.com\r\n") - assertEquals(self.hdr.headers, {"To: bye@there.com\r\n", "From: hi@there.com\r\n"}) + lu.assertEquals(self.hdr.headers, {"To: bye@there.com\r\n", "From: hi@there.com\r\n"}) end function TestHDRMock:test_get_header() self:test_append() - assertEquals(self.hdr._get_header("From"), "hi@there.com") + lu.assertEquals(self.hdr._get_header("From"), "hi@there.com") end function TestHDRMock:test_hdr_get() self.hdr.insert("From: hola\r\n") - assertEquals(self.hdr.headers, {"From: hola\r\n"}) + lu.assertEquals(self.hdr.headers, {"From: hola\r\n"}) end diff --git a/tests/mocks_ksr.lua b/tests/mocks_ksr.lua index 0e06938..a7e7432 100644 --- a/tests/mocks_ksr.lua +++ b/tests/mocks_ksr.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' -- luacheck: ignore TestKEMIMock @@ -29,12 +29,12 @@ TestKEMIMock = {} function TestKEMIMock:test_hdr_get() self.KSR.hdr.insert("From: hola\r\n") - assertEquals(self.KSR.hdr.headers, {"From: hola\r\n"}) - assertEquals(self.KSR.pv.get("$hdr(From)"), "hola") + lu.assertEquals(self.KSR.hdr.headers, {"From: hola\r\n"}) + lu.assertEquals(self.KSR.pv.get("$hdr(From)"), "hola") end function TestKEMIMock:test_log() - assertEvalToTrue(self.KSR.log) + lu.assertNotNil(self.KSR.log) self.KSR.log("dbg", "Hi dude!") - assertError(self.KSR.log, "debug", "Hi dude!") + lu.assertError(self.KSR.log, "debug", "Hi dude!") end diff --git a/tests/mocks_pv.lua b/tests/mocks_pv.lua index 6dd22dc..9ab207f 100644 --- a/tests/mocks_pv.lua +++ b/tests/mocks_pv.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local hdrMock = require 'mocks.hdr' local pvMock = require 'mocks.pv' @@ -34,310 +34,310 @@ TestPVMock = {} end function TestPVMock:test_ini() - assertEvalToTrue(self.pv) + lu.assertNotNil(self.pv) end function TestPVMock:test_clean_id() - assertEquals(self.pv._clean_id('s:u25'), 'u25') - assertEquals(self.pv._clean_id('i:u25'), 'u25') - assertEquals(self.pv._clean_id('u25'), 'u25') + lu.assertEquals(self.pv._clean_id('s:u25'), 'u25') + lu.assertEquals(self.pv._clean_id('i:u25'), 'u25') + lu.assertEquals(self.pv._clean_id('u25'), 'u25') end function TestPVMock:test_is_pv_simple() local result = self.pv._is_pv("$si") - assertEvalToTrue(result) - assertEquals(result.type, 'pv') - assertEquals(result.id, 'si') - assertEquals(result.key, nil) - assertEquals(result.mode, 'ro') - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'pv') + lu.assertEquals(result.id, 'si') + lu.assertEquals(result.key, nil) + lu.assertEquals(result.mode, 'ro') + lu.assertFalse(result.clean) end function TestPVMock:test_is_pv_rw() local result = self.pv._is_pv("$rU") - assertEvalToTrue(result) - assertEquals(result.type, 'pv') - assertEquals(result.id, 'rU') - assertEquals(result.key, nil) - assertEquals(result.mode, 'rw') - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'pv') + lu.assertEquals(result.id, 'rU') + lu.assertEquals(result.key, nil) + lu.assertEquals(result.mode, 'rw') + lu.assertFalse(result.clean) end function TestPVMock:test_is_hdr_simple() local result = self.pv._is_hdr("$hdr(id)") - assertEvalToTrue(result) - assertEquals(result.type, 'hdr') - assertEquals(result.id, 'id') - assertEquals(result.key, nil) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'hdr') + lu.assertEquals(result.id, 'id') + lu.assertEquals(result.key, nil) + lu.assertFalse(result.clean) end function TestPVMock:test_is_hdr_complex() local result = self.pv._is_hdr("$hdr($si)") - assertEvalToTrue(result) - assertEquals(result.type, 'hdr') - assertEquals(result.id, '$si') - assertEquals(result.key, nil) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'hdr') + lu.assertEquals(result.id, '$si') + lu.assertEquals(result.key, nil) + lu.assertFalse(result.clean) end function TestPVMock:test_is_xavp_simple() local result = self.pv._is_xavp("$xavp(id=>key)") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id') - assertEquals(result.key, 'key') - assertIsNil(result.indx) - assertIsNil(result.kindx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id') + lu.assertEquals(result.key, 'key') + lu.assertIsNil(result.indx) + lu.assertIsNil(result.kindx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_xavp_complex() local result = self.pv._is_xavp("$xavp(id1[8]=>key3g2)") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id1') - assertEquals(result.key, 'key3g2') - assertEquals(result.indx, 8) - assertIsNil(result.kindx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id1') + lu.assertEquals(result.key, 'key3g2') + lu.assertEquals(result.indx, 8) + lu.assertIsNil(result.kindx) + lu.assertFalse(result.clean) result = self.pv._is_xavp("$xavp(id2g1f[9]=>keygg33_f)") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id2g1f') - assertEquals(result.key, 'keygg33_f') - assertEquals(result.indx, 9) - assertIsNil(result.kindx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id2g1f') + lu.assertEquals(result.key, 'keygg33_f') + lu.assertEquals(result.indx, 9) + lu.assertIsNil(result.kindx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_xavp_complex_indx() local result = self.pv._is_xavp("$xavp(id1[8]=>key3g2)") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id1') - assertEquals(result.key, 'key3g2') - assertEquals(result.indx, 8) - assertIsNil(result.kindx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id1') + lu.assertEquals(result.key, 'key3g2') + lu.assertEquals(result.indx, 8) + lu.assertIsNil(result.kindx) + lu.assertFalse(result.clean) result = self.pv._is_xavp("$xavp(id2g1f[9]=>keygg33_f[2])") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id2g1f') - assertEquals(result.key, 'keygg33_f') - assertEquals(result.indx, 9) - assertEquals(result.kindx, 2) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id2g1f') + lu.assertEquals(result.key, 'keygg33_f') + lu.assertEquals(result.indx, 9) + lu.assertEquals(result.kindx, 2) + lu.assertFalse(result.clean) end function TestPVMock:test_is_xavp_complex_indx2() local result = self.pv._is_xavp("$xavp(gogo[9]=>gogo[*])") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'gogo') - assertEquals(result.key, 'gogo') - assertEquals(result.indx, 9) - assertNil(result.kindx) - assertTrue(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'gogo') + lu.assertEquals(result.key, 'gogo') + lu.assertEquals(result.indx, 9) + lu.assertNil(result.kindx) + lu.assertTrue(result.clean) end function TestPVMock:test_is_xavp_simple_nokey() local result = self.pv._is_xavp("$xavp(id1[8])") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id1') - assertNil(result.key) - assertEquals(result.indx, 8) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id1') + lu.assertNil(result.key) + lu.assertEquals(result.indx, 8) + lu.assertFalse(result.clean) end function TestPVMock:test_is_xavp_simple_nokey_noindx() local result = self.pv._is_xavp("$xavp(id1)") - assertEvalToTrue(result) - assertEquals(result.type, 'xavp') - assertEquals(result.id, 'id1') - assertNil(result.key) - assertIsNil(result.indx) - assertIsNil(result.kindx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'xavp') + lu.assertEquals(result.id, 'id1') + lu.assertNil(result.key) + lu.assertIsNil(result.indx) + lu.assertIsNil(result.kindx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_avp_simple() local result = self.pv._is_avp("$avp(id2_f)") - assertEvalToTrue(result) - assertEquals(result.type, 'avp') - assertEquals(result.id, 'id2_f') - assertIsNil(result.indx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'avp') + lu.assertEquals(result.id, 'id2_f') + lu.assertIsNil(result.indx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_avp_simple1() local result = self.pv._is_avp("$(avp(s:id))") - assertEvalToTrue(result) - assertEquals(result.type, 'avp') - assertEquals(result.id, 'id') - assertIsNil(result.indx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'avp') + lu.assertEquals(result.id, 'id') + lu.assertIsNil(result.indx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_avp_simple2() local result = self.pv._is_avp("$(avp(id))") - assertEvalToTrue(result) - assertEquals(result.type, 'avp') - assertEquals(result.id, 'id') - assertIsNil(result.indx) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'avp') + lu.assertEquals(result.id, 'id') + lu.assertIsNil(result.indx) + lu.assertFalse(result.clean) end function TestPVMock:test_is_avp_simple3() local result = self.pv._is_avp("$(avp(s:id)[*])") - assertEvalToTrue(result) - assertEquals(result.type, 'avp') - assertEquals(result.id, 'id') - assertIsNil(result.indx) - assertTrue(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'avp') + lu.assertEquals(result.id, 'id') + lu.assertIsNil(result.indx) + lu.assertTrue(result.clean) end function TestPVMock:test_is_avp_simple4() local result = self.pv._is_avp("$(avp(s:id)[1])") - assertEvalToTrue(result) - assertEquals(result.type, 'avp') - assertEquals(result.id, 'id') - assertEquals(result.indx, 1) - assertFalse(result.clean) + lu.assertNotNil(result) + lu.assertEquals(result.type, 'avp') + lu.assertEquals(result.id, 'id') + lu.assertEquals(result.indx, 1) + lu.assertFalse(result.clean) end function TestPVMock:test_is_var_simple() local result = self.pv._is_var("$var(id)") - assertEvalToTrue(result) - assertEquals(result.type, 'var') - assertEquals(result.id, 'id') + lu.assertNotNil(result) + lu.assertEquals(result.type, 'var') + lu.assertEquals(result.id, 'id') --print(table.tostring(result)) - assertFalse(result.clean) + lu.assertFalse(result.clean) end function TestPVMock:test_var_sets() self.pv.sets("$var(hithere)", "value") - assertEquals(self.pv.get("$var(hithere)"), "value") - assertError(self.pv.sets, "$var(hithere)", 1) - assertError(self.pv.sets, "$var(s:hithere)", "1") - assertError(self.pv.sets, "$(var(hithere)[*])", "1") - assertError(self.pv.sets, "$(var(s:hithere))", "1") + 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") + lu.assertError(self.pv.sets, "$(var(hithere)[*])", "1") + lu.assertError(self.pv.sets, "$(var(s:hithere))", "1") self.pv.sets("$(var(hithere))", "new_value") - assertEquals(self.pv.get("$var(hithere)"), "new_value") - assertEquals(self.pv.vars["var:hithere"], "new_value") + lu.assertEquals(self.pv.get("$var(hithere)"), "new_value") + lu.assertEquals(self.pv.vars["var:hithere"], "new_value") end function TestPVMock:test_var_seti() self.pv.seti("$var(hithere)", 0) - assertEquals(self.pv.get("$var(hithere)"), 0) - assertError(self.pv.seti, "$var(hithere)", "1") - assertError(self.pv.sets, "$var(s:hithere)", 1) - assertError(self.pv.sets, "$(var(hithere)[*])", 1) - assertError(self.pv.sets, "$(var(s:hithere))", 1) - assertEquals(self.pv.get("$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) + lu.assertEquals(self.pv.get("$var(hithere)"), 0) self.pv.seti("$var(hithere)", 1) - assertEquals(self.pv.get("$var(hithere)"), 1) - assertEquals(self.pv.vars["var:hithere"], 1) + lu.assertEquals(self.pv.get("$var(hithere)"), 1) + lu.assertEquals(self.pv.vars["var:hithere"], 1) end function TestPVMock:test_avp_sets() self.pv.sets("$avp(s:hithere)", "value") - assertEquals(self.pv.get("$avp(hithere)"), "value") - assertError(self.pv.sets, "$avp(hithere)", 1) + lu.assertEquals(self.pv.get("$avp(hithere)"), "value") + lu.assertError(self.pv.sets, "$avp(hithere)", 1) self.pv.sets("$(avp(hithere)[*])", "1") - assertEquals(self.pv.get("$avp(s:hithere)"), "1") + lu.assertEquals(self.pv.get("$avp(s:hithere)"), "1") self.pv.sets("$(avp(hithere))", "new_value") - assertEquals(self.pv.vars["avp:hithere"]:list(), {"new_value","1"}) - assertEquals(self.pv.get("$avp(hithere)"), "new_value") - assertEquals(self.pv.get("$(avp(hithere))"), "new_value") + lu.assertEquals(self.pv.vars["avp:hithere"]:list(), {"new_value","1"}) + lu.assertEquals(self.pv.get("$avp(hithere)"), "new_value") + lu.assertEquals(self.pv.get("$(avp(hithere))"), "new_value") end function TestPVMock:test_avp_sets_all() self.pv.sets("$avp(s:hithere)", "value") - assertEquals(self.pv.get("$avp(hithere)"), "value") - assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) + lu.assertEquals(self.pv.get("$avp(hithere)"), "value") + lu.assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) self.pv.sets("$avp(s:hithere)", "value1") - assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value1","value"}) + lu.assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value1","value"}) end function TestPVMock:test_avp_seti() self.pv.seti("$avp(s:hithere)", 0) - assertEquals(self.pv.get("$avp(s:hithere)"), 0) - assertError(self.pv.seti, "$avp(s:hithere)", "1") + lu.assertEquals(self.pv.get("$avp(s:hithere)"), 0) + lu.assertError(self.pv.seti, "$avp(s:hithere)", "1") self.pv.seti("$(avp(hithere))", 2) - assertEquals(self.pv.vars["avp:hithere"]:list(), {2,0}) - assertEquals(self.pv.get("$avp(hithere)"), 2) - assertEquals(self.pv.get("$(avp(hithere))"), 2) + lu.assertEquals(self.pv.vars["avp:hithere"]:list(), {2,0}) + lu.assertEquals(self.pv.get("$avp(hithere)"), 2) + lu.assertEquals(self.pv.get("$(avp(hithere))"), 2) end function TestPVMock:test_xavp_sets() self.pv.sets("$xavp(g=>hithere)", "value") - assertEquals(self.pv.get("$xavp(g=>hithere)"), "value") + lu.assertEquals(self.pv.get("$xavp(g=>hithere)"), "value") self.pv.sets("$xavp(g=>bythere)", "value_bye") - assertEquals(self.pv.get("$xavp(g=>bythere)"), "value_bye") + lu.assertEquals(self.pv.get("$xavp(g=>bythere)"), "value_bye") end function TestPVMock:test_xavp_sets_multi() self.pv.sets("$xavp(g=>hithere)", "value1") - assertEquals(self.pv.get("$xavp(g=>hithere)"), "value1") + lu.assertEquals(self.pv.get("$xavp(g=>hithere)"), "value1") self.pv.sets("$xavp(g[0]=>hithere)", "value0") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value0") - assertEquals(self.pv.get("$xavp(g=>hithere[1])"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value0") + lu.assertEquals(self.pv.get("$xavp(g=>hithere[1])"), "value1") end function TestPVMock:test_xavp_sets1() self.pv.sets("$xavp(g=>hithere)", "value") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value") self.pv.sets("$xavp(g=>hithere)", "value_bye") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value_bye") - assertEquals(self.pv.get("$xavp(g[1]=>hithere)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value_bye") + lu.assertEquals(self.pv.get("$xavp(g[1]=>hithere)"), "value") end function TestPVMock:test_xavp_sets1_multi() self.pv.sets("$xavp(g=>hithere)", "value1") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value1") self.pv.sets("$xavp(g[0]=>hithere)", "value0") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value0") - assertEquals(self.pv.get("$xavp(g[0]=>hithere[1])"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value0") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere[1])"), "value1") self.pv.sets("$xavp(g=>hithere)", "value_bye") - assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value_bye") - assertEquals(self.pv.get("$xavp(g[1]=>hithere)"), "value0") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere)"), "value_bye") + lu.assertEquals(self.pv.get("$xavp(g[1]=>hithere)"), "value0") end function TestPVMock:test_xavp_seti() self.pv.seti("$xavp(t=>hithere)", 0) - assertEquals(self.pv.get("$xavp(t[0]=>hithere)"), 0) - assertEquals(self.pv.get("$xavp(t=>hithere)"), 0) - assertError(self.pv.seti, "$xavp(t=>hithere)", "1") - assertError(self.pv.seti, "$xavp(t[6]=>hithere)", "1") + lu.assertEquals(self.pv.get("$xavp(t[0]=>hithere)"), 0) + lu.assertEquals(self.pv.get("$xavp(t=>hithere)"), 0) + lu.assertError(self.pv.seti, "$xavp(t=>hithere)", "1") + lu.assertError(self.pv.seti, "$xavp(t[6]=>hithere)", "1") end function TestPVMock:test_xavp_get() self.pv.sets("$xavp(g=>hithere)", "value") - assertEvalToTrue(self.pv.get, "$xavp(g)") + lu.assertNotNil(self.pv.get, "$xavp(g)") end function TestPVMock:test_xavp_get_multi() self.pv.sets("$xavp(g=>hithere)", "value1") self.pv.sets("$xavp(g[0]=>hithere)", "value2") - assertEquals(self.pv.get("$xavp(g[0]=>hithere[0])"), "value2") - assertEquals(self.pv.get("$xavp(g[0]=>hithere[1])"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere[0])"), "value2") + lu.assertEquals(self.pv.get("$xavp(g[0]=>hithere[1])"), "value1") end function TestPVMock:test_avp_get_simple() self.pv.sets("$avp(s:hithere)", "value") - assertEquals(self.pv.get("$avp(s:hithere)"), "value") + lu.assertEquals(self.pv.get("$avp(s:hithere)"), "value") end function TestPVMock:test_avp_get_simple2() self.pv.seti("$avp(s:hithere)", 1) - assertEquals(self.pv.get("$avp(s:hithere)"), 1) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), 1) end function TestPVMock:test_avp_get_simple3() self.pv.seti("$avp(s:hithere)", 1) - assertEquals(self.pv.get("$(avp(s:hithere)[0])"), 1) + lu.assertEquals(self.pv.get("$(avp(s:hithere)[0])"), 1) end function TestPVMock:test_avp_get() @@ -346,12 +346,12 @@ TestPVMock = {} self.pv.seti("$avp(s:hithere)", vals[i]) end local l = self.pv.get("$(avp(s:hithere)[*])") - assertEquals(type(l), 'table') - assertEquals(#l,#vals) + lu.assertEquals(type(l), 'table') + lu.assertEquals(#l,#vals) --print(table.tostring(l)) local v = 1 for i=#vals,1,-1 do - assertEquals(l[i],vals[v]) + lu.assertEquals(l[i],vals[v]) v = v + 1 end end @@ -364,127 +364,127 @@ TestPVMock = {} local l = "$(avp(s:hithere)[%d])" local v = 1 for i=#vals,1,-1 do - assertEquals(self.pv.get(string.format(l, i-1)), vals[v]) + lu.assertEquals(self.pv.get(string.format(l, i-1)), vals[v]) v = v + 1 end end function TestPVMock:test_avp_get_all() self.pv.sets("$avp(s:hithere)", "value") - assertEquals(self.pv.get("$avp(hithere)"), "value") - assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) + lu.assertEquals(self.pv.get("$avp(hithere)"), "value") + lu.assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) self.pv.sets("$avp(s:hithere)", "value1") - assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value1","value"}) + lu.assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value1","value"}) self.pv.sets("$(avp(s:hithere)[*])", "new_value") - assertEquals(self.pv.get("$avp(s:hithere)"), "new_value") - assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {"new_value"}) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), "new_value") + lu.assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {"new_value"}) end function TestPVMock:test_hdr_get() self.pv.hdr.insert("From: hola\r\n") - assertEquals(self.pv.get("$hdr(From)"), "hola") + lu.assertEquals(self.pv.get("$hdr(From)"), "hola") end function TestPVMock:test_pv_seti() self.pv.seti("$rU", 0) - assertEquals(self.pv.get("$rU"), 0) + lu.assertEquals(self.pv.get("$rU"), 0) end function TestPVMock:test_pv_sets() self.pv.sets("$rU", "0") - assertEquals(self.pv.get("$rU"), "0") + lu.assertEquals(self.pv.get("$rU"), "0") end function TestPVMock:test_unset_var() self.pv.sets("$var(hithere)", "value") - assertEquals(self.pv.get("$var(hithere)"), "value") + lu.assertEquals(self.pv.get("$var(hithere)"), "value") self.pv.unset("$var(hithere)") - assertEquals(self.pv.get("$var(hithere)"), nil) + lu.assertEquals(self.pv.get("$var(hithere)"), nil) self.pv.unset("$var(hithere)") end function TestPVMock:test_unset_avp() self.pv.sets("$avp(s:hithere)", "value") - assertEquals(self.pv.get("$avp(hithere)"), "value") + lu.assertEquals(self.pv.get("$avp(hithere)"), "value") self.pv.unset("$avp(s:hithere)") - assertEquals(self.pv.get("$avp(hithere)"), nil) + lu.assertEquals(self.pv.get("$avp(hithere)"), nil) self.pv.unset("$avp(s:hithere)") - assertEquals(self.pv.get("$avp(s:hithere)"), nil) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), nil) end function TestPVMock:test_unset_avp_2() self.pv.sets("$avp(s:hithere)", "value") self.pv.sets("$avp(s:hithere)", "other") - assertEquals(self.pv.get("$avp(hithere)"), "other") + lu.assertEquals(self.pv.get("$avp(hithere)"), "other") self.pv.unset("$avp(s:hithere)") - assertEquals(self.pv.get("$avp(hithere)"), "value") + lu.assertEquals(self.pv.get("$avp(hithere)"), "value") self.pv.unset("$(avp(s:hithere)[*])") - assertEquals(self.pv.get("$avp(s:hithere)"), nil) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), nil) end function TestPVMock:test_unset_avp_3() self.pv.sets("$avp(s:hithere)", "value") self.pv.sets("$avp(s:hithere)", "other") - assertEquals(self.pv.get("$(avp(hithere)[0])"), "other") - assertEquals(self.pv.get("$(avp(hithere)[1])"), "value") + lu.assertEquals(self.pv.get("$(avp(hithere)[0])"), "other") + lu.assertEquals(self.pv.get("$(avp(hithere)[1])"), "value") -- same behavior than kamailio!! self.pv.unset("$(avp(s:hithere)[1])") - assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) + lu.assertEquals(self.pv.get("$(avp(hithere)[*])"), {"value"}) end function TestPVMock:test_unset_xavp() self.pv.sets("$xavp(g=>t)", "value") - assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value") self.pv.sets("$xavp(g=>t)", "value1") - assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value1") - assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") -- self.pv.unset("$xavp(g[0]=>t)") - assertEquals(self.pv.get("$xavp(g[0]=>t)"), nil) - assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), nil) + lu.assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") -- self.pv.unset("$xavp(g[1])") - assertNil(self.pv.get("$xavp(g[1])")) + lu.assertNil(self.pv.get("$xavp(g[1])")) self.pv.unset("$xavp(g)") - assertEquals(self.pv.get("$xavp(g)"), nil) + lu.assertEquals(self.pv.get("$xavp(g)"), nil) end function TestPVMock:test_unset_xavp1() self.pv.sets("$xavp(g=>t)", "value") - assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value") self.pv.sets("$xavp(g=>t)", "value1") - assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value1") - assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), "value1") + lu.assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") self.pv.sets("$xavp(g[1]=>z)", "value_z") - assertEquals(self.pv.get("$xavp(g[1]=>z)"), "value_z") + lu.assertEquals(self.pv.get("$xavp(g[1]=>z)"), "value_z") -- self.pv.unset("$xavp(g[0])") - 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") - assertNil(self.pv.get("$xavp(g[0])")) + lu.assertEquals(self.pv.get("$xavp(g[0]=>t)"), nil) + lu.assertEquals(self.pv.get("$xavp(g[1]=>t)"), "value") + lu.assertEquals(self.pv.get("$xavp(g[1]=>z)"), "value_z") + lu.assertNil(self.pv.get("$xavp(g[0])")) -- self.pv.unset("$xavp(g[1])") - assertNil(self.pv.get("$xavp(g[1])")) + lu.assertNil(self.pv.get("$xavp(g[1])")) self.pv.unset("$xavp(g)") - assertEquals(self.pv.get("$xavp(g)"), nil) + lu.assertEquals(self.pv.get("$xavp(g)"), nil) end function TestPVMock:test_is_null() - assertTrue(self.pv.is_null("$avp(s:hithere)")) + lu.assertTrue(self.pv.is_null("$avp(s:hithere)")) self.pv.unset("$avp(s:hithere)") - assertTrue(self.pv.is_null("$avp(s:hithere)")) + lu.assertTrue(self.pv.is_null("$avp(s:hithere)")) self.pv.sets("$avp(s:hithere)", "value") - assertFalse(self.pv.is_null("$avp(s:hithere)")) + lu.assertFalse(self.pv.is_null("$avp(s:hithere)")) self.pv.sets("$avp(s:hithere)", "value") - assertFalse(self.pv.is_null("$avp(s:hithere)")) + lu.assertFalse(self.pv.is_null("$avp(s:hithere)")) end function TestPVMock:test_avp_set_clean() self.pv.seti("$(avp(s:hithere)[*])", 0) - assertEquals(self.pv.get("$avp(s:hithere)"), 0) - assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {0}) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), 0) + lu.assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {0}) self.pv.seti("$(avp(s:hithere)[*])", 1) - assertEquals(self.pv.get("$avp(s:hithere)"), 1) - assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {1}) + lu.assertEquals(self.pv.get("$avp(s:hithere)"), 1) + lu.assertEquals(self.pv.get("$(avp(s:hithere)[*])"), {1}) end diff --git a/tests/mocks_pvx.lua b/tests/mocks_pvx.lua index 8366c40..8e40756 100644 --- a/tests/mocks_pvx.lua +++ b/tests/mocks_pvx.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local pvMock = require 'mocks.pv' local pvxMock = require 'mocks.pvx' @@ -29,20 +29,20 @@ TestPVXMock = {} self.pvx = pvxMock.new(self.pv) self.pv.sets("$xavp(test=>uno)", "uno") - assertEquals(self.pv.get("$xavp(test[0]=>uno)"), "uno") + lu.assertEquals(self.pv.get("$xavp(test[0]=>uno)"), "uno") self.pv.seti("$xavp(test[0]=>dos)", 4) self.pv.seti("$xavp(test[0]=>dos)", 2) - assertEquals(self.pv.get("$xavp(test[0]=>dos)"), 2) + lu.assertEquals(self.pv.get("$xavp(test[0]=>dos)"), 2) self.pv.seti("$xavp(test=>uno)", 3) self.pv.seti("$xavp(test[0]=>uno)", 1) - assertEquals(self.pv.get("$xavp(test[0]=>uno)"), 1) + lu.assertEquals(self.pv.get("$xavp(test[0]=>uno)"), 1) self.pv.sets("$xavp(test[0]=>dos)", "dos") - assertEquals(self.pv.get("$xavp(test[0]=>dos)"), "dos") + lu.assertEquals(self.pv.get("$xavp(test[0]=>dos)"), "dos") self.pv.seti("$xavp(test[0]=>tres)", 3) - assertEquals(self.pv.get("$xavp(test[0]=>tres)"), 3) + lu.assertEquals(self.pv.get("$xavp(test[0]=>tres)"), 3) -- - assertEquals(self.pv.get("$xavp(test[1]=>uno)"), "uno") - assertEquals(self.pv.get("$xavp(test[1]=>dos)"), 2) + lu.assertEquals(self.pv.get("$xavp(test[1]=>uno)"), "uno") + lu.assertEquals(self.pv.get("$xavp(test[1]=>dos)"), 2) end function TestPVXMock:tearDown() @@ -52,33 +52,33 @@ TestPVXMock = {} function TestPVXMock:test_xavp_get() local l = self.pvx.xavp_get("test") local m = tostring(self.pv.vars["xavp:test"]) - assertItemsEquals(l, "<>") + lu.assertEquals(l, "<>") end function TestPVXMock:test_xavp_gete() - assertItemsEquals(self.pvx.xavp_gete("fake"), "") + lu.assertEquals(self.pvx.xavp_gete("fake"), "") end function TestPVXMock:test_xavp_getw() - assertItemsEquals(self.pvx.xavp_getw("fake"), "") + lu.assertEquals(self.pvx.xavp_getw("fake"), "") end function TestPVXMock:test_get_keys() local l = self.pvx.xavp_get_keys("test", 0) - assertNotNil(l) - assertItemsEquals(l, {"uno", "dos", "tres"}) + lu.assertNotNil(l) + lu.assertItemsEquals(l, {"uno", "dos", "tres"}) end function TestPVXMock:test_get_keys_1() local l = self.pvx.xavp_get_keys("test", 1) - assertNotNil(l) - assertItemsEquals(l, {"uno", "dos"}) + lu.assertNotNil(l) + lu.assertItemsEquals(l, {"uno", "dos"}) end function TestPVXMock:test_getd() local l = self.pvx.xavp_getd("test") - assertNotNil(l) - assertItemsEquals(l, { + lu.assertNotNil(l) + lu.assertItemsEquals(l, { {uno={1,3}, dos={"dos"}, tres={3}}, {uno={"uno"}, dos={2,4}} }) @@ -86,7 +86,7 @@ TestPVXMock = {} function TestPVXMock:test_getd_p1() local l = self.pvx.xavp_getd_p1("test", 1) - assertNotNil(l) - assertItemsEquals(l, {uno={"uno"}, dos={2,4}}) + lu.assertNotNil(l) + lu.assertItemsEquals(l, {uno={"uno"}, dos={2,4}}) end --EOF diff --git a/tests/ngcp.lua b/tests/ngcp.lua index 9558152..5c06668 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local NGCPXAvp = require 'ngcp.xavp' local DPFetch = require 'tests_v.dp_vars' @@ -73,54 +73,54 @@ TestNGCP = {} --class end function TestNGCP:test_config() - assertNotNil(self.ngcp.config) - assert(self.ngcp.config.env) - assertIsNil(self.ngcp.config.con) + lu.assertNotNil(self.ngcp.config) + lu.assertNotNil(self.ngcp.config.env) + lu.assertIsNil(self.ngcp.config.con) end function TestNGCP:test_config_get_defaults_all() local defaults = NGCPConfig.get_defaults(self.ngcp.config, 'peer') - assertItemsEquals(defaults, self.ngcp.config.default.peer) + lu.assertItemsEquals(defaults, self.ngcp.config.default.peer) end function TestNGCP:test_config_get_defaults_real() local defaults = NGCPConfig.get_defaults(self.ngcp.config, 'usr') local usr_defaults = utable.deepcopy(self.ngcp.config.default.usr) - assertItemsEquals(defaults, usr_defaults) + lu.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) + lu.assertItemsEquals(defaults, self.ngcp.config.default.dom) end function TestNGCP:test_prefs_init() KSR.log("dbg", "TestNGCP:test_prefs_init") - assertNotNil(self.ngcp) - assertNotNil(self.ngcp.prefs) - assertNotNil(self.ngcp.prefs.peer) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") - assertNotNil(self.ngcp.prefs.usr) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") - assertNotNil(self.ngcp.prefs.dom) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") - assertNotNil(self.ngcp.prefs.real) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") - assertNotNil(self.ngcp.prefs.prof) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") - assertNotNil(self.ngcp.prefs.fax) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp) + lu.assertNotNil(self.ngcp.prefs) + lu.assertNotNil(self.ngcp.prefs.peer) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp.prefs.usr) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp.prefs.dom) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp.prefs.real) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp.prefs.prof) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertNotNil(self.ngcp.prefs.fax) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") end function TestNGCP:test_log_pref() self.ngcp:log_pref() - assertError(self.ngcp.log_pref, self.ngcp, "dbg", "foo_var") + lu.assertError(self.ngcp.log_pref, self.ngcp, "dbg", "foo_var") end function TestNGCP:test_log_pref_info() @@ -132,7 +132,7 @@ TestNGCP = {} --class end function TestNGCP:test_caller_usr_load_empty() - assertEquals(self.ngcp:caller_usr_load(), {}) + lu.assertEquals(self.ngcp:caller_usr_load(), {}) end function TestNGCP:test_caller_usr_load_empty_dom() @@ -182,13 +182,13 @@ TestNGCP = {} --class "no_nat_sipping" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>account_id)"), 2) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>cli)"), "4311001") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>cc)"), "43") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>ac)"), "1") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>no_nat_sipping)"), "no") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>account_id)"), 2) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>cli)"), "4311001") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>cc)"), "43") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>ac)"), "1") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>no_nat_sipping)"), "no") end function TestNGCP:test_caller_usr_load_empty_usr() @@ -215,16 +215,16 @@ TestNGCP = {} --class "sst_refresh_method", "inbound_uprn" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") --- the default is on real and dom NOT in usr - assertIsNil(KSR.pv.get("$xavp(caller_usr_prefs=>sst_enable)")) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertIsNil(KSR.pv.get("$xavp(caller_real_prefs=>force_outbound_calls_to_peer)")) - assertIsNil(KSR.pv.get("$xavp(caller_dom_prefs=>force_outbound_calls_to_peer)")) + lu.assertIsNil(KSR.pv.get("$xavp(caller_usr_prefs=>sst_enable)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertIsNil(KSR.pv.get("$xavp(caller_real_prefs=>force_outbound_calls_to_peer)")) + lu.assertIsNil(KSR.pv.get("$xavp(caller_dom_prefs=>force_outbound_calls_to_peer)")) end function TestNGCP:test_caller_usr_load() @@ -295,18 +295,18 @@ TestNGCP = {} --class "force_outbound_calls_to_peer" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs[0]=>dummy)"), "caller") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs[0]=>dummy)"), "caller") --- the default is on real NOT in usr - assertIsNil(KSR.pv.get("$xavp(caller_usr_prefs[0]=>sst_enable)")) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs[0]=>force_outbound_calls_to_peer)"), 1) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>force_outbound_calls_to_peer)"), 1) + lu.assertIsNil(KSR.pv.get("$xavp(caller_usr_prefs[0]=>sst_enable)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs[0]=>force_outbound_calls_to_peer)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs[0]=>force_outbound_calls_to_peer)"), 1) end function TestNGCP:test_callee_usr_load_empty() - assertEquals(self.ngcp:callee_usr_load(), {}) + lu.assertEquals(self.ngcp:callee_usr_load(), {}) end function TestNGCP:test_callee_usr_load() @@ -376,13 +376,13 @@ TestNGCP = {} --class "no_nat_sipping" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") --- the default is on real NOT in usr - assertIsNil(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)")) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertIsNil(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") end function TestNGCP:test_callee_usr_load_prof() @@ -452,14 +452,14 @@ TestNGCP = {} --class "no_nat_sipping" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"), "yes") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"), "yes") --- the default is on real NOT in usr - assertIsNil(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)")) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "yes") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertIsNil(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "yes") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") end function TestNGCP:test_callee_usr_load_prof_usr() @@ -521,17 +521,17 @@ TestNGCP = {} --class "ext_contract_id" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"), "yes") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"), "yes") --- the default is on real NOT in usr - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>sst_enable)"), "no") end function TestNGCP:test_caller_peer_load_empty() - assertEquals(self.ngcp:caller_peer_load(), {}) + lu.assertEquals(self.ngcp:caller_peer_load(), {}) end function TestNGCP:test_caller_peer_load() @@ -560,14 +560,14 @@ TestNGCP = {} --class "inbound_uprn" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") end function TestNGCP:test_callee_peer_load_empty() - assertEquals(self.ngcp:callee_peer_load(), {}) + lu.assertEquals(self.ngcp:callee_peer_load(), {}) end function TestNGCP:test_callee_peer_load() @@ -596,24 +596,24 @@ TestNGCP = {} --class "inbound_uprn" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_enable)"), "no") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_enable)"), "no") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") end function TestNGCP:test_clean() local xavp = NGCPXAvp:new('callee','usr_prefs') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") self.ngcp:clean() - assertEquals(KSR.pv.get("$avp(s:callee_cfb)"),nil) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") - assertIsNil(KSR.pv.get("$xavp(user)")) + lu.assertEquals(KSR.pv.get("$avp(s:callee_cfb)"),nil) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertIsNil(KSR.pv.get("$xavp(user)")) end function TestNGCP:test_clean_caller_groups() @@ -622,12 +622,12 @@ TestNGCP = {} --class for _,v in pairs(groups) do local xavp = self.ngcp.prefs[v]:xavp("caller") xavp(string.format("test_%s", v), v) - assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>test_%s)", v, v)), v) - assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>dummy)", v)), "caller") + lu.assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>test_%s)", v, v)), v) + lu.assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>dummy)", v)), "caller") self.ngcp:clean("caller", v) - assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>dummy)", v)), "caller") + lu.assertEquals(KSR.pv.get(string.format("$xavp(caller_%s_prefs=>dummy)", v)), "caller") end - assertError(self.ngcp.clean, self.ngcp, "caller", "whatever") + lu.assertError(self.ngcp.clean, self.ngcp, "caller", "whatever") end @@ -637,34 +637,34 @@ TestNGCP = {} --class for _,v in pairs(groups) do local xavp = self.ngcp.prefs[v]:xavp("callee") xavp(string.format("test_%s", v), v) - assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>test_%s)", v, v)), v) - assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>dummy)", v)), "callee") + lu.assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>test_%s)", v, v)), v) + lu.assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>dummy)", v)), "callee") self.ngcp:clean("callee", v) - assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>dummy)", v)), "callee") + lu.assertEquals(KSR.pv.get(string.format("$xavp(callee_%s_prefs=>dummy)", v)), "callee") end - assertError(self.ngcp.clean, self.ngcp, "callee", "whatever") + lu.assertError(self.ngcp.clean, self.ngcp, "callee", "whatever") end function TestNGCP:test_callee_clean() local callee_xavp = NGCPDomainPrefs:xavp('callee') - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") callee_xavp("testid",1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) callee_xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") local caller_xavp = NGCPDomainPrefs:xavp('caller') caller_xavp("other",1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") self.ngcp:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),'caller') - assertIsNil(KSR.pv.get("$xavp(callee_dom_prefs=>testid)")) - assertIsNil(KSR.pv.get("$xavp(callee_dom_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),'caller') + lu.assertIsNil(KSR.pv.get("$xavp(callee_dom_prefs=>testid)")) + lu.assertIsNil(KSR.pv.get("$xavp(callee_dom_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"), "callee") end function TestNGCP:test_caller_clean() @@ -674,23 +674,23 @@ TestNGCP = {} --class local caller_xavp = NGCPXAvp:new('caller','peer_prefs') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.ngcp:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") end function TestNGCP:test_tostring() - assertEquals(tostring(self.ngcp), 'caller_contract_prefs:{dummy={"caller"}}\ncallee_contract_prefs:{dummy={"callee"}}\ncaller_peer_prefs:{dummy={"caller"}}\ncallee_peer_prefs:{dummy={"callee"}}\ncaller_dom_prefs:{dummy={"caller"}}\ncallee_dom_prefs:{dummy={"callee"}}\ncaller_prof_prefs:{dummy={"caller"}}\ncallee_prof_prefs:{dummy={"callee"}}\ncaller_fax_prefs:{dummy={"caller"}}\ncallee_fax_prefs:{dummy={"callee"}}\ncaller_usr_prefs:{dummy={"caller"}}\ncallee_usr_prefs:{dummy={"callee"}}\ncaller_real_prefs:{dummy={"caller"}}\ncallee_real_prefs:{dummy={"callee"}}\n') + lu.assertEquals(tostring(self.ngcp), 'caller_contract_prefs:{dummy={"caller"}}\ncallee_contract_prefs:{dummy={"callee"}}\ncaller_peer_prefs:{dummy={"caller"}}\ncallee_peer_prefs:{dummy={"callee"}}\ncaller_dom_prefs:{dummy={"caller"}}\ncallee_dom_prefs:{dummy={"callee"}}\ncaller_prof_prefs:{dummy={"caller"}}\ncallee_prof_prefs:{dummy={"callee"}}\ncaller_fax_prefs:{dummy={"caller"}}\ncallee_fax_prefs:{dummy={"callee"}}\ncaller_usr_prefs:{dummy={"caller"}}\ncallee_usr_prefs:{dummy={"callee"}}\ncaller_real_prefs:{dummy={"caller"}}\ncallee_real_prefs:{dummy={"callee"}}\n') end -- class TestNGCP --EOF diff --git a/tests/ngcp_api_client.lua b/tests/ngcp_api_client.lua index e360197..06aa8b6 100644 --- a/tests/ngcp_api_client.lua +++ b/tests/ngcp_api_client.lua @@ -1,5 +1,5 @@ -- --- Copyright 2014 SipWise Team +-- Copyright 2014-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local ksrMock = require 'mocks.ksr' @@ -37,7 +37,7 @@ TestNGCPAPIClient = {} --class local NGCPAPIClient = require 'ngcp.api_client' self.client = NGCPAPIClient.new() - assertEvalToTrue(self.client) + lu.assertNotNil(self.client) self.client.c = self.c; self.client.j = self.j; @@ -81,8 +81,8 @@ TestNGCPAPIClient = {} --class local res = self.client:request(method, request) mc:verify() - assertEvalToTrue(res) - assertIs(self.client.c, self.c) + lu.assertNotNil(res) + lu.assertIs(self.client.c, self.c) end -- class TestNGCAPIClient diff --git a/tests/ngcp_avp.lua b/tests/ngcp_avp.lua index 0ce1ddf..a7ca169 100644 --- a/tests/ngcp_avp.lua +++ b/tests/ngcp_avp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' local NGCPAvp = require 'ngcp.avp' @@ -34,15 +34,15 @@ TestNGCPAvp = {} --class end function TestNGCPAvp:test_avp_id() - assertEquals(self.avp.id, "$avp(s:testid)") + lu.assertEquals(self.avp.id, "$avp(s:testid)") end function TestNGCPAvp:test_avp_get() KSR.pv.sets("$avp(s:testid)", "value") - assertEquals(self.avp(), "value") + lu.assertEquals(self.avp(), "value") KSR.pv.sets("$avp(s:testid)", "1") - assertItemsEquals(self.avp(), "1") - assertItemsEquals(self.avp:all(),{"1","value"}) + lu.assertItemsEquals(self.avp(), "1") + lu.assertItemsEquals(self.avp:all(),{"1","value"}) end function TestNGCPAvp:test_avp_set() @@ -50,9 +50,9 @@ TestNGCPAvp = {} --class local okvals = {3,2,1} for i=1,#vals do self.avp(vals[i]) - assertEquals(self.avp(),vals[i]) + lu.assertEquals(self.avp(),vals[i]) end - assertEquals(self.avp:all(), okvals) + lu.assertEquals(self.avp:all(), okvals) end function TestNGCPAvp:test_avp_set2() @@ -60,9 +60,9 @@ TestNGCPAvp = {} --class local okvals = {"3",2,1} for i=1,#vals do self.avp(vals[i]) - assertEquals(self.avp(),vals[i]) + lu.assertEquals(self.avp(),vals[i]) end - assertEquals(self.avp:all(), okvals) + lu.assertEquals(self.avp:all(), okvals) end function TestNGCPAvp:test_avp_set_list() @@ -72,7 +72,7 @@ TestNGCPAvp = {} --class for i=1,#vals do self.avp(vals[i]) end - assertItemsEquals(self.avp:all(), okvals) + lu.assertItemsEquals(self.avp:all(), okvals) end function TestNGCPAvp:test_avp_del() @@ -82,25 +82,25 @@ TestNGCPAvp = {} --class for i=1,#vals do self.avp(vals[i]) end - assertItemsEquals(self.avp:all(), okvals) + lu.assertItemsEquals(self.avp:all(), okvals) self.avp:del(1) - assertItemsEquals(self.avp:all(), {4, "3", 2}) + lu.assertItemsEquals(self.avp:all(), {4, "3", 2}) self.avp:del(4) - assertItemsEquals(self.avp:all(), {"3", 2}) + lu.assertItemsEquals(self.avp:all(), {"3", 2}) self.avp:del(1) - assertItemsEquals(self.avp:all(), {"3", 2}) + lu.assertItemsEquals(self.avp:all(), {"3", 2}) self.avp:del("3") - assertItemsEquals(self.avp:all(), {2}) + lu.assertItemsEquals(self.avp:all(), {2}) self.avp:del(2) - assertNil(self.avp:all()) + lu.assertNil(self.avp:all()) self.avp:del(nil) - assertNil(self.avp:all()) + lu.assertNil(self.avp:all()) end function TestNGCPAvp:test_clean() self.avp(1) self.avp:clean() - assertNil(self.avp()) + lu.assertNil(self.avp()) end function TestNGCPAvp:test_log() @@ -109,9 +109,9 @@ TestNGCPAvp = {} --class function TestNGCPAvp:test_tostring() self.avp(1) - assertEquals(tostring(self.avp), "$avp(s:testid):1") + lu.assertEquals(tostring(self.avp), "$avp(s:testid):1") self.avp("hola") - assertEquals(tostring(self.avp), "$avp(s:testid):hola") + lu.assertEquals(tostring(self.avp), "$avp(s:testid):hola") end -- class TestNGCPAvp --EOF diff --git a/tests/ngcp_cp.lua b/tests/ngcp_cp.lua index 3b49368..5078649 100644 --- a/tests/ngcp_cp.lua +++ b/tests/ngcp_cp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2016 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local CPFetch = require 'tests_v.cp_vars' @@ -69,21 +69,21 @@ TestNGCPContractPrefs = {} --class function TestNGCPContractPrefs:test_init() --print("TestNGCPContractPrefs:test_init") - assertEquals(self.d.db_table, "contract_preferences") + lu.assertEquals(self.d.db_table, "contract_preferences") end function TestNGCPContractPrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPContractPrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPContractPrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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) @@ -93,13 +93,13 @@ TestNGCPContractPrefs = {} --class local keys = self.d:caller_load("1") mc:verify() - assertItemsEquals(keys, {"sst_enable"}) - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>sst_enable)"),"no") - assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>location_id)")) + lu.assertItemsEquals(keys, {"sst_enable"}) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>sst_enable)"),"no") + lu.assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>location_id)")) end function TestNGCPContractPrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(self.d.config) local query = NGCPContractPrefs.query_location_id:format("2", "ipv4", "172.16.15.1", "ipv4", "172.16.15.1") con:execute(query) ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns({location_id = 1 }) @@ -113,23 +113,23 @@ TestNGCPContractPrefs = {} --class local keys = self.d:callee_load("2", '172.16.15.1') mc:verify() - assertItemsEquals(keys, {"sst_enable"}) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>sst_enable)"),"yes") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>location_id)"),1) + lu.assertItemsEquals(keys, {"sst_enable"}) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>sst_enable)"),"yes") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>location_id)"),1) end function TestNGCPContractPrefs:test_clean() local xavp = NGCPContractPrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") - assertNil(KSR.pv.get("$xavp(prof)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertNil(KSR.pv.get("$xavp(prof)")) end function TestNGCPContractPrefs:test_callee_clean() @@ -139,19 +139,19 @@ TestNGCPContractPrefs = {} --class local caller_xavp = NGCPContractPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_contract_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") end function TestNGCPContractPrefs:test_caller_clean() @@ -161,19 +161,19 @@ TestNGCPContractPrefs = {} --class local caller_xavp = NGCPContractPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_contract_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_contract_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_contract_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_contract_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_contract_prefs=>dummy)"),"callee") end function TestNGCPContractPrefs:test_tostring() @@ -183,7 +183,7 @@ TestNGCPContractPrefs = {} --class local caller_xavp = NGCPContractPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.d), 'caller_contract_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_contract_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.d), 'caller_contract_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_contract_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPContractPrefs --EOF diff --git a/tests/ngcp_dlg_var.lua b/tests/ngcp_dlg_var.lua index 4f9038e..7dd2856 100644 --- a/tests/ngcp_dlg_var.lua +++ b/tests/ngcp_dlg_var.lua @@ -1,5 +1,5 @@ -- --- Copyright 2015 SipWise Team +-- Copyright 2015-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' local NGCPDlgVar = require 'ngcp.dlg_var' @@ -33,27 +33,27 @@ TestNGCPDlgVar = {} --class end function TestNGCPDlgVar:test_dlg_var_id() - assertEquals(self.var.id, "$dlg_var(testid)") + lu.assertEquals(self.var.id, "$dlg_var(testid)") end function TestNGCPDlgVar:test_dlg_var_get() KSR.pv.sets("$dlg_var(testid)", "value") - assertEquals(self.var(), "value") + lu.assertEquals(self.var(), "value") KSR.pv.sets("$dlg_var(testid)", "1") - assertItemsEquals(self.var(), "1") + lu.assertItemsEquals(self.var(), "1") end function TestNGCPDlgVar:test_dlg_var_set() self.var(1) - assertEquals(self.var(),1) + lu.assertEquals(self.var(),1) self.var("a") - assertEquals(self.var(), "a") + lu.assertEquals(self.var(), "a") end function TestNGCPDlgVar:test_clean() self.var(1) self.var:clean() - assertNil(self.var()) + lu.assertNil(self.var()) end function TestNGCPDlgVar:test_log() @@ -62,9 +62,9 @@ TestNGCPDlgVar = {} --class function TestNGCPDlgVar:test_tostring() self.var(1) - assertEquals(tostring(self.var), "$dlg_var(testid):1") + lu.assertEquals(tostring(self.var), "$dlg_var(testid):1") self.var("hola") - assertEquals(tostring(self.var), "$dlg_var(testid):hola") + lu.assertEquals(tostring(self.var), "$dlg_var(testid):hola") end -- class TestNGCPDlgVar --EOF diff --git a/tests/ngcp_dlgcnt.lua b/tests/ngcp_dlgcnt.lua index 24fa224..55910cb 100644 --- a/tests/ngcp_dlgcnt.lua +++ b/tests/ngcp_dlgcnt.lua @@ -1,5 +1,5 @@ -- --- Copyright 2014-2015 SipWise Team +-- Copyright 2014-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- local lemock = require('lemock') -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' KSR = ksrMock:new() @@ -37,7 +37,7 @@ TestNGCPDlgCnt = {} --class local NGCPDlg = require 'ngcp.dlgcnt' self.dlg = NGCPDlg.new() - assertEvalToTrue(self.dlg) + lu.assertEvalToTrue(self.dlg) self.dlg.central = self.central; self.dlg.pair = self.pair @@ -51,8 +51,8 @@ TestNGCPDlgCnt = {} --class local ok = self.dlg._test_connection(self.central) mc:verify() - assertTrue(ok) - assertIs(prev, self.central) + lu.assertTrue(ok) + lu.assertIs(prev, self.central) end function TestNGCPDlgCnt:test_connection_fail() @@ -63,8 +63,8 @@ TestNGCPDlgCnt = {} --class local res = self.dlg._test_connection(self.central) mc:verify() - assertFalse(res) - assertIs(prev, self.central) + lu.assertFalse(res) + lu.assertIs(prev, self.central) end function TestNGCPDlgCnt:test_connect_ok() @@ -75,7 +75,7 @@ TestNGCPDlgCnt = {} --class mc:replay() local res = self.dlg._connect(c.pair) mc:verify() - assertIs(res, self.pair) + lu.assertIs(res, self.pair) end function TestNGCPDlgCnt:test_set_1() @@ -120,8 +120,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del("callid0") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end function TestNGCPDlgCnt:test_del_zero() @@ -137,8 +137,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del("callid0") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end function TestNGCPDlgCnt:test_del_negative() @@ -156,8 +156,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del("callid0") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end function TestNGCPDlgCnt:test_del_negative_ok() @@ -174,8 +174,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del("callid0") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end function TestNGCPDlgCnt:test_del_multy() @@ -200,8 +200,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del("callid0") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end function TestNGCPDlgCnt:test_is_in_set_fail() @@ -212,9 +212,9 @@ TestNGCPDlgCnt = {} --class local res = self.dlg:is_in_set("callid0", "fake") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) - assertFalse(res) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) + lu.assertFalse(res) end function TestNGCPDlgCnt:test_is_in_set_ok() @@ -225,9 +225,9 @@ TestNGCPDlgCnt = {} --class local res = self.dlg:is_in_set("callid0", "fake") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) - assertTrue(res) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) + lu.assertTrue(res) end function TestNGCPDlgCnt:test_del_key() @@ -241,8 +241,8 @@ TestNGCPDlgCnt = {} --class self.dlg:del_key("callid0", "key1") mc:verify() - assertIs(self.dlg.central, self.central) - assertIs(self.dlg.pair, self.pair) + lu.assertIs(self.dlg.central, self.central) + lu.assertIs(self.dlg.pair, self.pair) end -- class TestNGCPDlgCnt diff --git a/tests/ngcp_dlglist.lua b/tests/ngcp_dlglist.lua index c803dd5..c79b417 100644 --- a/tests/ngcp_dlglist.lua +++ b/tests/ngcp_dlglist.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2017 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ -- local lemock = require('lemock') -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' KSR = ksrMock:new() @@ -39,7 +39,7 @@ function TestNGCPDlgList:setUp() local NGCPDlgList = require 'ngcp.dlglist' self.dlg = NGCPDlgList.new() - assertEvalToTrue(self.dlg) + lu.assertEvalToTrue(self.dlg) self.dlg.central = self.central; self.dlg.pair = self.pair @@ -53,7 +53,7 @@ function TestNGCPDlgList:test_exists_ok() local ok = self.dlg:exists('fakeAAA') mc:verify() - assertTrue(ok) + lu.assertTrue(ok) end function TestNGCPDlgList:test_exists_ko() @@ -64,7 +64,7 @@ function TestNGCPDlgList:test_exists_ko() local ok = self.dlg:exists('fakeAAA') mc:verify() - assertFalse(ok) + lu.assertFalse(ok) end function TestNGCPDlgList:test_add() @@ -106,8 +106,8 @@ function TestNGCPDlgList:test_is_in_set() local ko = self.dlg:is_in_set(callid, 'key3') mc:verify() - assertTrue(ok) - assertFalse(ko) + lu.assertTrue(ok) + lu.assertFalse(ko) end function TestNGCPDlgList:test_destroy_empty() @@ -117,7 +117,7 @@ function TestNGCPDlgList:test_destroy_empty() self.pair:del("list:"..callid) ;mc :returns(true) mc:replay() - assertError(self.dlg.destroy, self.dlg, callid) + lu.assertError(self.dlg.destroy, self.dlg, callid) mc:verify() end diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index 2d56c2b..8d8cf37 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local utils = require 'ngcp.utils' local utable = utils.table local lemock = require('lemock') @@ -63,17 +63,17 @@ TestNGCPDomainPrefs = {} --class function TestNGCPDomainPrefs:test_init() --print("TestNGCPDomainPrefs:test_init") - assertEquals(self.d.db_table, "dom_preferences") + lu.assertEquals(self.d.db_table, "dom_preferences") end function TestNGCPDomainPrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPDomainPrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPDomainPrefs:get_defaults() @@ -87,7 +87,7 @@ TestNGCPDomainPrefs = {} --class end function TestNGCPDomainPrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -98,13 +98,13 @@ TestNGCPDomainPrefs = {} --class local keys = self.d:caller_load("192.168.51.56") mc:verify() - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_enable)"),"no") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertItemsEquals(keys, TestNGCPDomainPrefs:get_defaults()) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_enable)"),"no") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertItemsEquals(keys, TestNGCPDomainPrefs:get_defaults()) end function TestNGCPDomainPrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -115,22 +115,22 @@ TestNGCPDomainPrefs = {} --class local keys = self.d:callee_load("192.168.51.56") mc:verify() - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"),"no") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertItemsEquals(keys, TestNGCPDomainPrefs:get_defaults()) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_enable)"),"no") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertItemsEquals(keys, TestNGCPDomainPrefs:get_defaults()) end function TestNGCPDomainPrefs:test_clean() local xavp = NGCPDomainPrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") - assertNil(KSR.pv.get("$xavp(domain)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertNil(KSR.pv.get("$xavp(domain)")) end function TestNGCPDomainPrefs:test_callee_clean() @@ -140,19 +140,19 @@ TestNGCPDomainPrefs = {} --class local caller_xavp = NGCPDomainPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_dom_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_dom_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_dom_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_dom_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") end function TestNGCPDomainPrefs:test_caller_clean() @@ -162,19 +162,19 @@ TestNGCPDomainPrefs = {} --class local caller_xavp = NGCPDomainPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_dom_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_dom_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_dom_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>dummy)"),"callee") end function TestNGCPDomainPrefs:test_tostring() @@ -184,7 +184,7 @@ TestNGCPDomainPrefs = {} --class local caller_xavp = NGCPDomainPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.d), 'caller_dom_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_dom_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.d), 'caller_dom_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_dom_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPDomainPrefs --EOF diff --git a/tests/ngcp_fp.lua b/tests/ngcp_fp.lua index c2f6b0d..b371cc0 100644 --- a/tests/ngcp_fp.lua +++ b/tests/ngcp_fp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local FPFetch = require 'tests_v.fp_vars' @@ -68,21 +68,21 @@ TestNGCPFaxPrefs = {} --class function TestNGCPFaxPrefs:test_init() --print("TestNGCPFaxPrefs:test_init") - assertEquals(self.d.db_table, "provisioning.voip_fax_preferences") + lu.assertEquals(self.d.db_table, "provisioning.voip_fax_preferences") end function TestNGCPFaxPrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPFaxPrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPFaxPrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -93,17 +93,17 @@ TestNGCPFaxPrefs = {} --class mc:verify() for k,v in pairs(fp_vars:val("fp_keys")) do - assertEquals(keys[k], v) + lu.assertEquals(keys[k], v) end - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>active)"), 1) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>t38)"), 1) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>ecm)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>active)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>t38)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>ecm)"), 1) end function TestNGCPFaxPrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -114,27 +114,27 @@ TestNGCPFaxPrefs = {} --class mc:verify() for k,v in pairs(fp_vars:val("fp_keys")) do - assertEquals(keys[k], v) + lu.assertEquals(keys[k], v) end - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>active)"), 1) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>t38)"), 0) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>ecm)"), 0) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>active)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>t38)"), 0) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>ecm)"), 0) end function TestNGCPFaxPrefs:test_clean() local xavp = NGCPFaxPrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") - assertNil(KSR.pv.get("$xavp(fax)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertNil(KSR.pv.get("$xavp(fax)")) end function TestNGCPFaxPrefs:test_callee_clean() @@ -144,19 +144,19 @@ TestNGCPFaxPrefs = {} --class local caller_xavp = NGCPFaxPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_fax_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_fax_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_fax_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_fax_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") end function TestNGCPFaxPrefs:test_caller_clean() @@ -166,19 +166,19 @@ TestNGCPFaxPrefs = {} --class local caller_xavp = NGCPFaxPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_fax_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_fax_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_fax_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_fax_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_fax_prefs=>dummy)"),"callee") end function TestNGCPFaxPrefs:test_tostring() @@ -188,7 +188,7 @@ TestNGCPFaxPrefs = {} --class local caller_xavp = NGCPFaxPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.d), 'caller_fax_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_fax_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.d), 'caller_fax_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_fax_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPFaxPrefs --EOF diff --git a/tests/ngcp_loop.lua b/tests/ngcp_loop.lua index fe46802..04b994b 100644 --- a/tests/ngcp_loop.lua +++ b/tests/ngcp_loop.lua @@ -1,5 +1,5 @@ -- --- Copyright 2016 SipWise Team +-- Copyright 2016-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ -- local lemock = require('lemock') -require('luaunit') +local lu = require('luaunit') local ksrMock = require 'mocks.ksr' KSR = ksrMock:new() @@ -38,7 +38,7 @@ function TestNGCPLoop:setUp() local NGCPLoop = require 'ngcp.loop' self.loop = NGCPLoop.new() - assertEvalToTrue(self.loop) + lu.assertNotNil(self.loop) self.loop.client = self.client; self.loop.config.max = 5; @@ -59,7 +59,7 @@ function TestNGCPLoop:test_add() local res = self.loop:add(fu, tu, ru) mc:verify() - assertEquals(res, 1) + lu.assertEquals(res, 1) end function TestNGCPLoop:test_detect_false() @@ -76,7 +76,7 @@ function TestNGCPLoop:test_detect_false() local res = self.loop:detect(fu, tu, ru) mc:verify() - assertFalse(res) + lu.assertFalse(res) end function TestNGCPLoop:test_detect_ko() @@ -92,7 +92,7 @@ function TestNGCPLoop:test_detect_ko() local res = self.loop:detect(fu, tu, ru) mc:verify() - assertFalse(res) + lu.assertFalse(res) end function TestNGCPLoop:test_detect() @@ -108,6 +108,6 @@ function TestNGCPLoop:test_detect() local res = self.loop:detect(fu, tu, ru) mc:verify() - assertTrue(res) + lu.assertTrue(res) end -- class diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index 8bc04fd..4d3aaaf 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local utils = require 'ngcp.utils' local utable = utils.table @@ -72,7 +72,7 @@ TestNGCPPeerPrefs = {} --class function TestNGCPPeerPrefs:test_init() --print("TestNGCPPeerPrefs:test_init") - assertEquals(self.d.db_table, "peer_preferences") + lu.assertEquals(self.d.db_table, "peer_preferences") end function TestNGCPPeerPrefs:get_defaults(level, set) @@ -89,23 +89,23 @@ TestNGCPPeerPrefs = {} --class for k,v in pairs(defaults) do utable.add(keys_expected, k) - assertEquals(KSR.pv.get("$xavp("..level.."_peer_prefs=>"..k..")"), v) + lu.assertEquals(KSR.pv.get("$xavp("..level.."_peer_prefs=>"..k..")"), v) end return keys_expected end function TestNGCPPeerPrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertEvalToTrue(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPPeerPrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertEvalToTrue(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPPeerPrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.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")) @@ -129,16 +129,16 @@ TestNGCPPeerPrefs = {} --class "inbound_uprn" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_enable)"),"no") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_min_timer)"), 90) - assertItemsEquals(keys, TestNGCPPeerPrefs:get_defaults("caller", {"sst_enable", "sst_refresh_method"})) + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_enable)"),"no") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>sst_min_timer)"), 90) + lu.assertItemsEquals(keys, TestNGCPPeerPrefs:get_defaults("caller", {"sst_enable", "sst_refresh_method"})) end function TestNGCPPeerPrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.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")) @@ -162,26 +162,26 @@ TestNGCPPeerPrefs = {} --class "inbound_uprn" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_enable)"),"no") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_min_timer)"), 90) - assertItemsEquals(keys, TestNGCPPeerPrefs:get_defaults("callee", {"sst_enable", "sst_refresh_method"})) + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_enable)"),"no") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>sst_min_timer)"), 90) + lu.assertItemsEquals(keys, TestNGCPPeerPrefs:get_defaults("callee", {"sst_enable", "sst_refresh_method"})) end function TestNGCPPeerPrefs:test_clean() local xavp = NGCPPeerPrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") - assertNil(KSR.pv.get("$xavp(peer)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertNil(KSR.pv.get("$xavp(peer)")) end function TestNGCPPeerPrefs:test_callee_clean() @@ -191,19 +191,19 @@ TestNGCPPeerPrefs = {} --class local caller_xavp = NGCPPeerPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_peer_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_peer_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_peer_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_peer_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") end function TestNGCPPeerPrefs:test_caller_clean() @@ -213,19 +213,19 @@ TestNGCPPeerPrefs = {} --class local caller_xavp = NGCPPeerPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_peer_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer_prefs=>dummy)"),"callee") end function TestNGCPPeerPrefs:test_tostring() @@ -235,7 +235,7 @@ TestNGCPPeerPrefs = {} --class local caller_xavp = NGCPPeerPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.d), 'caller_peer_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_peer_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.d), 'caller_peer_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_peer_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPPeerPrefs --EOF diff --git a/tests/ngcp_pprof.lua b/tests/ngcp_pprof.lua index 5112ecd..0551817 100644 --- a/tests/ngcp_pprof.lua +++ b/tests/ngcp_pprof.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local PProfFetch = require 'tests_v.pprof_vars' @@ -69,21 +69,21 @@ TestNGCPProfilePrefs = {} --class function TestNGCPProfilePrefs:test_init() --print("TestNGCPProfilePrefs:test_init") - assertEquals(self.d.db_table, "prof_preferences") + lu.assertEquals(self.d.db_table, "prof_preferences") end function TestNGCPProfilePrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertEvalToTrue(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPProfilePrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertEvalToTrue(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPProfilePrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.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")) @@ -95,15 +95,15 @@ TestNGCPProfilePrefs = {} --class local keys = self.d:caller_load("ah736f72-21d1-4ea6-a3ea-4d7f56b3887c") mc:verify() - assertItemsEquals(keys, {"sst_enable", "sst_refresh_method", "outbound_from_user"}) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>sst_enable)"),"yes") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>outbound_from_user)"), "upn") + lu.assertItemsEquals(keys, {"sst_enable", "sst_refresh_method", "outbound_from_user"}) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>sst_enable)"),"yes") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>outbound_from_user)"), "upn") end function TestNGCPProfilePrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.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")) @@ -115,25 +115,25 @@ TestNGCPProfilePrefs = {} --class local keys = self.d:callee_load("ah736f72-21d1-4ea6-a3ea-4d7f56b3887c") mc:verify() - assertItemsEquals(keys, {"sst_enable", "sst_refresh_method", "outbound_from_user"}) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"),"yes") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>outbound_from_user)"), "upn") + lu.assertItemsEquals(keys, {"sst_enable", "sst_refresh_method", "outbound_from_user"}) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_enable)"),"yes") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>outbound_from_user)"), "upn") end function TestNGCPProfilePrefs:test_clean() local xavp = NGCPProfilePrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") - assertNil(KSR.pv.get("$xavp(prof)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertNil(KSR.pv.get("$xavp(prof)")) end function TestNGCPProfilePrefs:test_callee_clean() @@ -143,19 +143,19 @@ TestNGCPProfilePrefs = {} --class local caller_xavp = NGCPProfilePrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_prof_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_prof_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_prof_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_prof_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") end function TestNGCPProfilePrefs:test_caller_clean() @@ -165,19 +165,19 @@ TestNGCPProfilePrefs = {} --class local caller_xavp = NGCPProfilePrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_prof_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_prof_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_prof_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_prof_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_prof_prefs=>dummy)"),"callee") end function TestNGCPProfilePrefs:test_tostring() @@ -187,7 +187,7 @@ TestNGCPProfilePrefs = {} --class local caller_xavp = NGCPProfilePrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.d), 'caller_prof_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_prof_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.d), 'caller_prof_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_prof_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPProfilePrefs --EOF diff --git a/tests/ngcp_recentcalls.lua b/tests/ngcp_recentcalls.lua index cf92bc4..be7a790 100644 --- a/tests/ngcp_recentcalls.lua +++ b/tests/ngcp_recentcalls.lua @@ -1,5 +1,5 @@ -- --- Copyright 2014 SipWise Team +-- Copyright 2014-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local ksrMock = require 'mocks.ksr' @@ -38,7 +38,7 @@ TestNGCPRecentCalls = {} --class local NGCPRecentCalls = require 'ngcp.recentcalls' self.rcalls = NGCPRecentCalls.new() - assertEvalToTrue(self.rcalls) + lu.assertNotNil(self.rcalls) self.rcalls.central = self.central; end @@ -51,8 +51,8 @@ TestNGCPRecentCalls = {} --class local ok = self.rcalls._test_connection(self.central) mc:verify() - assertTrue(ok) - assertIs(prev, self.central) + lu.assertTrue(ok) + lu.assertIs(prev, self.central) end function TestNGCPRecentCalls:test_connection_fail() @@ -63,8 +63,8 @@ TestNGCPRecentCalls = {} --class local res = self.rcalls._test_connection(self.central) mc:verify() - assertFalse(res) - assertIs(prev, self.central) + lu.assertFalse(res) + lu.assertIs(prev, self.central) end function TestNGCPRecentCalls:test_set_by_key() @@ -97,8 +97,8 @@ TestNGCPRecentCalls = {} --class source) mc:verify() - assertTrue(res) - assertIs(self.rcalls.central, self.central) + lu.assertTrue(res) + lu.assertIs(self.rcalls.central, self.central) end -- class TestNGCPRecentCalls diff --git a/tests/ngcp_rp.lua b/tests/ngcp_rp.lua index bedcb28..9a41ef8 100644 --- a/tests/ngcp_rp.lua +++ b/tests/ngcp_rp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local NGCPDomainPrefs = require 'ngcp.dp' local NGCPUserPrefs = require 'ngcp.up' local NGCPPeerPrefs = require 'ngcp.pp' @@ -38,11 +38,11 @@ TestNGCPRealPrefs = {} --class end function TestNGCPRealPrefs:test_caller_load_empty() - assertError(self.real.caller_load, nil) + lu.assertError(self.real.caller_load, nil) end function TestNGCPRealPrefs:test_callee_load_empty() - assertError(self.real.callee_load, nil) + lu.assertError(self.real.callee_load, nil) end function TestNGCPRealPrefs:test_caller_peer_load() @@ -54,14 +54,14 @@ TestNGCPRealPrefs = {} --class real = NGCPRealPrefs:xavp("caller") } xavp.domain("uno",1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) xavp.user("uno",2) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>uno)"),2) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>uno)"),2) xavp.peer("uno",3) local real_keys = self.real:caller_peer_load(keys) - assertEquals(real_keys, keys) - assertEquals(xavp.real("uno"),nil) - assertEquals(xavp.peer("uno"),3) + lu.assertEquals(real_keys, keys) + lu.assertEquals(xavp.real("uno"),nil) + lu.assertEquals(xavp.peer("uno"),3) end function TestNGCPRealPrefs:test_caller_usr_load() @@ -72,12 +72,12 @@ TestNGCPRealPrefs = {} --class real = NGCPRealPrefs:xavp("caller") } xavp.domain("uno",1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) xavp.user("uno",2) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>uno)"),2) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>uno)"),2) local real_keys = self.real:caller_usr_load(keys) - assertEquals(real_keys, keys) - assertEquals(xavp.real("uno"),2) + lu.assertEquals(real_keys, keys) + lu.assertEquals(xavp.real("uno"),2) end function TestNGCPRealPrefs:test_caller_usr_load1() @@ -88,13 +88,13 @@ TestNGCPRealPrefs = {} --class real = NGCPRealPrefs:xavp("caller") } xavp.domain("uno",1) - assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_dom_prefs=>uno)"),1) xavp.user("dos",2) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dos)"),2) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dos)"),2) local real_keys = self.real:caller_usr_load(keys) - assertItemsEquals(real_keys, keys) - assertEquals(xavp.real("uno"),1) - assertEquals(xavp.real("dos"),2) + lu.assertItemsEquals(real_keys, keys) + lu.assertEquals(xavp.real("uno"),1) + lu.assertEquals(xavp.real("dos"),2) end function TestNGCPRealPrefs:test_callee_usr_load() @@ -105,12 +105,12 @@ TestNGCPRealPrefs = {} --class real = NGCPRealPrefs:xavp("callee") } xavp.domain("uno",1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>uno)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>uno)"),1) xavp.user("uno",2) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>uno)"),2) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>uno)"),2) local real_keys = self.real:callee_usr_load(keys) - assertEquals(real_keys, keys) - assertEquals(xavp.real("uno"),2) + lu.assertEquals(real_keys, keys) + lu.assertEquals(xavp.real("uno"),2) end function TestNGCPRealPrefs:test_callee_usr_load1() @@ -121,44 +121,44 @@ TestNGCPRealPrefs = {} --class real = NGCPRealPrefs:xavp("callee") } xavp.domain("uno",1) - assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>uno)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_dom_prefs=>uno)"),1) xavp.user("dos",2) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dos)"),2) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dos)"),2) local real_keys = self.real:callee_usr_load(keys) - assertItemsEquals(real_keys, keys) - assertEquals(xavp.real("uno"),1) - assertEquals(xavp.real("dos"),2) + lu.assertItemsEquals(real_keys, keys) + lu.assertEquals(xavp.real("uno"),1) + lu.assertEquals(xavp.real("dos"),2) end function TestNGCPRealPrefs:test_set() - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"), "caller") - assertNil(KSR.pv.get("$xavp(callee_real_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_real_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"), "caller") + lu.assertNil(KSR.pv.get("$xavp(callee_real_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_real_prefs=>foo)")) local callee_xavp = NGCPRealPrefs:xavp("callee") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),'callee') + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),'callee') callee_xavp("testid", 1) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"), 1) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"), 1) callee_xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") end function TestNGCPRealPrefs:test_clean() local callee_xavp = NGCPRealPrefs:xavp("callee") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),'callee') + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),'callee') callee_xavp("testid",1) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) callee_xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") self.real:clean() - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") end function TestNGCPRealPrefs:test_callee_clean() @@ -171,21 +171,21 @@ TestNGCPRealPrefs = {} --class caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") self.real:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_real_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_real_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_real_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_real_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") end function TestNGCPRealPrefs:test_caller_clean() @@ -198,21 +198,21 @@ TestNGCPRealPrefs = {} --class caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") self.real:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_real_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_real_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_real_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>dummy)"),"callee") end function TestNGCPRealPrefs:test_tostring() @@ -222,7 +222,7 @@ TestNGCPRealPrefs = {} --class callee_xavp("foo","foo") caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(tostring(self.real),'caller_real_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_real_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') + lu.assertEquals(tostring(self.real),'caller_real_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_real_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n') end -- class TestNGCPRealPrefs --EOF diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index 66fe9c2..833ad5c 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local lemock = require('lemock') local utils = require 'ngcp.utils' local utable = utils.table @@ -71,26 +71,26 @@ TestNGCPUserPrefs = {} --class end function TestNGCPUserPrefs:test_caller_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:caller_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:caller_load(), {}) end function TestNGCPUserPrefs:test_callee_load_empty() - assertEvalToTrue(self.d.config) - assertEquals(self.d:callee_load(), {}) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d:callee_load(), {}) end function TestNGCPUserPrefs:test_init() - assertEquals(self.d.group, 'usr_prefs') - assertNotNil(self.d.query) - assertNotNil(self.d.config) - assertEquals(self.d.__class__, 'NGCPUserPrefs') - assertEquals(self.d.db_table, "usr_preferences") + lu.assertEquals(self.d.group, 'usr_prefs') + lu.assertNotNil(self.d.query) + lu.assertNotNil(self.d.config) + lu.assertEquals(self.d.__class__, 'NGCPUserPrefs') + lu.assertEquals(self.d.db_table, "usr_preferences") end function TestNGCPUserPrefs:test_query_format() local query = self.d.query:format(self.d.db_table, "uuid") - assertEquals( query, + lu.assertEquals( query, "SELECT * FROM usr_preferences WHERE uuid ='uuid' ORDER BY id DESC" ) end @@ -109,13 +109,13 @@ TestNGCPUserPrefs = {} --class for k,v in pairs(defaults) do utable.add(keys_expected, k) - assertEquals(KSR.pv.get("$xavp("..level.."_usr_prefs=>"..k..")"), v) + lu.assertEquals(KSR.pv.get("$xavp("..level.."_usr_prefs=>"..k..")"), v) end return keys_expected end function TestNGCPUserPrefs:test_caller_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -138,17 +138,17 @@ TestNGCPUserPrefs = {} --class "ac" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>account_id)"),2) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>cli)"),"4311001") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>cc)"),"43") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>ac)"),"1") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>account_id)"),2) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>cli)"),"4311001") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>cc)"),"43") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>ac)"),"1") --assertEquals(KSR.pv.get("$xavp(caller_real_prefs=>ringtimeout)"), self.d.config.default.usr.ringtimeout) - assertItemsEquals(keys, TestNGCPUserPrefs:get_defaults("caller", {"account_id", "cli", "cc", "ac", "ringtimeout"})) + lu.assertItemsEquals(keys, TestNGCPUserPrefs:get_defaults("caller", {"account_id", "cli", "cc", "ac", "ringtimeout"})) end function TestNGCPUserPrefs:test_callee_load() - assertEvalToTrue(self.d.config) + lu.assertNotNil(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")) @@ -171,25 +171,25 @@ TestNGCPUserPrefs = {} --class "ac" } - assertItemsEquals(keys, lkeys) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>account_id)"),2) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>cli)"),"4311001") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>cc)"),"43") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>ac)"),"1") + lu.assertItemsEquals(keys, lkeys) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>account_id)"),2) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>cli)"),"4311001") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>cc)"),"43") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>ac)"),"1") --assertEquals(KSR.pv.get("$xavp(callee_real_prefs=>ringtimeout)"), self.d.config.default.usr.ringtimeout) - assertItemsEquals(keys, TestNGCPUserPrefs:get_defaults("callee", {"account_id", "cli", "cc", "ac", "ringtimeout"})) + lu.assertItemsEquals(keys, TestNGCPUserPrefs:get_defaults("callee", {"account_id", "cli", "cc", "ac", "ringtimeout"})) end function TestNGCPUserPrefs:test_clean() local xavp = NGCPUserPrefs:xavp('callee') xavp("testid",1) xavp("foo","foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") self.d:clean() - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"), "callee") end function TestNGCPUserPrefs:test_callee_clean() @@ -199,19 +199,19 @@ TestNGCPUserPrefs = {} --class local caller_xavp = NGCPUserPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") self.d:clean('callee') - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),'caller') - assertNil(KSR.pv.get("$xavp(callee_usr_prefs=>testid)")) - assertNil(KSR.pv.get("$xavp(callee_usr_prefs=>foo)")) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),'caller') + lu.assertNil(KSR.pv.get("$xavp(callee_usr_prefs=>testid)")) + lu.assertNil(KSR.pv.get("$xavp(callee_usr_prefs=>foo)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") end function TestNGCPUserPrefs:test_caller_clean() @@ -221,19 +221,19 @@ TestNGCPUserPrefs = {} --class local caller_xavp = NGCPUserPrefs:xavp('caller') caller_xavp("other",1) caller_xavp("otherfoo","foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>other)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") self.d:clean('caller') - assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") - assertNil(KSR.pv.get("$xavp(caller_usr_prefs=>other)")) - assertNil(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)")) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") - assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_usr_prefs=>dummy)"),"caller") + lu.assertNil(KSR.pv.get("$xavp(caller_usr_prefs=>other)")) + lu.assertNil(KSR.pv.get("$xavp(caller_usr_prefs=>otherfoo)")) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>foo)"),"foo") + lu.assertEquals(KSR.pv.get("$xavp(callee_usr_prefs=>dummy)"),"callee") end function TestNGCPUserPrefs:test_tostring() @@ -244,7 +244,7 @@ TestNGCPUserPrefs = {} --class caller_xavp("other",1) caller_xavp("otherfoo","foo") local expected = 'caller_usr_prefs:{other={1},otherfoo={"foo"},dummy={"caller"}}\ncallee_usr_prefs:{dummy={"callee"},testid={1},foo={"foo"}}\n' - assertEquals(self.d:__tostring(), expected) - assertEquals(tostring(self.d), expected) + lu.assertEquals(self.d:__tostring(), expected) + lu.assertEquals(tostring(self.d), expected) end -- class TestNGCPUserPrefs diff --git a/tests/ngcp_xavp.lua b/tests/ngcp_xavp.lua index 0042ed6..b69fbdb 100644 --- a/tests/ngcp_xavp.lua +++ b/tests/ngcp_xavp.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local NGCPXAvp = require 'ngcp.xavp' local ksrMock = require 'mocks.ksr' @@ -63,33 +63,33 @@ TestNGCPXAvp = {} --class function TestNGCPXAvp:test_create() local xavp = NGCPXAvp:new("caller", "peer", {}) - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") xavp = NGCPXAvp:new("callee", "peer", {}) - assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") end function TestNGCPXAvp:test_xavp_id() local xavp = NGCPXAvp:new("caller", "peer", vals) - assertEquals(xavp.level, "caller") - assertEquals(xavp.group, "peer") - assertEquals(xavp.name, "caller_peer") - assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere"}) + lu.assertEquals(xavp.level, "caller") + lu.assertEquals(xavp.group, "peer") + lu.assertEquals(xavp.name, "caller_peer") + lu.assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere"}) end function TestNGCPXAvp:test_xavp_get() local xavp = NGCPXAvp:new("caller", "peer", vals) KSR.pv.sets("$xavp(caller_peer=>testid)", "value") - assertEquals(xavp("testid"), "value") + lu.assertEquals(xavp("testid"), "value") KSR.pv.sets("$xavp(caller_peer=>testid)", "1") - assertItemsEquals(xavp("testid"), "1") + lu.assertItemsEquals(xavp("testid"), "1") end function TestNGCPXAvp:test_xavp_get_all() local xavp = NGCPXAvp:new("caller", "peer", vals) KSR.pv.sets("$xavp(caller_peer=>testid)", "value") - assertEquals(xavp("testid"), "value") + lu.assertEquals(xavp("testid"), "value") KSR.pv.sets("$xavp(caller_peer[0]=>testid)", "1") - assertItemsEquals(xavp:all("testid"), {"1", "value"}) + lu.assertItemsEquals(xavp:all("testid"), {"1", "value"}) end function TestNGCPXAvp:test_xavp_set() @@ -97,35 +97,35 @@ TestNGCPXAvp = {} --class local lvals = {1,"2",3,nil} for i=1,#lvals do xavp("testid",lvals[i]) - assertEquals(xavp("testid"), lvals[i]) - assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),lvals[i]) + lu.assertEquals(xavp("testid"), lvals[i]) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),lvals[i]) end end function TestNGCPXAvp:test_clean() local xavp = NGCPXAvp:new("caller", "peer", vals) xavp("testid", 1) - assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),1) - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),1) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") xavp:clean() - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") - assertNil(xavp("testid")) - assertNil(KSR.pv.get("$xavp(caller_peer=>testid)")) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") + lu.assertNil(xavp("testid")) + lu.assertNil(KSR.pv.get("$xavp(caller_peer=>testid)")) end function TestNGCPXAvp:test_clean_all() local xavp_caller = NGCPXAvp:new("caller", "peer", {}) - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") local xavp_callee = NGCPXAvp:new("callee", "peer", {}) - assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") xavp_caller:clean() - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") - assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"),"caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"),"callee") xavp_callee:clean() - assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"), "callee") - assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"), "caller") + lu.assertEquals(KSR.pv.get("$xavp(callee_peer=>dummy)"), "callee") + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>dummy)"), "caller") end function TestNGCPXAvp:test_clean_key() @@ -133,29 +133,29 @@ TestNGCPXAvp = {} --class local lvals = {1,"2",3,nil} for i=1,#lvals do xavp("testid",lvals[i]) - assertEquals(xavp("testid"), lvals[i]) - assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),lvals[i]) + lu.assertEquals(xavp("testid"), lvals[i]) + lu.assertEquals(KSR.pv.get("$xavp(caller_peer=>testid)"),lvals[i]) end xavp("other", 1) xavp("other", 2) xavp("other", 3) - assertItemsEquals(xavp:all("other"), {3,2,1}) + lu.assertItemsEquals(xavp:all("other"), {3,2,1}) xavp:clean("testid") - assertIsNil(xavp("testid")) - assertItemsEquals(xavp:all("other"), {3,2,1}) + lu.assertIsNil(xavp("testid")) + lu.assertItemsEquals(xavp:all("other"), {3,2,1}) end function TestNGCPXAvp:test_tostring() local xavp = NGCPXAvp:new("caller", "peer", {}) - assertEquals(tostring(xavp), '{dummy={"caller"}}') + lu.assertEquals(tostring(xavp), '{dummy={"caller"}}') end function TestNGCPXAvp:test_keys() local xavp = NGCPXAvp:new("caller", "peer", vals) xavp("testid", 1) - assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere","testid"}) + lu.assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere","testid"}) xavp:clean() - assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere","testid"}) + lu.assertItemsEquals(xavp.keys, {"account_id","whatever","elsewhere","testid"}) end -- class TestNGCPXAvp diff --git a/tests/use_cases.lua b/tests/use_cases.lua index bf60755..da34209 100644 --- a/tests/use_cases.lua +++ b/tests/use_cases.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2016 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local NGCPXAvp = require 'ngcp.xavp' local NGCPAvp = require 'ngcp.avp' @@ -40,9 +40,9 @@ function TestUseCases:test_copy_avp() for i=1,#vals do avp(vals[i]) end - assertItemsEquals(avp:all(), okvals) + lu.assertItemsEquals(avp:all(), okvals) xavp:clean('cfu') - assertItemsEquals(xavp:all('cfu'), nil) + lu.assertItemsEquals(xavp:all('cfu'), nil) xavp('cfu', avp:all()) - assertItemsEquals(xavp:all('cfu'), okvals) + lu.assertItemsEquals(xavp:all('cfu'), okvals) end diff --git a/tests/utils.lua b/tests/utils.lua index 3002ab8..1cfe0f4 100644 --- a/tests/utils.lua +++ b/tests/utils.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local utils = require 'ngcp.utils' -- luacheck: ignore TestUtils @@ -37,170 +37,170 @@ TestUtils = {} end function TestUtils:test_table_deepcopy() - assertNotIs(utils.table.deepcopy(self.simple_hash), self.simple_hash) + lu.assertNotIs(utils.table.deepcopy(self.simple_hash), self.simple_hash) -- if the parameter is not a table... it has te be the same - assertIs(utils.table.deepcopy("hola"), "hola") + lu.assertIs(utils.table.deepcopy("hola"), "hola") end function TestUtils:test_table_contains() - assertTrue(utils.table.contains(self.simple_hash, 3)) - assertFalse(utils.table.contains(self.simple_hash, 4)) - assertFalse(utils.table.contains(nil)) - assertError(utils.table.contains, "hola",1) + lu.assertTrue(utils.table.contains(self.simple_hash, 3)) + lu.assertFalse(utils.table.contains(self.simple_hash, 4)) + lu.assertFalse(utils.table.contains(nil)) + lu.assertError(utils.table.contains, "hola",1) end function TestUtils:test_table_add() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.add(self.simple_list, 1) - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.add(self.simple_list, 5) - assertEquals(self.simple_list, {1,2,3,5}) + lu.assertEquals(self.simple_list, {1,2,3,5}) utils.table.add(self.simple_list, 4) - assertEquals(self.simple_list, {1,2,3,5,4}) + lu.assertEquals(self.simple_list, {1,2,3,5,4}) end function TestUtils:test_table_del() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.del(self.simple_list, 1) - assertEquals(self.simple_list, {2,3}) + lu.assertEquals(self.simple_list, {2,3}) utils.table.del(self.simple_list, 3) - assertEquals(self.simple_list, {2}) + lu.assertEquals(self.simple_list, {2}) utils.table.del(self.simple_list, 2) - assertEquals(self.simple_list, {}) + lu.assertEquals(self.simple_list, {}) end function TestUtils:test_table_del_multy() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) table.insert(self.simple_list, 2) - assertEquals(self.simple_list, {1,2,3,2}) + lu.assertEquals(self.simple_list, {1,2,3,2}) utils.table.del(self.simple_list, 1) - assertEquals(self.simple_list, {2,3,2}) + lu.assertEquals(self.simple_list, {2,3,2}) utils.table.del(self.simple_list, 2) - assertEquals(self.simple_list, {3}) + lu.assertEquals(self.simple_list, {3}) utils.table.del(self.simple_list, 3) - assertEquals(self.simple_list, {}) + lu.assertEquals(self.simple_list, {}) end function TestUtils:test_table_del_empty() local t = {} utils.table.del(t, 4) - assertEquals(t, {}) + lu.assertEquals(t, {}) end function TestUtils:test_table_size() local t = utils.table.size(nil) - assertEquals(t, 0) + lu.assertEquals(t, 0) t = utils.table.size({1,2}) - assertEquals(t, 2) + lu.assertEquals(t, 2) t = utils.table.size({}) - assertEquals(t, 0) + lu.assertEquals(t, 0) t = utils.table.size({hola={1,2},adios=2}) - assertEquals(t, 2) + lu.assertEquals(t, 2) end function TestUtils:test_table_shuffle() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.add(self.simple_list, 4) utils.table.add(self.simple_list, 5) utils.table.add(self.simple_list, 6) local tmp = utils.table.shuffle(self.simple_list) - assertItemsEquals(self.simple_list, tmp) - assertNotEquals(self.simple_list, tmp) + lu.assertItemsEquals(self.simple_list, tmp) + lu.assertNotEquals(self.simple_list, tmp) local tmp2 = utils.table.shuffle(self.simple_list) - assertItemsEquals(self.simple_list, tmp2) + lu.assertItemsEquals(self.simple_list, tmp2) --print(table.tostring(tmp)) --print(table.tostring(tmp2)) - assertNotEquals(tmp2, tmp) + lu.assertNotEquals(tmp2, tmp) end function TestUtils:test_table_shift() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.add(self.simple_list, 4) utils.table.add(self.simple_list, 5) utils.table.add(self.simple_list, 6) utils.table.shift(self.simple_list, 2) - assertEquals(self.simple_list, {3,4,5,6,1,2}) + lu.assertEquals(self.simple_list, {3,4,5,6,1,2}) end function TestUtils:test_table_shift2() local tmp = utils.table.deepcopy(self.simple_list) - assertEquals(tmp, {1,2,3}) + lu.assertEquals(tmp, {1,2,3}) utils.table.shift(tmp, 0) - assertEquals(tmp, {1,2,3}) + lu.assertEquals(tmp, {1,2,3}) tmp = utils.table.deepcopy(self.simple_list) utils.table.shift(tmp, 1) - assertEquals(tmp, {2,3,1}) + lu.assertEquals(tmp, {2,3,1}) tmp = utils.table.deepcopy(self.simple_list) utils.table.shift(tmp, 2) - assertEquals(tmp, {3,1,2}) + lu.assertEquals(tmp, {3,1,2}) tmp = utils.table.deepcopy(self.simple_list) utils.table.shift(tmp, 3) - assertEquals(tmp, {1,2,3}) + lu.assertEquals(tmp, {1,2,3}) tmp = utils.table.deepcopy(self.simple_list) utils.table.shift(tmp, 4) - assertEquals(tmp, {2,3,1}) + lu.assertEquals(tmp, {2,3,1}) end function TestUtils:test_table_tostring() - assertError(utils.table.tostring, "nil") - assertEquals(utils.table.tostring(self.simple_list), "{1,2,3}") - assertEvalToTrue(utils.table.tostring(self.simple_hash)) + lu.assertError(utils.table.tostring, "nil") + lu.assertEquals(utils.table.tostring(self.simple_list), "{1,2,3}") + lu.assertEvalToTrue(utils.table.tostring(self.simple_hash)) --print(table.tostring(self.simple_hash) .. "\n") - assertEvalToTrue(utils.table.tostring(self.complex_hash)) + lu.assertEvalToTrue(utils.table.tostring(self.complex_hash)) --print(table.tostring(self.complex_hash)) end function TestUtils:test_implode() - assertEquals(utils.implode(',', self.simple_list, "'"), "'1','2','3'") - assertError(utils.implode, nil, self.simple_list, "'") - assertError(utils.implode, ',', nil, "'") + lu.assertEquals(utils.implode(',', self.simple_list, "'"), "'1','2','3'") + lu.assertError(utils.implode, nil, self.simple_list, "'") + lu.assertError(utils.implode, ',', nil, "'") end function TestUtils:test_explode() - assertItemsEquals(utils.explode(',',"1,2,3"), {'1','2','3'}) - assertItemsEquals(utils.explode('=>',"1=>2=>3"), {'1','2','3'}) + lu.assertItemsEquals(utils.explode(',',"1,2,3"), {'1','2','3'}) + lu.assertItemsEquals(utils.explode('=>',"1=>2=>3"), {'1','2','3'}) end function TestUtils:test_string_explode_values() - assertError(utils.string.explode_values, nil) - assertItemsEquals(utils.string.explode_values(''), {}) - assertItemsEquals(utils.string.explode_values('1'), {'1'}) - assertItemsEquals(utils.string.explode_values('123'), {'1','12','123'}) + lu.assertError(utils.string.explode_values, nil) + lu.assertItemsEquals(utils.string.explode_values(''), {}) + lu.assertItemsEquals(utils.string.explode_values('1'), {'1'}) + lu.assertItemsEquals(utils.string.explode_values('123'), {'1','12','123'}) end function TestUtils:test_starts() - assertError(utils.string.stats, nil, "g") - assertTrue(utils.string.starts("goga", "g")) - assertTrue(utils.string.starts("goga", "go")) - assertTrue(utils.string.starts("goga", "gog")) - assertTrue(utils.string.starts("goga", "goga")) - assertFalse(utils.string.starts("goga", "a")) - assertError(utils.string.starts, "goga", nil) - assertTrue(utils.string.starts("$goga", "$")) - assertTrue(utils.string.starts("(goga)", "(")) + lu.assertError(utils.string.stats, nil, "g") + lu.assertTrue(utils.string.starts("goga", "g")) + lu.assertTrue(utils.string.starts("goga", "go")) + lu.assertTrue(utils.string.starts("goga", "gog")) + lu.assertTrue(utils.string.starts("goga", "goga")) + lu.assertFalse(utils.string.starts("goga", "a")) + lu.assertError(utils.string.starts, "goga", nil) + lu.assertTrue(utils.string.starts("$goga", "$")) + lu.assertTrue(utils.string.starts("(goga)", "(")) end function TestUtils:test_ends() - assertError(utils.string.ends, nil, "g") - assertTrue(utils.string.ends("goga", "a")) - assertTrue(utils.string.ends("goga", "ga")) - assertTrue(utils.string.ends("goga", "oga")) - assertTrue(utils.string.ends("goga", "goga")) - assertFalse(utils.string.ends("goga", "f")) - assertError(utils.string.ends, "goga", nil) + lu.assertError(utils.string.ends, nil, "g") + lu.assertTrue(utils.string.ends("goga", "a")) + lu.assertTrue(utils.string.ends("goga", "ga")) + lu.assertTrue(utils.string.ends("goga", "oga")) + lu.assertTrue(utils.string.ends("goga", "goga")) + lu.assertFalse(utils.string.ends("goga", "f")) + lu.assertError(utils.string.ends, "goga", nil) end function TestUtils:test_table_merge() - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.merge(self.simple_list, {1}) - assertEquals(self.simple_list, {1,2,3}) + lu.assertEquals(self.simple_list, {1,2,3}) utils.table.merge(self.simple_list, {5}) - assertEquals(self.simple_list, {1,2,3,5}) + lu.assertEquals(self.simple_list, {1,2,3,5}) utils.table.merge(self.simple_list, {5,4}) - assertEquals(self.simple_list, {1,2,3,5,4}) + lu.assertEquals(self.simple_list, {1,2,3,5,4}) utils.table.merge(nil, nil) utils.table.merge(nil, {}) local tmp = {} utils.table.merge(tmp, {1,2,3,5,4}) - assertEquals(tmp, {1,2,3,5,4}) + lu.assertEquals(tmp, {1,2,3,5,4}) end diff --git a/tests/utils_stack.lua b/tests/utils_stack.lua index 5019ba8..57dc20b 100644 --- a/tests/utils_stack.lua +++ b/tests/utils_stack.lua @@ -1,5 +1,5 @@ -- --- Copyright 2013-2015 SipWise Team +-- Copyright 2013-2020 SipWise Team -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ -- On Debian systems, the complete text of the GNU General -- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -- -require('luaunit') +local lu = require('luaunit') local utils = require 'ngcp.utils' local Stack = utils.Stack @@ -25,118 +25,118 @@ local Stack = utils.Stack TestStack = {} function TestStack:test() local s = Stack.new() - assertEquals(type(s), 'table') - assertEquals(s.__class__, 'Stack') + lu.assertEquals(type(s), 'table') + lu.assertEquals(s.__class__, 'Stack') end function TestStack:test_size() local s = Stack:new() - assertEquals(s:size(),0) + lu.assertEquals(s:size(),0) s:push(1) - assertEquals(s:size(),1) + lu.assertEquals(s:size(),1) s:pop() - assertEquals(s:size(),0) + lu.assertEquals(s:size(),0) end function TestStack:test_push() local s s = Stack:new() s:push(1) - assertEquals(s:size(),1) + lu.assertEquals(s:size(),1) end function TestStack:test_pop() local s = Stack:new() - assertEquals(s:pop(), nil) + lu.assertEquals(s:pop(), nil) s:push(1) - assertEquals(s:size(),1) - assertEquals(s:pop(),1) - assertEquals(s:size(),0) + lu.assertEquals(s:size(),1) + lu.assertEquals(s:pop(),1) + lu.assertEquals(s:size(),0) end function TestStack:test_get() local s = Stack:new() s:push(1) - assertEquals(s:get(0),1) + lu.assertEquals(s:get(0),1) s:push({1,2,3}) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),1) - assertError(s.get, s, -1) - assertIsNil(s:get(2)) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),1) + lu.assertError(s.get, s, -1) + lu.assertIsNil(s:get(2)) end function TestStack:test_get_op() local s = Stack:new() s:push(1) - assertEquals(s[0],1) + lu.assertEquals(s[0],1) s:push({1,2,3}) - assertEquals(s[0],{1,2,3}) - assertEquals(s[1],1) - assertIsNil(s[2]) + lu.assertEquals(s[0],{1,2,3}) + lu.assertEquals(s[1],1) + lu.assertIsNil(s[2]) end function TestStack:test_set() local s = Stack:new() s:push(1) s:push({1,2,3}) - assertEquals(s:size(),2) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),1) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),1) s:set(1, 2) - assertEquals(s:size(),2) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),2) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),2) s:set(2, 3) - assertEquals(s:size(),2) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),2) - assertIsNil(s:get(2)) - assertError(s.set, s, "no", -1) - assertError(s.set, s, -1, 2) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),2) + lu.assertIsNil(s:get(2)) + lu.assertError(s.set, s, "no", -1) + lu.assertError(s.set, s, -1, 2) end function TestStack:test_set_op() local s = Stack:new() s:push(1) s:push({1,2,3}) - assertEquals(s:size(),2) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),1) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),1) s[1] = 2 - assertEquals(s:size(),2) - assertEquals(s:get(0),{1,2,3}) - assertEquals(s:get(1),2) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),{1,2,3}) + lu.assertEquals(s:get(1),2) s[0] = "new" - assertEquals(s:size(),2) - assertEquals(s:get(0),"new") - assertEquals(s:get(1),2) + lu.assertEquals(s:size(),2) + lu.assertEquals(s:get(0),"new") + lu.assertEquals(s:get(1),2) s[1] = "old" - assertEquals(s:get(0),"new") - assertEquals(s:get(1),"old") - assertEquals(s:size(),2) + lu.assertEquals(s:get(0),"new") + lu.assertEquals(s:get(1),"old") + lu.assertEquals(s:size(),2) s[2] = "error" - assertEquals(s:get(0),"new") - assertEquals(s:get(1),"old") - assertIsNil(s:get(2)) - assertEquals(s:size(),2) + lu.assertEquals(s:get(0),"new") + lu.assertEquals(s:get(1),"old") + lu.assertIsNil(s:get(2)) + lu.assertEquals(s:size(),2) end function TestStack:test_list() local s = Stack:new() local l = s:list() - assertEquals(#l, 0) + lu.assertEquals(#l, 0) s:push(1) s:push({1,2,3}) - assertEquals(s:size(),2) + lu.assertEquals(s:size(),2) l = s:list() - assertItemsEquals(l[1],{1,2,3}) - assertEquals(l[2],1) - assertEquals(s:size(),2) + lu.assertItemsEquals(l[1],{1,2,3}) + lu.assertEquals(l[2],1) + lu.assertEquals(s:size(),2) end function TestStack:test_tostring() local s = Stack:new() s:push(1) - assertEquals(tostring(s), "{1}") + lu.assertEquals(tostring(s), "{1}") s:push(2) - assertEquals(tostring(s), "{2,1}") + lu.assertEquals(tostring(s), "{2,1}") end