Merge pull request #2514 from shiftstack/objectstorage_test_expected

objectstorage testing: Fix order of assertions
gophercloud · Nov 24, 2022 · 1112837 · 1112837
2 parents 4cc91e5 + b0961d4
commit 1112837
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/openstack/objectstorage/v1/containers/testing/requests_test.go b/openstack/objectstorage/v1/containers/testing/requests_test.go
@@ -30,7 +30,7 @@ func TestListContainerInfo(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 }
 
 func TestListAllContainerInfo(t *testing.T) {
@@ -64,7 +64,7 @@ func TestListContainerNames(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 }
 
 func TestListAllContainerNames(t *testing.T) {

diff --git a/openstack/objectstorage/v1/objects/testing/requests_test.go b/openstack/objectstorage/v1/objects/testing/requests_test.go
@@ -75,7 +75,7 @@ func TestDownloadWithLastModified(t *testing.T) {
 	response2 := objects.Download(fake.ServiceClient(), "testContainer", "testObject", options2)
 	content, err2 := response2.ExtractContent()
 	th.AssertNoErr(t, err2)
-	th.AssertEquals(t, len(content), 0)
+	th.AssertEquals(t, 0, len(content))
 }
 
 func TestListObjectInfo(t *testing.T) {
@@ -95,7 +95,7 @@ func TestListObjectInfo(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 }
 
 func TestListObjectSubdir(t *testing.T) {
@@ -115,7 +115,7 @@ func TestListObjectSubdir(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 }
 
 func TestListObjectNames(t *testing.T) {
@@ -139,7 +139,7 @@ func TestListObjectNames(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 
 	// Check with delimiter.
 	count = 0
@@ -157,7 +157,7 @@ func TestListObjectNames(t *testing.T) {
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, 1, count)
 }
 
 func TestListZeroObjectNames204(t *testing.T) {
@@ -313,7 +313,7 @@ func TestGetObject(t *testing.T) {
 	}
 	actualHeaders, err := objects.Get(fake.ServiceClient(), "testContainer", "testObject", getOpts).Extract()
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, actualHeaders.StaticLargeObject, true)
+	th.AssertEquals(t, true, actualHeaders.StaticLargeObject)
 }
 
 func TestETag(t *testing.T) {
@@ -326,7 +326,7 @@ func TestETag(t *testing.T) {
 	_, headers, _, err := createOpts.ToObjectCreateParams()
 	th.AssertNoErr(t, err)
 	_, ok := headers["ETag"]
-	th.AssertEquals(t, ok, false)
+	th.AssertEquals(t, false, ok)
 
 	hash := md5.New()
 	io.WriteString(hash, content)
@@ -339,7 +339,7 @@ func TestETag(t *testing.T) {
 
 	_, headers, _, err = createOpts.ToObjectCreateParams()
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, headers["ETag"], localChecksum)
+	th.AssertEquals(t, localChecksum, headers["ETag"])
 }
 
 func TestObjectCreateParamsWithoutSeek(t *testing.T) {
@@ -352,7 +352,7 @@ func TestObjectCreateParamsWithoutSeek(t *testing.T) {
 	th.AssertNoErr(t, err)
 
 	_, ok := reader.(io.ReadSeeker)
-	th.AssertEquals(t, ok, true)
+	th.AssertEquals(t, true, ok)
 
 	c, err := ioutil.ReadAll(reader)
 	th.AssertNoErr(t, err)

diff --git a/openstack/objectstorage/v1/swauth/testing/requests_test.go b/openstack/objectstorage/v1/swauth/testing/requests_test.go
@@ -23,7 +23,7 @@ func TestAuth(t *testing.T) {
 
 	swiftClient, err := swauth.NewObjectStorageV1(providerClient, authOpts)
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, swiftClient.TokenID, AuthResult.Token)
+	th.AssertEquals(t, AuthResult.Token, swiftClient.TokenID)
 }
 
 func TestBadAuth(t *testing.T) {