Use the new assertions in base64 tests.

Author: scr-oath

base64/test/test_api.lua

@@ -32,7 +32,7 @@ function TestEncodeToString(t)
     for _, tt in ipairs(tests) do
         t:Run(tt.name, function(t)
             local got = tt.encoder:encode_to_string(tt.input)
-            assert:Equal(t, tt.expected , got)
+            assert:Equal(t, tt.expected, got)
         end)
     end
 end
@@ -68,11 +68,11 @@ function TestDecodeString(t)
         t:Run(tt.name, function(t)
             local got, err = tt.encoder:decode_string(tt.input)
             if tt.want_err then
-                assert(err, "expected err")
+                assert:Error(t, err)
                 return
             end
-            assert(not err, err)
-            assert(tt.expected == got, string.format("'%s' ~= '%s'", tt.expected, got))
+            assert:NoError(t, err)
+            assert:Equal(t, tt.expected, got)
         end)
     end
 end
@@ -104,8 +104,8 @@ function TestEncodeDecode(t)
         t:Run(tt.name, function(t)
             local encoded = tt.encoder:encode_to_string(tt.input)
             local decoded, err = tt.encoder:decode_string(encoded)
-            assert(not err, err)
-            assert(tt.input == decoded, string.format("'%s' ~= '%s'", tt.input, decoded))
+            assert:NoError(t, err)
+            assert:Equal(t, tt.input, decoded)
         end)
     end
 end
@@ -116,42 +116,42 @@ function TestEncoder(t)
     encoder:write("foo", "bar", "baz")
     encoder:close()
     local s = writer:string()
-    assert(s == "Zm9vYmFyYmF6", string.format("'%s' ~= '%s'", s, "Zm9vYmFyYmF6"))
+    assert:Equal(t, "Zm9vYmFyYmF6", s)
 end
 
 function TestDecoder(t)
     local reader = strings.new_reader("Zm9vYmFyYmF6")
     local decoder = base64.new_decoder(base64.StdEncoding, reader)
     local s = decoder:read("*a")
-    assert(s == "foobarbaz", string.format("'%s' ~= '%s'", s, "foobarbaz"))
+    assert:Equal(t, "foobarbaz", s)
 end
 
 function TestDecoderReadNum(t)
     local encoded = base64.StdEncoding:encode_to_string("123 456 789")
     local reader = strings.new_reader(encoded)
     local decoder = base64.new_decoder(base64.StdEncoding, reader)
     local n = decoder:read("*n")
-    assert(n == 123, string.format("%d ~= %d", n, 123))
+    assert:Equal(t, 123, n)
     n = decoder:read("*n")
-    assert(n == 456, string.format("%d ~= %d", n, 456))
+    assert:Equal(t, 456, n)
     n = decoder:read("*n")
-    assert(n == 789, string.format("%d ~= %d", n, 789))
+    assert:Equal(t, 789, n)
 end
 
 function TestDecoderReadCount(t)
     local encoded = base64.StdEncoding:encode_to_string("123 456 789")
     local reader = strings.new_reader(encoded)
     local decoder = base64.new_decoder(base64.StdEncoding, reader)
     local s = decoder:read(3)
-    assert(s == "123", string.format("'%s' ~= '%s'", s, "123"))
+    assert:Equal(t, "123", s)
 end
 
 function TestDecoderReadline(t)
     local encoded = base64.StdEncoding:encode_to_string("foo\nbar")
     local reader = strings.new_reader(encoded)
     local decoder = base64.new_decoder(base64.StdEncoding, reader)
     local s = decoder:read("*l")
-    assert(s == "foo", string.format("'%s' ~= '%s'", s, "foo"))
+    assert:Equal(t, "foo", s)
     s = decoder:read("*l")
-    assert(s == "bar", string.format("'%s' ~= '%s'", s, "bar"))
+    assert:Equal(t, "bar", s)
 end

tests/assert_const.go

@@ -1,7 +1,7 @@
 // GENERATED BY textFileToGoConst
 // GitHub:     github.com/logrusorgru/textFileToGoConst
 // input file: assert.lua
-// generated:  Fri Nov 11 18:27:20 PST 2022
+// generated:  Fri Nov 11 18:29:58 PST 2022
 
 package tests
 

tests/assertions.lua

@@ -155,4 +155,25 @@ Messages: %s
 ]], err, fmt), ...)
 end
 
+function assertions:Error(t, err, ...)
+    if err then
+        return true
+    end
+    return self:Fail(t, string.format([[
+
+Error:      	An error is expected but got nil.
+Messages: ]], err), ...)
+end
+
+function assertions:Errorf(t, err, fmt, ...)
+    if err then
+        return true
+    end
+    return self:Fail(t, string.format([[
+
+Error:      	An error is expected but got nil.
+Messages: %s
+]], err, fmt), ...)
+end
+
 return assertions

tests/assertions_const.go

@@ -1,7 +1,7 @@
 // GENERATED BY textFileToGoConst
 // GitHub:     github.com/logrusorgru/textFileToGoConst
 // input file: assertions.lua
-// generated:  Fri Nov 11 18:27:19 PST 2022
+// generated:  Fri Nov 11 18:29:57 PST 2022
 
 package tests
 
@@ -162,5 +162,26 @@ Messages: %s
 ]], err, fmt), ...)
 end
 
+function assertions:Error(t, err, ...)
+    if err then
+        return true
+    end
+    return self:Fail(t, string.format([[
+
+Error:      	An error is expected but got nil.
+Messages: ]], err), ...)
+end
+
+function assertions:Errorf(t, err, fmt, ...)
+    if err then
+        return true
+    end
+    return self:Fail(t, string.format([[
+
+Error:      	An error is expected but got nil.
+Messages: %s
+]], err, fmt), ...)
+end
+
 return assertions
 `

tests/lua_const.go

@@ -1,7 +1,7 @@
 // GENERATED BY textFileToGoConst
 // GitHub:     github.com/logrusorgru/textFileToGoConst
 // input file: suite.lua
-// generated:  Fri Nov 11 18:27:19 PST 2022
+// generated:  Fri Nov 11 18:29:56 PST 2022
 
 package tests
 

tests/require_const.go

@@ -1,7 +1,7 @@
 // GENERATED BY textFileToGoConst
 // GitHub:     github.com/logrusorgru/textFileToGoConst
 // input file: require.lua
-// generated:  Fri Nov 11 18:27:21 PST 2022
+// generated:  Fri Nov 11 18:29:59 PST 2022
 
 package tests
 

tests/testutil_test.go

@@ -32,9 +32,3 @@ 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)
-}