ref: 0a8583a4510de749dbc69de9b00eceaedfc0c9c4
parent: 0888ddd01f6acacefc6eceac6f772110be519d81
author: Bjørn Erik Pedersen <[email protected]>
date: Sun Feb 7 09:58:23 EST 2016
tpl: Add missing base64 tests
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1422,11 +1422,7 @@
dec, err := base64.StdEncoding.DecodeString(conv)
- if err != nil {- return "", err
- }
-
- return string(dec), nil
+ return string(dec), err
}
// base64Encode returns the base64 encoding of the given content.
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -1821,12 +1821,17 @@
result, err := base64Decode(enc)
if err != nil {- t.Error("Base64Decode:", err)+ t.Error("base64Decode returned error:", err)}
if result != testStr {- t.Errorf("Base64Decode: got '%s', expected '%s'", result, testStr)+ t.Errorf("base64Decode: got '%s', expected '%s'", result, testStr)}
+
+ _, err = base64Decode(t)
+ if err == nil {+ t.Error("Expected error from base64Decode")+ }
}
func TestBase64Encode(t *testing.T) {@@ -1834,16 +1839,21 @@
dec, err := base64.StdEncoding.DecodeString(testStr)
if err != nil {- t.Error("Base64Encode: the DecodeString function of the base64 package returned an error.", err)+ t.Error("base64Encode: the DecodeString function of the base64 package returned an error:", err)}
result, err := base64Encode(string(dec))
if err != nil {- t.Errorf("Base64Encode: Can't cast arg '%s' into a string.", testStr)+ t.Errorf("base64Encode: Can't cast arg '%s' into a string:", testStr)}
if result != testStr {- t.Errorf("Base64Encode: got '%s', expected '%s'", result, testStr)+ t.Errorf("base64Encode: got '%s', expected '%s'", result, testStr)+ }
+
+ _, err = base64Encode(t)
+ if err == nil {+ t.Error("Expected error from base64Encode")}
}