Output the assertion in a way that the IDE can report.

Author: scr-oath

tests/assertions.lua

@@ -14,13 +14,20 @@ function assertions:__call(...)
     return self.call(...)
 end
 
+function assertions:cleanseString(s)
+    s = string.gsub(s, '\n', '\\n')
+    s = string.gsub(s, '\t', '\\t')
+    s = string.gsub(s, '\r', '\\r')
+    return s
+end
+
 function assertions:Fail(t, ...)
     t:LogHelper(2, ...)
     if self.fail_now then
-        print("Failing now")
+        assert(t.FailNow, "First parameter must be t (the testing.T object)")
         t:FailNow()
     else
-        print("Failing")
+        assert(t.Fail, "First parameter must be t (the testing.T object)")
         t:Fail()
     end
     return false
@@ -29,8 +36,10 @@ end
 function assertions:Failf(t, fmt, ...)
     t:LogHelperf(2, fmt, ...)
     if self.fail_now then
+        assert(t.FailNow, "First parameter must be t (the testing.T object)")
         t:FailNow()
     else
+        assert(t.Fail, "First parameter must be t (the testing.T object)")
         t:Fail()
     end
     return false
@@ -40,56 +49,89 @@ function assertions:Equal(t, expected, actual, ...)
     if expected == actual then
         return true
     end
-    return self:Fail(t, string.format([[expected "%s"; got "%s"]] .. '\n', expected, actual), ...)
+    return self:Fail(t, string.format([[
+
+Error: Not equal:
+	   expected: "%s"
+	   actual  : "%s"
+Messages: ]], self:cleanseString(expected), self:cleanseString(actual)), ...)
 end
 
 function assertions:Equalf(t, expected, actual, fmt, ...)
     if expected == actual then
         return true
     end
-    return self:Failf(t, string.format([[expected "%s"; got "%s"%s%s]], expected, actual, '\n', fmt), ...)
+    return self:Failf(t, string.format([[
+
+Error: Not equal:
+	   expected: "%s"
+	   actual  : "%s"
+Messages: %s
+]], self:cleanseString(expected), self:cleanseString(actual), fmt), ...)
 end
 
 function assertions:NotEqual(t, expected, actual, ...)
     if expected ~= actual then
         return true
     end
-    return self:Fail(t, string.format([[expected ~= "%s";]] .. '\n', expected), ...)
+    return self:Fail(t, string.format([[
+
+Error: Should not be %s
+Messages: ]], expected), ...)
 end
 
 function assertions:NotEqualf(t, expected, actual, fmt, ...)
     if expected ~= actual then
         return true
     end
-    return self:Failf(t, string.format([[expected ~= "%s"; got "%s"%s%s]], expected, '\n', fmt), ...)
+    return self:Failf(t, string.format([[
+
+Error: Should not be %s
+Messages: %s
+]], expected, fmt), ...)
 end
 
 function assertions:True(t, actual, ...)
     if actual then
         return true
     end
-    return self:Fail(t, string.format([[expected true; got %s]] .. '\n', actual), ...)
+    return self:Fail(t, string.format([[
+
+Error: Should be true
+Messages: ]]), ...)
 end
 
 function assertions:Truef(t, actual, fmt, ...)
     if actual then
         return true
     end
-    return self:Failf(t, string.format([[expected true; got %s%s%s]], actual, '\n', fmt), ...)
+    return self:Failf(t, string.format([[
+
+Error: Should be true
+Messages: %s
+]], fmt), ...)
+
 end
 
 function assertions:False(t, actual, ...)
     if not actual then
         return true
     end
-    return self:Fail(t, string.format([[expected false; got %s]] .. '\n', actual), ...)
+    return self:Fail(t, string.format([[
+
+Error Should be false
+Messages: ]]), ...)
 end
 
 function assertions:Falsef(t, actual, fmt, ...)
     if not actual then
         return true
     end
-    return self:Failf(t, string.format([[expected false; got %s%s%s]], actual, '\n', fmt), ...)
+    return self:Failf(t, string.format([[
+
+Error: Should be false
+Messages: %s
+]], fmt), ...)
 end
 
 return assertions

tests/testdata/test_assertions_failing.lua

@@ -38,5 +38,9 @@ function TestTablesNotEqual(t)
 end
 
 function TestFalse(t)
-    assert:False(true, "oh noes")
+    assert:False(t, true, "oh noes")
+end
+
+function TestStringsEqual(t)
+    assert:Equal(t, "expected text", "actual text")
 end

tests/testutil.go

@@ -263,9 +263,9 @@ func RunLuaTestFile(t *testing.T, preload PreloadFunc, filename string) (numTest
 
 	registerTType(L)
 	PreloadSuite(L)
-	PreloadAssertions(L)
-	PreloadAssert(L)
-	PreloadRequire(L)
+	//PreloadAssertions(L)
+	//PreloadAssert(L)
+	//PreloadRequire(L)
 	require.NotNil(t, preload)
 	preload(L)
 	L.SetGlobal("t", tLua(L, t))

tests/testutil_test.go

@@ -32,3 +32,9 @@ func TestAssertions(t *testing.T) {
 		assert.NotZero(t, RunLuaTestFile(t, preload, "testdata/test_assertions_failing.lua"))
 	})
 }
+
+func TestFail(t *testing.T) {
+	assert.Equal(t, "foo", "bar", "yikes", "bob")
+	assert.True(t, false, "another message")
+	assert.NotEqual(t, 123, 123)
+}