Renaming/cleanup

Author: ryanplusplus

mock.lua

@@ -126,7 +126,7 @@ end
 
 
 
-function Mock:newFunction()
+function Mock:mockFunction()
   local f
 
   function f(...)
@@ -136,7 +136,7 @@ function Mock:newFunction()
   return f
 end
 
-function Mock:newMethod()
+function Mock:mockMethod()
   local m
 
   function m(...)
@@ -148,24 +148,24 @@ function Mock:newMethod()
   return m
 end
 
-function Mock:newTable(t)
+function Mock:mockTable(t)
   local mocked = {}
 
   for k, v in pairs(t) do
     if type(v) == 'function' then
-      mocked[k] = self:newFunction()
+      mocked[k] = self:mockFunction()
     end
   end
 
   return mocked
 end
 
-function Mock:newObject(o)
+function Mock:mockObject(o)
   local mocked = {}
 
   for k, v in pairs(o) do
     if type(v) == 'function' then
-      mocked[k] = self:newMethod()
+      mocked[k] = self:mockMethod()
     end
   end
 

spec/mock_spec.lua

@@ -8,14 +8,14 @@ describe('The mock library', function()
   end
 
   it('should allow you to verify that a function is called', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     mock(m):shouldBeCalled():
     when(function() m() end)
   end)
 
   it('should alert you when a function is not called', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     shouldFail(function()
       mock(m):shouldBeCalled():
@@ -24,8 +24,8 @@ describe('The mock library', function()
   end)
 
   it('should alert you when the wrong function is called', function()
-    local m1 = mock:newFunction()
-    local m2 = mock:newFunction()
+    local m1 = mock:mockFunction()
+    local m2 = mock:mockFunction()
 
     shouldFail(function()
       mock(m1):shouldBeCalled():
@@ -34,22 +34,22 @@ describe('The mock library', function()
   end)
 
   it('should alert you when a function is called unexpectedly', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     shouldFail(function()
       m()
     end)
   end)
 
   it('should allow you to verify that a function has been called with the correct arguments', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     mock(m):shouldBeCalledWith(1, '2'):
     when(function() m(1, '2') end)
   end)
 
   it('should alert you when a function has been called with incorrect arguments', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     shouldFail(function()
       mock(m):shouldBeCalledWith(1, '2'):
@@ -58,7 +58,7 @@ describe('The mock library', function()
   end)
 
   it('should allow you to specify the return value of a mocked function', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     mock(m):shouldBeCalled():andWillReturn(4):
     when(function()
@@ -67,7 +67,7 @@ describe('The mock library', function()
   end)
 
   it('should allow you to specify multiple return values for a mocked function', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     mock(m):shouldBeCalled():andWillReturn(1, 2):
     when(function()
@@ -78,7 +78,7 @@ describe('The mock library', function()
   end)
 
   it('should allow you to check that a function has been called multiple times', function()
-    local m = mock:newFunction()
+    local m = mock:mockFunction()
 
     mock(m):shouldBeCalled():
     andAlso(mock(m):shouldBeCalledWith(1, 2, 3)):
@@ -89,8 +89,8 @@ describe('The mock library', function()
   end)
 
   it('should allow you to check that multiple functions are called', function()
-    local m1 = mock:newFunction()
-    local m2 = mock:newFunction()
+    local m1 = mock:mockFunction()
+    local m2 = mock:mockFunction()
 
     mock(m1):shouldBeCalled():
     andAlso(mock(m2):shouldBeCalledWith(1, 2, 3)):
@@ -101,8 +101,8 @@ describe('The mock library', function()
   end)
 
   it('should allow you to mix and match call types', function()
-    local m1 = mock:newFunction()
-    local m2 = mock:newFunction()
+    local m1 = mock:mockFunction()
+    local m2 = mock:mockFunction()
 
     mock(m1):shouldBeCalled():
     andAlso(mock(m2):shouldBeCalledWith(1, 2, 3)):
@@ -115,8 +115,8 @@ describe('The mock library', function()
   end)
 
   it('should allow functions to be used to improve readability', function()
-    local m1 = mock:newFunction()
-    local m2 = mock:newFunction()
+    local m1 = mock:mockFunction()
+    local m2 = mock:mockFunction()
 
     function somethingShouldHappen()
       return mock(m1):shouldBeCalled()
@@ -142,7 +142,7 @@ describe('The mock library', function()
       bar = function() end
     }
 
-    mockedTable = mock:newTable(someTable)
+    mockedTable = mock:mockTable(someTable)
 
     mock(mockedTable.foo):shouldBeCalledWith(1):andWillReturn(2):
     andAlso(mock(mockedTable.bar):shouldBeCalled()):
@@ -158,7 +158,7 @@ describe('The mock library', function()
         foo = function() end
       }
 
-      mockedTable = mock:newTable(someTable)
+      mockedTable = mock:mockTable(someTable)
 
       mock(mockedTable.foo):shouldBeCalledWith(1):andWillReturn(2):
       when(function()
@@ -173,7 +173,7 @@ describe('The mock library', function()
     function someObject:foo() end
     function someObject:bar() end
 
-    mockedObject = mock:newObject(someObject)
+    mockedObject = mock:mockObject(someObject)
 
     mock(mockedObject.foo):shouldBeCalledWith(1):andWillReturn(2):
     andAlso(mock(mockedObject.bar):shouldBeCalled()):
@@ -189,7 +189,7 @@ describe('The mock library', function()
 
       function someObject:foo() end
 
-      mockedObject = mock:newObject(someObject)
+      mockedObject = mock:mockObject(someObject)
 
       mock(mockedObject.foo):shouldBeCalledWith(1):andWillReturn(2):
       when(function()