This is an automated email from the ASF dual-hosted git repository. vatamane pushed a commit to branch refactor-replication-tests in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1623a4fa913958f627f6b0ba53c1e453e494e986 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Thu Aug 18 21:39:17 2022 -0400 Update couch_replicator_selector_tests Use the clustered versions of endpoints for the test. Also, use the common setup and teardown helpers and remove the foreachx silliness. --- .../test/eunit/couch_replicator_selector_tests.erl | 121 ++++++++------------- 1 file changed, 44 insertions(+), 77 deletions(-) diff --git a/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl index 8f61a638c..31c5dc93c 100644 --- a/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl +++ b/src/couch_replicator/test/eunit/couch_replicator_selector_tests.erl @@ -14,92 +14,62 @@ -include_lib("couch/include/couch_eunit.hrl"). -include_lib("couch/include/couch_db.hrl"). --include_lib("couch_replicator/src/couch_replicator.hrl"). - -setup(_) -> - Ctx = test_util:start_couch([couch_replicator]), - Source = create_db(), - create_docs(Source), - Target = create_db(), - {Ctx, {Source, Target}}. - -teardown(_, {Ctx, {Source, Target}}) -> - delete_db(Source), - delete_db(Target), - ok = application:stop(couch_replicator), - ok = test_util:stop_couch(Ctx). +-include("couch_replicator_test.hrl"). selector_replication_test_() -> - Pairs = [{remote, remote}], { "Selector filtered replication tests", { - foreachx, - fun setup/1, - fun teardown/2, - [{Pair, fun should_succeed/2} || Pair <- Pairs] + foreach, + fun couch_replicator_test_helper:test_setup/0, + fun couch_replicator_test_helper:test_teardown/1, + [ + ?TDEF_FE(should_succeed) + ] } }. -should_succeed({From, To}, {_Ctx, {Source, Target}}) -> - RepObject = +should_succeed({_Ctx, {Source, Target}}) -> + create_docs(Source), + replicate( {[ - {<<"source">>, db_url(From, Source)}, - {<<"target">>, db_url(To, Target)}, + {<<"source">>, db_url(Source)}, + {<<"target">>, db_url(Target)}, {<<"selector">>, {[{<<"_id">>, <<"doc2">>}]}} - ]}, - {ok, _} = couch_replicator:replicate(RepObject, ?ADMIN_USER), + ]} + ), %% FilteredFun is an Erlang version of following mango selector - FilterFun = fun(_DocId, {Props}) -> - couch_util:get_value(<<"_id">>, Props) == <<"doc2">> + FilterFun = fun(DocId, #doc{}) -> + DocId == <<"doc2">> end, - {ok, TargetDbInfo, AllReplies} = compare_dbs(Source, Target, FilterFun), - {lists:flatten(io_lib:format("~p -> ~p", [From, To])), [ - {"Target DB has proper number of docs", - ?_assertEqual(1, proplists:get_value(doc_count, TargetDbInfo))}, - {"All the docs selected as expected", - ?_assert(lists:all(fun(Valid) -> Valid end, AllReplies))} - ]}. + {TargetDocCount, AllReplies} = compare_dbs(Source, Target, FilterFun), + % Target DB has proper number of docs + ?assertEqual(1, TargetDocCount), + % All the docs selected as expected + ?assert(lists:all(fun(Valid) -> Valid end, AllReplies)). compare_dbs(Source, Target, FilterFun) -> - {ok, SourceDb} = couch_db:open_int(Source, []), - {ok, TargetDb} = couch_db:open_int(Target, []), - {ok, TargetDbInfo} = couch_db:get_db_info(TargetDb), - Fun = fun(FullDocInfo, Acc) -> - {ok, DocId, SourceDoc} = read_doc(SourceDb, FullDocInfo), - TargetReply = read_doc(TargetDb, DocId), - case FilterFun(DocId, SourceDoc) of - true -> - ValidReply = {ok, DocId, SourceDoc} == TargetReply, - {ok, [ValidReply | Acc]}; - false -> - ValidReply = {not_found, missing} == TargetReply, - {ok, [ValidReply | Acc]} - end - end, - {ok, AllReplies} = couch_db:fold_docs(SourceDb, Fun, [], []), - ok = couch_db:close(SourceDb), - ok = couch_db:close(TargetDb), - {ok, TargetDbInfo, AllReplies}. - -read_doc(Db, DocIdOrInfo) -> - case couch_db:open_doc(Db, DocIdOrInfo) of - {ok, Doc} -> - {Props} = couch_doc:to_json_obj(Doc, [attachments]), - DocId = couch_util:get_value(<<"_id">>, Props), - {ok, DocId, {Props}}; - Error -> - Error - end. + {ok, TargetDocCount} = fabric:get_doc_count(Target), + Replies = lists:foldl( + fun({Id, Rev}, Acc) -> + SrcDoc = read_doc(Source, Id, Rev), + TgtDoc = read_doc(Target, Id, Rev), + case FilterFun(Id, SrcDoc) of + true -> + [is_record(TgtDoc, doc) | Acc]; + false -> + [TgtDoc =:= not_found | Acc] + end + end, + [], + couch_replicator_test_helper:cluster_doc_revs(Source) + ), + {TargetDocCount, Replies}. -create_db() -> - DbName = ?tempdb(), - {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]), - ok = couch_db:close(Db), - DbName. +read_doc(Db, DocId, Rev) -> + couch_replicator_test_helper:cluster_open_rev(Db, DocId, Rev). create_docs(DbName) -> - {ok, Db} = couch_db:open(DbName, [?ADMIN_CTX]), Doc1 = couch_doc:from_json_obj( {[ {<<"_id">>, <<"doc1">>} @@ -110,13 +80,10 @@ create_docs(DbName) -> {<<"_id">>, <<"doc2">>} ]} ), - {ok, _} = couch_db:update_docs(Db, [Doc1, Doc2]), - couch_db:close(Db). + {ok, _} = fabric:update_docs(DbName, [Doc1, Doc2], [?ADMIN_CTX]). -delete_db(DbName) -> - ok = couch_server:delete(DbName, [?ADMIN_CTX]). +db_url(DbName) -> + couch_replicator_test_helper:cluster_db_url(DbName). -db_url(remote, DbName) -> - Addr = config:get("httpd", "bind_address", "127.0.0.1"), - Port = mochiweb_socket_server:get(couch_httpd, port), - ?l2b(io_lib:format("http://~s:~b/~s";, [Addr, Port, DbName])). +replicate(RepObject) -> + couch_replicator_test_helper:replicate(RepObject).
