From c28ec2dc1523eeb76ddb2bd2ad4ecf59132e22ff Mon Sep 17 00:00:00 2001 From: Zhi Zhang Date: Thu, 5 Sep 2019 15:16:59 +0800 Subject: [PATCH] test: remove useless ASSERT_XXX macros for rgw test Signed-off-by: Zhi Zhang --- src/test/rgw/test_rgw_manifest.cc | 12 +----------- src/test/rgw/test_rgw_obj.cc | 12 +----------- src/test/test_cors.cc | 11 ----------- src/test/test_rgw_admin_log.cc | 12 +----------- src/test/test_rgw_admin_meta.cc | 12 +----------- 5 files changed, 4 insertions(+), 55 deletions(-) diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc index bb6f8241275d9..0c22b908aff13 100644 --- a/src/test/rgw/test_rgw_manifest.cc +++ b/src/test/rgw/test_rgw_manifest.cc @@ -17,18 +17,8 @@ #include "rgw/rgw_common.h" #include "rgw/rgw_rados.h" #include "test_rgw_common.h" -#define GTEST -#ifdef GTEST #include -#else -#define TEST(x, y) void y() -#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ - else cout << "(" << #v << "==" << #s << ") PASSED\n"; -#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) -#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ - else cout << "(" << #c << ") PASSED\n";#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#endif + using namespace std; struct OldObjManifestPart { diff --git a/src/test/rgw/test_rgw_obj.cc b/src/test/rgw/test_rgw_obj.cc index fc00e89f9ab0b..54793abafdfe1 100644 --- a/src/test/rgw/test_rgw_obj.cc +++ b/src/test/rgw/test_rgw_obj.cc @@ -19,18 +19,8 @@ #include "rgw/rgw_rados.h" #include "rgw/services/svc_tier_rados.h" #include "test_rgw_common.h" -#define GTEST -#ifdef GTEST #include -#else -#define TEST(x, y) void y() -#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ - else cout << "(" << #v << "==" << #s << ") PASSED\n"; -#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) -#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ - else cout << "(" << #c << ") PASSED\n"; -#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#endif + using namespace std; void check_parsed_correctly(rgw_obj& obj, const string& name, const string& ns, const string& instance) diff --git a/src/test/test_cors.cc b/src/test/test_cors.cc index d9c6e5796635e..ebb55c5b270a5 100644 --- a/src/test/test_cors.cc +++ b/src/test/test_cors.cc @@ -12,18 +12,7 @@ extern "C"{ #define SWIFT_BUCKET_NAME "swift3testgw.fcgi" #define BUCKET_URL \ ((g_test->get_key_type() == KEY_TYPE_S3)?(string("/" S3_BUCKET_NAME)):(string("/swift/v1/" SWIFT_BUCKET_NAME))) -#define GTEST -#ifdef GTEST #include -#else -#define TEST(x, y) void y() -#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ - else cout << "(" << #v << "==" << #s << ") PASSED\n"; -#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) -#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ - else cout << "(" << #c << ") PASSED\n"; -#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#endif #include "common/code_environment.h" #include "common/ceph_argparse.h" #include "common/Finisher.h" diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc index 9809701864615..cb24bdda802ce 100644 --- a/src/test/test_rgw_admin_log.cc +++ b/src/test/test_rgw_admin_log.cc @@ -38,18 +38,8 @@ extern "C"{ #include "rgw/rgw_rados.h" #include "include/utime.h" #include "include/object.h" -#define GTEST -#ifdef GTEST #include -#else -#define TEST(x, y) void y() -#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ - else cout << "(" << #v << "==" << #s << ") PASSED\n"; -#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) -#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ - else cout << "(" << #c << ") PASSED\n"; -#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#endif + using namespace std; #define CURL_VERBOSE 0 diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc index c0ade77ab48f6..7dc96b61ca1d8 100644 --- a/src/test/test_rgw_admin_meta.cc +++ b/src/test/test_rgw_admin_meta.cc @@ -33,18 +33,8 @@ extern "C"{ #include "global/global_init.h" #include "rgw/rgw_common.h" #include "rgw/rgw_rados.h" -#define GTEST -#ifdef GTEST #include -#else -#define TEST(x, y) void y() -#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ - else cout << "(" << #v << "==" << #s << ") PASSED\n"; -#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) -#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ - else cout << "(" << #c << ") PASSED\n"; -#define EXPECT_TRUE(c) ASSERT_TRUE(c) -#endif + using namespace std; #define CURL_VERBOSE 0 -- 2.39.5