From a155e23d72817d20fce37ea979490c4caaba0bfe Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 13 Apr 2018 13:25:25 -0700 Subject: [PATCH 1/3] Use EXPECT_EQ, instead of EXPECT_TRUE for everything --- tests/exec_ut.cpp | 8 +++---- tests/json_ut.cpp | 10 +++++---- tests/ntf_ut.cpp | 1 + tests/redis_piped_state_ut.cpp | 34 ++++++++++++++--------------- tests/redis_state_ut.cpp | 34 ++++++++++++++--------------- tests/redis_subscriber_state_ut.cpp | 26 +++++++++++----------- 6 files changed, 58 insertions(+), 55 deletions(-) diff --git a/tests/exec_ut.cpp b/tests/exec_ut.cpp index 1ee0fafc8..c6d61a304 100644 --- a/tests/exec_ut.cpp +++ b/tests/exec_ut.cpp @@ -12,15 +12,15 @@ TEST(EXEC, result) string result1; int ret = exec(cmd1, result1); - EXPECT_TRUE(ret == 0); + EXPECT_EQ(ret, 0); string result2; ret = exec(cmd2, result2); - EXPECT_TRUE(ret == 0); + EXPECT_EQ(ret, 0); string result3; ret = exec(cmd3, result3); - EXPECT_TRUE(ret == 0); + EXPECT_EQ(ret, 0); EXPECT_EQ(result1, result2); EXPECT_EQ(result2, result3); @@ -32,5 +32,5 @@ TEST(EXEC, error) string result; int ret = exec(cmd, result); - EXPECT_FALSE(ret == 0); + EXPECT_NE(ret, 0); } \ No newline at end of file diff --git a/tests/json_ut.cpp b/tests/json_ut.cpp index 2b0bc80bc..cb7b219ec 100644 --- a/tests/json_ut.cpp +++ b/tests/json_ut.cpp @@ -38,21 +38,23 @@ TEST(JSON, test) file >> j; EXPECT_TRUE(j.is_array()); - EXPECT_TRUE(j.size() == 3); + EXPECT_EQ(j.size(), 3); for (size_t i = 0; i < j.size(); i++) { auto item = j[i]; EXPECT_TRUE(item.is_object()); - EXPECT_TRUE(item.size() == 2); + EXPECT_EQ(item.size(), 2); for (auto it = item.begin(); it != item.end(); it++) { if (it.key() == "OP") - EXPECT_TRUE(it.value() == "SET" || it.value() == "DEL"); + EXPECT_TRUE(it.value() == "SET" || it.value() == "DEL"); // FIXME: better use construction below +// EXPECT_THAT(it.value(), AnyOf("SET", "DEL")); else { - EXPECT_TRUE(it.key() == "UT_REDIS" + separator + "test_key_1" || it.key() == "UT_REDIS" + separator + "test_key_2"); + EXPECT_TRUE(it.key() == "UT_REDIS" + separator + "test_key_1" || it.key() == "UT_REDIS" + separator + "test_key_2"); // FIXME: better to use construction below +// EXPECT_THAT(it.key(), AnyOf(string("UT_REDIS") + separator + "test_key_1", string("UT_REDIS") + separator + "test_key_2")); auto subitem = it.value(); EXPECT_TRUE(subitem.is_object()); if (subitem.size() > 0) diff --git a/tests/ntf_ut.cpp b/tests/ntf_ut.cpp index fb30ae8bf..c96d4af39 100644 --- a/tests/ntf_ut.cpp +++ b/tests/ntf_ut.cpp @@ -76,3 +76,4 @@ TEST(Notifications, test) notification_thread->join(); } +//FIXME: no tests inside \ No newline at end of file diff --git a/tests/redis_piped_state_ut.cpp b/tests/redis_piped_state_ut.cpp index f0755099b..123ea304c 100644 --- a/tests/redis_piped_state_ut.cpp +++ b/tests/redis_piped_state_ut.cpp @@ -134,7 +134,7 @@ static void consumerWorker(int index) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); EXPECT_EQ(ret, Selectable::DATA); } @@ -191,11 +191,11 @@ TEST(ConsumerStateTable, async_double_set) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), (unsigned int)(maxNumOfFields + maxNumOfFields/2)); @@ -219,7 +219,7 @@ TEST(ConsumerStateTable, async_double_set) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -261,11 +261,11 @@ TEST(ConsumerStateTable, async_set_del) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "DEL"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "DEL"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), 0U); @@ -274,7 +274,7 @@ TEST(ConsumerStateTable, async_set_del) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -327,11 +327,11 @@ TEST(ConsumerStateTable, async_set_del_set) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), (unsigned int)maxNumOfFields); @@ -351,7 +351,7 @@ TEST(ConsumerStateTable, async_set_del_set) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -393,7 +393,7 @@ TEST(ConsumerStateTable, async_singlethread) while ((ret = cs.select(&selectcs, &tmpfd)) == Select::OBJECT) { c.pop(kco); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvOp(kco), "SET"); numberOfKeysSet++; validateFields(kfvKey(kco), kfvFieldsValues(kco)); @@ -416,7 +416,7 @@ TEST(ConsumerStateTable, async_singlethread) while ((ret = cs.select(&selectcs, &tmpfd)) == Select::OBJECT) { c.pop(kco); - EXPECT_TRUE(kfvOp(kco) == "DEL"); + EXPECT_EQ(kfvOp(kco), "DEL"); numberOfKeyDeleted++; if ((i++ % 100) == 0) @@ -426,7 +426,7 @@ TEST(ConsumerStateTable, async_singlethread) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); EXPECT_EQ(ret, Selectable::DATA); cout << "Done. Waiting for all job to finish " << NUMBER_OF_OPS << " jobs." << endl; @@ -511,7 +511,7 @@ TEST(ConsumerStateTable, async_multitable) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); /* Making sure threads stops execution */ for (i = 0; i < NUMBER_OF_THREADS; i++) diff --git a/tests/redis_state_ut.cpp b/tests/redis_state_ut.cpp index a8fa4c8a0..90beaab8e 100644 --- a/tests/redis_state_ut.cpp +++ b/tests/redis_state_ut.cpp @@ -132,7 +132,7 @@ static void consumerWorker(int index) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); EXPECT_EQ(ret, Selectable::DATA); } @@ -187,11 +187,11 @@ TEST(ConsumerStateTable, double_set) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), (unsigned int)(maxNumOfFields + maxNumOfFields/2)); @@ -215,7 +215,7 @@ TEST(ConsumerStateTable, double_set) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -255,11 +255,11 @@ TEST(ConsumerStateTable, set_del) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "DEL"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "DEL"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), 0U); @@ -268,7 +268,7 @@ TEST(ConsumerStateTable, set_del) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -319,11 +319,11 @@ TEST(ConsumerStateTable, set_del_set) /* First pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), (unsigned int)maxNumOfFields); @@ -343,7 +343,7 @@ TEST(ConsumerStateTable, set_del_set) /* Second select operation */ { int ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -383,7 +383,7 @@ TEST(ConsumerStateTable, singlethread) while ((ret = cs.select(&selectcs, &tmpfd)) == Select::OBJECT) { c.pop(kco); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvOp(kco), "SET"); numberOfKeysSet++; validateFields(kfvKey(kco), kfvFieldsValues(kco)); @@ -405,7 +405,7 @@ TEST(ConsumerStateTable, singlethread) while ((ret = cs.select(&selectcs, &tmpfd)) == Select::OBJECT) { c.pop(kco); - EXPECT_TRUE(kfvOp(kco) == "DEL"); + EXPECT_EQ(kfvOp(kco), "DEL"); numberOfKeyDeleted++; if ((i++ % 100) == 0) @@ -415,7 +415,7 @@ TEST(ConsumerStateTable, singlethread) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); EXPECT_EQ(ret, Selectable::DATA); cout << "Done. Waiting for all job to finish " << NUMBER_OF_OPS << " jobs." << endl; @@ -500,7 +500,7 @@ TEST(ConsumerStateTable, multitable) break; } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); /* Making sure threads stops execution */ for (i = 0; i < NUMBER_OF_THREADS; i++) diff --git a/tests/redis_subscriber_state_ut.cpp b/tests/redis_subscriber_state_ut.cpp index 520ea5646..db2a295d8 100644 --- a/tests/redis_subscriber_state_ut.cpp +++ b/tests/redis_subscriber_state_ut.cpp @@ -163,12 +163,12 @@ static void subscriberWorker(int index, int *status) } - EXPECT_TRUE(numberOfKeysSet <= numberOfKeyDeleted); + EXPECT_LE(numberOfKeysSet, numberOfKeyDeleted); /* Verify that all data are read */ { ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } @@ -205,11 +205,11 @@ TEST(SubscriberStateTable, set) /* Pop operation */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); auto fvs = kfvFieldsValues(kco); EXPECT_EQ(fvs.size(), (unsigned int)(maxNumOfFields)); @@ -260,11 +260,11 @@ TEST(SubscriberStateTable, del) /* Pop operation for set */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "SET"); } p.del(key); @@ -272,11 +272,11 @@ TEST(SubscriberStateTable, del) /* Pop operation for del */ { int ret = cs.select(&selectcs, &tmpfd); - EXPECT_TRUE(ret == Select::OBJECT); + EXPECT_EQ(ret, Select::OBJECT); KeyOpFieldsValuesTuple kco; c.pop(kco); - EXPECT_TRUE(kfvKey(kco) == key); - EXPECT_TRUE(kfvOp(kco) == "DEL"); + EXPECT_EQ(kfvKey(kco), key); + EXPECT_EQ(kfvOp(kco), "DEL"); } } @@ -321,7 +321,7 @@ TEST(SubscriberStateTable, table_state) while ((ret = cs.select(&selectcs, &tmpfd)) == Select::OBJECT) { c.pop(kco); - EXPECT_TRUE(kfvOp(kco) == "SET"); + EXPECT_EQ(kfvOp(kco), "SET"); numberOfKeysSet++; validateFields(kfvKey(kco), kfvFieldsValues(kco)); @@ -337,7 +337,7 @@ TEST(SubscriberStateTable, table_state) /* Verify that all data are read */ { ret = cs.select(&selectcs, &tmpfd, 1000); - EXPECT_TRUE(ret == Select::TIMEOUT); + EXPECT_EQ(ret, Select::TIMEOUT); } } From 3d3ed3d0d17bbb1b86a55dcc8ea70a0f76f195d3 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 13 Apr 2018 13:38:47 -0700 Subject: [PATCH 2/3] Use unsigned value for comparison with json.size() --- tests/json_ut.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/json_ut.cpp b/tests/json_ut.cpp index cb7b219ec..e288faaef 100644 --- a/tests/json_ut.cpp +++ b/tests/json_ut.cpp @@ -38,23 +38,21 @@ TEST(JSON, test) file >> j; EXPECT_TRUE(j.is_array()); - EXPECT_EQ(j.size(), 3); + EXPECT_EQ(j.size(), 3u); for (size_t i = 0; i < j.size(); i++) { auto item = j[i]; EXPECT_TRUE(item.is_object()); - EXPECT_EQ(item.size(), 2); + EXPECT_EQ(item.size(), 2u); for (auto it = item.begin(); it != item.end(); it++) { if (it.key() == "OP") - EXPECT_TRUE(it.value() == "SET" || it.value() == "DEL"); // FIXME: better use construction below -// EXPECT_THAT(it.value(), AnyOf("SET", "DEL")); + EXPECT_TRUE(it.value() == "SET" || it.value() == "DEL"); else { - EXPECT_TRUE(it.key() == "UT_REDIS" + separator + "test_key_1" || it.key() == "UT_REDIS" + separator + "test_key_2"); // FIXME: better to use construction below -// EXPECT_THAT(it.key(), AnyOf(string("UT_REDIS") + separator + "test_key_1", string("UT_REDIS") + separator + "test_key_2")); + EXPECT_TRUE(it.key() == "UT_REDIS" + separator + "test_key_1" || it.key() == "UT_REDIS" + separator + "test_key_2"); auto subitem = it.value(); EXPECT_TRUE(subitem.is_object()); if (subitem.size() > 0) From 782de173bb32492bdadeb575b1b1da69a4ffee5b Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 13 Apr 2018 13:54:25 -0700 Subject: [PATCH 3/3] Add newlines at the end of the files --- tests/exec_ut.cpp | 2 +- tests/ntf_ut.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/exec_ut.cpp b/tests/exec_ut.cpp index c6d61a304..473eb8240 100644 --- a/tests/exec_ut.cpp +++ b/tests/exec_ut.cpp @@ -33,4 +33,4 @@ TEST(EXEC, error) string result; int ret = exec(cmd, result); EXPECT_NE(ret, 0); -} \ No newline at end of file +} diff --git a/tests/ntf_ut.cpp b/tests/ntf_ut.cpp index c96d4af39..bff70a3e6 100644 --- a/tests/ntf_ut.cpp +++ b/tests/ntf_ut.cpp @@ -76,4 +76,4 @@ TEST(Notifications, test) notification_thread->join(); } -//FIXME: no tests inside \ No newline at end of file +//FIXME: no tests inside