From 03921ef4b9696c44dd306c549bc8a544a652a152 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 25 May 2016 00:34:25 +0800 Subject: [PATCH] test: Fix the order of ASSERT_EQ() in chain_xattr tests GTEST_ASSERT_EQ(expected, actual) so the error message would be easier to read if ASSERT_EQ() fails. Signed-off-by: Kefu Chai --- src/test/objectstore/chain_xattr.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc index 4b093af90c81a..9109c169052ef 100644 --- a/src/test/objectstore/chain_xattr.cc +++ b/src/test/objectstore/chain_xattr.cc @@ -352,7 +352,7 @@ TEST(chain_xattr, fskip_chain_cleanup_and_ensure_single_attr) // set chunked without either { std::size_t r = chain_fsetxattr(fd, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof(buf)); + ASSERT_EQ(sizeof(buf), r); ASSERT_GT(get_xattrs(fd).size(), 1UL); } @@ -360,23 +360,23 @@ TEST(chain_xattr, fskip_chain_cleanup_and_ensure_single_attr) { char buf2[sizeof(buf)*2]; std::size_t r = chain_fgetxattr(fd, name, buf2, sizeof(buf2)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf))); } // overwrite { std::size_t r = chain_fsetxattr(fd, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(get_xattrs(fd).size(), 1UL); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(1UL, get_xattrs(fd).size()); } // verify { char buf2[sizeof(buf)*2]; std::size_t r = chain_fgetxattr(fd, name, buf2, sizeof(buf2)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf))); } ::close(fd); @@ -396,7 +396,7 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr) // set chunked without either { std::size_t r = chain_setxattr(file, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof(buf)); + ASSERT_EQ(sizeof(buf), r); ASSERT_GT(get_xattrs(file).size(), 1UL); } @@ -404,23 +404,23 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr) { char buf2[sizeof(buf)*2]; std::size_t r = chain_getxattr(file, name, buf2, sizeof(buf2)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf))); } // overwrite { std::size_t r = chain_setxattr(file, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(get_xattrs(file).size(), 1UL); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(1UL, get_xattrs(file).size()); } // verify { char buf2[sizeof(buf)*2]; std::size_t r = chain_getxattr(file, name, buf2, sizeof(buf2)); - ASSERT_EQ(r, sizeof(buf)); - ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0); + ASSERT_EQ(sizeof(buf), r); + ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf))); } ::unlink(file); -- 2.39.5