aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Majewsky <majewsky@gmx.net>2018-02-19 17:58:08 +0100
committerStefan Majewsky <majewsky@gmx.net>2018-02-19 17:58:08 +0100
commitd1dec3782fb5f9aa5775dafb0ea1225af6279ed2 (patch)
tree8f06c0fbcc3c93b18ce0c90cb2e4b0f3b8d08f29
parent502acc3c73e789e856a17b878889db4356fe898c (diff)
downloadgo-schwift-d1dec3782fb5f9aa5775dafb0ea1225af6279ed2.tar.gz
replace expectError by expectSuccess where possible
Diffstat
-rw-r--r--account_test.go14
-rw-r--r--container_test.go14
-rw-r--r--field_test.go20
-rw-r--r--headers_test.go2
-rw-r--r--object_test.go8
-rw-r--r--shared_test.go29
6 files changed, 42 insertions, 45 deletions
diff --git a/account_test.go b/account_test.go
index 29fc8ea..3425f3f 100644
--- a/account_test.go
+++ b/account_test.go
@@ -25,7 +25,7 @@ import (
func TestAccountBasic(t *testing.T) {
testWithAccount(t, func(a *Account) {
hdr, err := a.Headers()
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
//There are not a lot of things we can test here (besides testing that
@@ -43,12 +43,12 @@ func TestAccountMetadata(t *testing.T) {
hdr.Metadata().Set("schwift-test1", "first")
hdr.Metadata().Set("schwift-test2", "second")
err := a.Update(hdr, nil)
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
hdr, err = a.Headers()
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
expectString(t, hdr.Metadata().Get("schwift-test1"), "first")
@@ -58,12 +58,12 @@ func TestAccountMetadata(t *testing.T) {
hdr = make(AccountHeaders)
hdr.Metadata().Clear("schwift-test1")
err = a.Update(hdr, nil)
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
hdr, err = a.Headers()
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
expectString(t, hdr.Metadata().Get("schwift-test1"), "")
@@ -75,12 +75,12 @@ func TestAccountMetadata(t *testing.T) {
hdr.Metadata().Del("schwift-test1")
hdr.Metadata().Set("schwift-test2", "changed")
err = a.Update(hdr, nil)
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
hdr, err = a.Headers()
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
t.FailNow()
}
expectString(t, hdr.Metadata().Get("schwift-test1"), "")
diff --git a/container_test.go b/container_test.go
index f0004a5..654ca84 100644
--- a/container_test.go
+++ b/container_test.go
@@ -34,7 +34,7 @@ func TestContainerLifecycle(t *testing.T) {
}
exists, err := c.Exists()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectBool(t, exists, false)
_, err = c.Headers()
@@ -48,14 +48,14 @@ func TestContainerLifecycle(t *testing.T) {
expectError(t, err, "expected 204 response, got 404 instead: <html><h1>Not Found</h1><p>The resource could not be found.</p></html>")
err = c.Create(nil, nil)
- expectError(t, err, "")
+ expectSuccess(t, err)
exists, err = c.Exists()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectBool(t, exists, true)
err = c.Delete(nil, nil)
- expectError(t, err, "")
+ expectSuccess(t, err)
})
}
@@ -63,7 +63,7 @@ func TestContainerUpdate(t *testing.T) {
testWithContainer(t, func(c *Container) {
hdr, err := c.Headers()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectBool(t, hdr.ObjectCount().Exists(), true)
expectUint64(t, hdr.ObjectCount().Get(), 0)
@@ -72,10 +72,10 @@ func TestContainerUpdate(t *testing.T) {
hdr.BytesUsedQuota().Set(42)
err = c.Update(hdr, nil)
- expectError(t, err, "")
+ expectSuccess(t, err)
hdr, err = c.Headers()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectUint64(t, hdr.BytesUsedQuota().Get(), 42)
expectUint64(t, hdr.ObjectCountQuota().Get(), 23)
diff --git a/field_test.go b/field_test.go
index c86f07d..539ed74 100644
--- a/field_test.go
+++ b/field_test.go
@@ -28,17 +28,17 @@ func TestFieldString(t *testing.T) {
hdr := make(AccountHeaders)
expectBool(t, hdr.TempURLKey().Exists(), false)
expectString(t, hdr.TempURLKey().Get(), "")
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Meta-Temp-Url-Key"] = ""
expectBool(t, hdr.TempURLKey().Exists(), false)
expectString(t, hdr.TempURLKey().Get(), "")
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Meta-Temp-Url-Key"] = "foo"
expectBool(t, hdr.TempURLKey().Exists(), true)
expectString(t, hdr.TempURLKey().Get(), "foo")
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr.TempURLKey().Set("bar")
expectHeaders(t, hdr, map[string]string{
@@ -61,7 +61,7 @@ func TestFieldString(t *testing.T) {
func TestFieldTimestamp(t *testing.T) {
testWithAccount(t, func(a *Account) {
hdr, err := a.Headers()
- if !expectError(t, err, "") {
+ if !expectSuccess(t, err) {
return
}
@@ -75,7 +75,7 @@ func TestFieldTimestamp(t *testing.T) {
hdr := make(AccountHeaders)
expectBool(t, hdr.CreatedAt().Exists(), false)
expectBool(t, hdr.CreatedAt().Get().IsZero(), true)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Timestamp"] = "wtf"
expectBool(t, hdr.CreatedAt().Exists(), true)
@@ -105,7 +105,7 @@ func TestFieldHTTPTimestamp(t *testing.T) {
hdr := make(ObjectHeaders)
expectBool(t, hdr.UpdatedAt().Exists(), false)
expectBool(t, hdr.UpdatedAt().Get().IsZero(), true)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["Last-Modified"] = "wtf"
expectBool(t, hdr.UpdatedAt().Exists(), true)
@@ -119,12 +119,12 @@ func TestFieldUint64(t *testing.T) {
hdr := make(AccountHeaders)
expectBool(t, hdr.BytesUsedQuota().Exists(), false)
expectUint64(t, hdr.BytesUsedQuota().Get(), 0)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Meta-Quota-Bytes"] = "23"
expectBool(t, hdr.BytesUsedQuota().Exists(), true)
expectUint64(t, hdr.BytesUsedQuota().Get(), 23)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Meta-Quota-Bytes"] = "-23"
expectBool(t, hdr.BytesUsedQuota().Exists(), true)
@@ -151,12 +151,12 @@ func TestFieldUint64Readonly(t *testing.T) {
hdr := make(AccountHeaders)
expectBool(t, hdr.BytesUsed().Exists(), false)
expectUint64(t, hdr.BytesUsed().Get(), 0)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Bytes-Used"] = "23"
expectBool(t, hdr.BytesUsed().Exists(), true)
expectUint64(t, hdr.BytesUsed().Get(), 23)
- expectError(t, hdr.Validate(), "")
+ expectSuccess(t, hdr.Validate())
hdr["X-Account-Bytes-Used"] = "-23"
expectBool(t, hdr.BytesUsed().Exists(), true)
diff --git a/headers_test.go b/headers_test.go
index d068623..cb99571 100644
--- a/headers_test.go
+++ b/headers_test.go
@@ -32,7 +32,7 @@ func TestParseAccountHeadersSuccess(t *testing.T) {
"X-Account-Meta-foo": {"bar"},
}))
- expectError(t, headers.Validate(), "")
+ expectSuccess(t, headers.Validate())
expectUint64(t, headers.BytesUsed().Get(), 1234)
expectUint64(t, headers.ContainerCount().Get(), 23)
expectUint64(t, headers.ObjectCount().Get(), 42)
diff --git a/object_test.go b/object_test.go
index 967859d..841d177 100644
--- a/object_test.go
+++ b/object_test.go
@@ -35,7 +35,7 @@ func TestObjectLifecycle(t *testing.T) {
}
exists, err := o.Exists()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectBool(t, exists, false)
_, err = o.Headers()
@@ -49,13 +49,13 @@ func TestObjectLifecycle(t *testing.T) {
expectError(t, err, "expected 204 response, got 404 instead: <html><h1>Not Found</h1><p>The resource could not be found.</p></html>")
err = o.Upload(bytes.NewReader([]byte("test")), nil, nil)
- expectError(t, err, "")
+ expectSuccess(t, err)
exists, err = o.Exists()
- expectError(t, err, "")
+ expectSuccess(t, err)
expectBool(t, exists, true)
err = o.Delete(nil, nil)
- expectError(t, err, "")
+ expectSuccess(t, err)
})
}
diff --git a/shared_test.go b/shared_test.go
index 10402bc..be29557 100644
--- a/shared_test.go
+++ b/shared_test.go
@@ -177,20 +177,21 @@ func expectString(t *testing.T, actual string, expected string) {
func expectError(t *testing.T, actual error, expected string) (ok bool) {
t.Helper()
if actual == nil {
- if expected != "" {
- t.Errorf("expected error %q, got no error\n", expected)
- return false
- }
- } else {
- 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())
- return false
- }
+ t.Errorf("expected error %q, got no error\n", expected)
+ return false
}
+ if expected != actual.Error() {
+ t.Errorf("expected error %q, got %q instead\n", expected, actual.Error())
+ return false
+ }
+ return true
+}
+func expectSuccess(t *testing.T, actual error) (ok bool) {
+ if actual != nil {
+ t.Errorf("expected success, got error %q instead\n", actual.Error())
+ return false
+ }
return true
}
@@ -219,7 +220,3 @@ func expectHeaders(t *testing.T, actual map[string]string, expected map[string]s
}
}
}
-
-func expectSuccess(t *testing.T, actual error) (ok bool) {
- return expectError(t, actual, "")
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-08 15:59:43 +0000