Move ?Fetch classes to tests_v files

tests/ngcp_dp.lua

@@ -1,8 +1,8 @@
 #!/usr/bin/env lua5.1
 require('luaunit')
+require('lemock')
 require 'ngcp.utils'
 require 'tests_v.dp_vars'
-require('lemock')
 
 if not sr then
     require 'mocks.sr'
@@ -12,24 +12,6 @@ else
 end
 local mc = nil
 
-DPFetch = {
-    __class__ = 'DPFetch',
-    _i = 1
-}
-    function DPFetch:new()
-        t = {}
-        return setmetatable(t, { __index = DPFetch })
-    end
-
-    function DPFetch:val(uuid)
-        self._i = self._i + 1
-        return dp_vars[uuid][self._i-1]
-    end
-
-    function DPFetch:reset()
-        self._i = 1
-    end
-
 TestNGCPDomainPrefs = {} --class
 
     function TestNGCPDomainPrefs:setUp()

tests/ngcp_pp.lua

@@ -1,8 +1,8 @@
 #!/usr/bin/env lua5.1
 require('luaunit')
+require('lemock')
 require 'ngcp.utils'
 require 'tests_v.pp_vars'
-require('lemock')
 
 if not sr then
     require 'mocks.sr'
@@ -12,24 +12,6 @@ else
 end
 local mc = nil
 
-PPFetch = {
-    __class__ = 'PPFetch',
-    _i = 1
-}
-    function PPFetch:new()
-        t = {}
-        return setmetatable(t, { __index = PPFetch })
-    end
-
-    function PPFetch:val(uuid)
-        self._i = self._i + 1
-        return pp_vars[uuid][self._i-1]
-    end
-
-    function PPFetch:reset()
-        self._i = 1
-    end
-
 TestNGCPPeerPrefs = {} --class
 
     function TestNGCPPeerPrefs:setUp()

tests/ngcp_up.lua

@@ -1,8 +1,8 @@
 #!/usr/bin/env lua5.1
 require('luaunit')
+require('lemock')
 require 'ngcp.utils'
 require 'tests_v.up_vars'
-require('lemock')
 
 if not sr then
     require 'mocks.sr'
@@ -12,24 +12,6 @@ else
 end
 local mc = nil
 
-UPFetch = {
-    __class__ = 'UPFetch',
-    _i = 1
-}
-    function UPFetch:new()
-        t = {}
-        return setmetatable(t, { __index = UPFetch })
-    end
-
-    function UPFetch:val(uuid)
-        self._i = self._i + 1
-        return up_vars[uuid][self._i-1]
-    end
-
-    function UPFetch:reset()
-        self._i = 1
-    end
-
 TestNGCPUserPrefs = {} --class
 
     function TestNGCPUserPrefs:setUp()

tests_v/dp_vars.lua

@@ -133,4 +133,23 @@ dp_vars = {
         last_modified = "1900-01-01 00:00:01"
       }
     }
-}
+}
+
+DPFetch = {
+    __class__ = 'DPFetch',
+    _i = 1
+}
+    function DPFetch:new()
+        t = {}
+        return setmetatable(t, { __index = DPFetch })
+    end
+
+    function DPFetch:val(uuid)
+        self._i = self._i + 1
+        return dp_vars[uuid][self._i-1]
+    end
+
+    function DPFetch:reset()
+        self._i = 1
+    end
+--EOF

tests_v/pp_vars.lua

@@ -153,4 +153,23 @@ pp_vars = {
           last_modified = "0000-00-00 00:00:00"
         }
     }
-}
+}
+
+PPFetch = {
+    __class__ = 'PPFetch',
+    _i = 1
+}
+    function PPFetch:new()
+        t = {}
+        return setmetatable(t, { __index = PPFetch })
+    end
+
+    function PPFetch:val(uuid)
+        self._i = self._i + 1
+        return pp_vars[uuid][self._i-1]
+    end
+
+    function PPFetch:reset()
+        self._i = 1
+    end
+--EOF

tests_v/up_vars.lua

@@ -83,4 +83,23 @@ up_vars = {
           last_modified = "1900-01-01 00:00:01"
         }
     }
-}
+}
+
+UPFetch = {
+    __class__ = 'UPFetch',
+    _i = 1
+}
+    function UPFetch:new()
+        t = {}
+        return setmetatable(t, { __index = UPFetch })
+    end
+
+    function UPFetch:val(uuid)
+        self._i = self._i + 1
+        return up_vars[uuid][self._i-1]
+    end
+
+    function UPFetch:reset()
+        self._i = 1
+    end
+--EOF