Added log for NGCPDomainPrefs, NGCP

Fix lemock use on test for NGCPDomainPrefs

ngcp/dp.lua

@@ -29,7 +29,10 @@ NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
         local cur = assert (con:execute(query))
         local row = cur:fetch({}, "a")
         if row then
+            sr.log("dbg",string.format("adding xavp %s[%d]", 'domain', level))
             self.xavp = NGCPXAvp:new(level,'domain',row)
+        else
+            sr.log("dbg", string.format("no results for query:%s", query))
         end
         cur:close()
         con:close()

ngcp/ngcp.lua

@@ -25,6 +25,7 @@ NGCPConfig_MT = { __index = NGCPConfig }
 
     function NGCPConfig:getDBConnection()
         local env = assert (luasql.mysql())
+        sr.log("dbg","connecting to mysql")
         return assert (env:connect( self.db_database,
             self.db_username, self.db_pass, self.db_host, self.db_port))
     end

tests/ngcp_dp.lua

@@ -2,31 +2,35 @@
 require('luaunit')
 require 'mocks.sr'
 require 'ngcp.utils'
+require 'tests_v.dp_vars'
 
 sr = srMock:new()
-
+local mc = nil
-local mc = lemock.controller()
-local config = mc:mock()
-local mysql = mc:mock()
-local env = mc:mock()
-local con = mc:mock()
-local cur = mc:mock()
-
-package.loaded.luasql = nil
-package.preload['luasql.mysql'] = function ()
-    luasql = {}
-    luasql.mysql = mysql
-    return mysql
-end
-
-require 'ngcp.dp'
-require 'tests_v.dp_vars'
 
 TestNGCPDomainPrefs = {} --class
 
     function TestNGCPDomainPrefs:setUp()
-        --print("TestNGCPDomainPrefs:setUp")
+        mc = lemock.controller()
-        self.d = NGCPDomainPrefs:new(config)
+        self.config = mc:mock()
+        self.mysql = mc:mock()
+        self.env = mc:mock()
+        self.con = mc:mock()
+        self.cur = mc:mock()
+
+        package.loaded.luasql = nil
+        package.preload['luasql.mysql'] = function ()
+            luasql = {}
+            luasql.mysql = mysql
+            return mysql
+        end
+
+        require 'ngcp.dp'
+
+        self.d = NGCPDomainPrefs:new(self.config)
+    end
+
+    function TestNGCPDomainPrefs:rtearDown()
+        sr.pv.vars = {}
     end
 
     function TestNGCPDomainPrefs:test_init()
@@ -36,11 +40,11 @@ TestNGCPDomainPrefs = {} --class
 
     function TestNGCPDomainPrefs:test_caller_load()
         assertTrue(self.d.config)
-        config:getDBConnection() ;mc :returns(con)
+        self.config:getDBConnection() ;mc :returns(self.con)
-        con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'")  ;mc :returns(cur)
+        self.con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'")  ;mc :returns(self.cur)
-        cur:fetch(mc.ANYARGS)    ;mc :returns(dp_vars["d_192_168_51_56"])
+        self.cur:fetch(mc.ANYARGS)    ;mc :returns(dp_vars["d_192_168_51_56"])
-        cur:close()
+        self.cur:close()
-        con:close()
+        self.con:close()
 
         mc:replay()
         self.d:caller_load("192.168.51.56")
@@ -48,10 +52,31 @@ TestNGCPDomainPrefs = {} --class
 
         assertTrue(self.d.xavp)
         assertEquals(self.d.xavp("sst_enable"),"no")
-        assertEquals(sr.pv.vars["$xavp(domain[0]=>dummy)"],"")
+        assertEquals(sr.pv.vars["$xavp(domain[0]=>dummy)"], "")
+        assertEquals(self.d.xavp("dummy"),"")
         assertEquals(sr.pv.vars["$xavp(domain[0]=>sst_enable)"],"no")
         assertFalse(self.d.xavp("error_key"))
     end
+
+    function TestNGCPDomainPrefs:test_callee_load()
+        assertTrue(self.d.config)
+        self.config:getDBConnection() ;mc :returns(self.con)
+        self.con:execute("SELECT * FROM dom_preferences WHERE domain ='192.168.51.56'")  ;mc :returns(self.cur)
+        self.cur:fetch(mc.ANYARGS)    ;mc :returns(dp_vars["d_192_168_51_56"])
+        self.cur:close()
+        self.con:close()
+
+        mc:replay()
+        self.d:callee_load("192.168.51.56")
+        mc:verify()
+
+        assertTrue(self.d.xavp)
+        assertEquals(self.d.xavp("sst_enable"),"no")
+        print(table.tostring(sr.pv.vars))
+        assertFalse(sr.pv.vars["$xavp(domain[1]=>dummy)"])
+        assertEquals(sr.pv.vars["$xavp(domain[1]=>sst_enable)"],"no")
+        assertFalse(self.d.xavp("error_key"))
+    end
 -- class TestNGCPDomainPrefs
 
 ---- Control test output: