Print string values such that they look like strings

Author: ryanplusplus

rockspecs/mach-4.7-0.rockspec

@@ -0,0 +1,33 @@
+package = 'mach'
+version = '4.7-0'
+source = {
+  url = 'https://github.com/ryanplusplus/mach.lua/archive/v4.7-0.tar.gz',
+  dir = 'mach.lua-4.7-0/src'
+}
+description = {
+  summary = 'Simple mocking framework for Lua inspired by CppUMock and designed for readability.',
+  homepage = 'https://github.com/ryanplusplus/mach.lua/',
+  license = 'MIT <http://opensource.org/licenses/MIT>'
+}
+dependencies = {
+  'lua >= 5.1'
+}
+build = {
+  type = 'builtin',
+  modules = {
+    ['mach'] = 'mach.lua',
+    ['mach.Expectation'] = 'mach/Expectation.lua',
+    ['mach.ExpectedCall'] = 'mach/ExpectedCall.lua',
+    ['mach.CompletedCall'] = 'mach/CompletedCall.lua',
+    ['mach.unexpected_call_error'] = 'mach/unexpected_call_error.lua',
+    ['mach.unexpected_args_error'] = 'mach/unexpected_args_error.lua',
+    ['mach.out_of_order_call_error'] = 'mach/out_of_order_call_error.lua',
+    ['mach.not_all_calls_occurred_error'] ='mach/not_all_calls_occurred_error.lua',
+    ['mach.format_call_status'] = 'mach/format_call_status.lua',
+    ['mach.format_arguments'] = 'mach/format_arguments.lua',
+    ['mach.format_value'] = 'mach/format_value.lua',
+    ['mach.deep_compare_matcher'] = 'mach/deep_compare_matcher.lua',
+    ['mach.match'] = 'mach/match.lua',
+    ['mach.any'] = 'mach/any.lua',
+  }
+}

rockspecs/mach-git-0.rockspec

@@ -25,6 +25,7 @@ build = {
     ['mach.not_all_calls_occurred_error'] ='mach/not_all_calls_occurred_error.lua',
     ['mach.format_call_status'] = 'mach/format_call_status.lua',
     ['mach.format_arguments'] = 'mach/format_arguments.lua',
+    ['mach.format_value'] = 'mach/format_value.lua',
     ['mach.deep_compare_matcher'] = 'mach/deep_compare_matcher.lua',
     ['mach.match'] = 'mach/match.lua',
     ['mach.any'] = 'mach/any.lua',

spec/mach_spec.lua

@@ -485,8 +485,8 @@ describe('The mach library', function()
   end)
 
   it('should handle unexpected calls outside of an expectation', function()
-    should_fail_with('Unexpected function call f(1, 2, 3)', function()
-      mach.mock_function('f')(1, 2, 3)
+    should_fail_with("Unexpected function call f(1, 2, '3')", function()
+      mach.mock_function('f')(1, 2, '3')
     end)
   end)
 
@@ -685,10 +685,10 @@ describe('The mach library', function()
     local expected_failure =
       'Unexpected arguments (4) provided to function f\n' ..
       'Incomplete calls:\n' ..
-      '\tf(<mach.match(3)>)'
+      "\tf(<mach.match('3')>)"
 
     should_fail_with_exactly(expected_failure, function()
-      f:should_be_called_with(mach.match(3)):when(function()
+      f:should_be_called_with(mach.match('3')):when(function()
         f(4)
       end)
     end)

src/mach/format_arguments.lua

@@ -1,7 +1,9 @@
+local format_value = require 'mach.format_value'
+
 return function(args)
   local arg_strings = {}
   for i = 1, args.n do
-    table.insert(arg_strings, tostring(args[i]))
+    table.insert(arg_strings, format_value(args[i]))
   end
 
   return '(' .. table.concat(arg_strings, ', ') .. ')'

src/mach/format_value.lua

@@ -0,0 +1,7 @@
+return function(v)
+  if type(v) == 'string' then
+    return "'" .. v .. "'"
+  else
+    return tostring(v)
+  end
+end

src/mach/match.lua

@@ -1,5 +1,7 @@
+local format_value = require 'mach.format_value'
+
 return {
   __tostring = function(o)
-    return '<mach.match(' .. tostring(o.value) .. ')>'
+    return '<mach.match(' .. format_value(o.value) .. ')>'
   end
 }