From fafac750baa70812432020784cc5ba2cc23224cc Mon Sep 17 00:00:00 2001
From: Stefan Majewsky <majewsky@gmx.net>
Date: Sun, 4 Feb 2018 23:29:09 +0100
Subject: add Container

---
 headers_test.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'headers_test.go')

diff --git a/headers_test.go b/headers_test.go
index 2d1d804..b54181c 100644
--- a/headers_test.go
+++ b/headers_test.go
@@ -33,13 +33,13 @@ func TestParseAccountHeadersSuccess(t *testing.T) {
 		"X-Account-Meta-foo":         {"bar"},
 	}, &headers)
 
-	expectError(t, err, nil)
+	expectError(t, err, "")
 	expectUint64(t, headers.BytesUsed, 1234)
 	expectUint64(t, headers.ContainerCount, 23)
 	expectUint64(t, headers.ObjectCount, 42)
 
 	value, err := headers.QuotaBytes().Get()
-	expectError(t, err, nil)
+	expectError(t, err, "")
 	expectUint64(t, value, 1048576)
 
 	expectString(t, headers.Metadata.Get("foo"), "bar")
@@ -49,6 +49,13 @@ func TestParseAccountHeadersSuccess(t *testing.T) {
 
 //TODO TestParseAccountHeadersError
 
+func expectBool(t *testing.T, actual bool, expected bool) {
+	t.Helper()
+	if actual != expected {
+		t.Errorf("expected value %#v, got %#v instead\n", expected, actual)
+	}
+}
+
 func expectUint64(t *testing.T, actual uint64, expected uint64) {
 	t.Helper()
 	if actual != expected {
@@ -63,19 +70,19 @@ func expectString(t *testing.T, actual string, expected string) {
 	}
 }
 
-func expectError(t *testing.T, actual error, expected *string) (ok bool) {
+func expectError(t *testing.T, actual error, expected string) (ok bool) {
 	t.Helper()
 	if actual == nil {
-		if expected != nil {
-			t.Errorf("expected error %q, got no error\n", *expected)
+		if expected != "" {
+			t.Errorf("expected error %q, got no error\n", expected)
 			return false
 		}
 	} else {
-		if expected == nil {
+		if expected == "" {
 			t.Errorf("expected no error, got %q\n", actual.Error())
 			return false
-		} else if *expected != actual.Error() {
-			t.Errorf("expected error %q, got %q instead\n", *expected, actual.Error())
+		} else if expected != actual.Error() {
+			t.Errorf("expected error %q, got %q instead\n", expected, actual.Error())
 			return false
 		}
 	}
-- 
cgit v1.2.3