Skip to content

Commit 56c501a

Browse files
trondndaverigby
authored andcommitted
Refactor: move function_chain_test.cc next to function_chain
And link it into memcached_unit_tests to avoid having to link and start a new program just for 4 small tests Change-Id: I3371f7b83a57c6eb8c28db1ec80b74db01558ac3 Reviewed-on: http://review.couchbase.org/c/kv_engine/+/135604 Tested-by: Trond Norbye <trond.norbye@couchbase.com> Reviewed-by: Dave Rigby <daver@couchbase.com>
1 parent 47a5eaf commit 56c501a

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

daemon/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ if (COUCHBASE_KV_BUILD_UNIT_TESTS)
270270

271271
add_executable(memcached_unit_tests
272272
connection_unit_tests.cc
273+
function_chain_test.cc
273274
mc_time_test.cc)
274275
add_sanitizers(memcached_unit_tests)
275276
target_link_libraries(memcached_unit_tests

tests/function_chain/function_chain_test.cc renamed to daemon/function_chain_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include <daemon/function_chain.h>
18+
#include "function_chain.h"
1919
#include <folly/portability/GTest.h>
2020

2121
static int doubleInput(int input) {
@@ -67,7 +67,7 @@ TEST(FunctionChainTest, SingleChain) {
6767
chain.push_unique(makeFunction<int, getSuccessValue, int>(doubleInput));
6868
// check return val is double input
6969
int input = 102;
70-
ASSERT_EQ(input*2, chain.invoke(input));
70+
ASSERT_EQ(input * 2, chain.invoke(input));
7171
}
7272

7373
/*
@@ -76,12 +76,12 @@ TEST(FunctionChainTest, SingleChain) {
7676
TEST(FunctionChainTest, Uniqueness) {
7777
FunctionChain<int, getSuccessValue> chain;
7878

79-
for(int ii = 0; ii < 6; ii++) {
79+
for (int ii = 0; ii < 6; ii++) {
8080
chain.push_unique(makeFunction<int, getSuccessValue>(iCountMyCalls));
8181
}
8282

8383
ASSERT_EQ(1, iCountMyCalls()); // manually invoke returns 1
84-
ASSERT_EQ(2, chain.invoke()); // should now be 2
84+
ASSERT_EQ(2, chain.invoke()); // should now be 2
8585
ASSERT_EQ(3, iCountMyCalls()); // manually invoke now returns 3
8686
}
8787

tests/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ADD_SUBDIRECTORY(dockey)
77
ADD_SUBDIRECTORY(engine_error)
88
ADD_SUBDIRECTORY(error_map_sanity_check)
99
ADD_SUBDIRECTORY(executor)
10-
ADD_SUBDIRECTORY(function_chain)
1110
ADD_SUBDIRECTORY(histograms)
1211
ADD_SUBDIRECTORY(mcbp)
1312
ADD_SUBDIRECTORY(memory_tracking_test)

tests/function_chain/CMakeLists.txt

-6
This file was deleted.

0 commit comments

Comments
 (0)