You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2018/03/26 20:55:43 UTC
[couchdb] 12/33: WIP - chttpd_purge_tests.erl
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch COUCHDB-3326-clustered-purge-davisp-refactor
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ce7937392b0eb15549eae1b9e4f1d453443bb514
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Mar 26 13:03:35 2018 -0500
WIP - chttpd_purge_tests.erl
---
src/chttpd/test/chttpd_purge_tests.erl | 43 +++++++++++++++++++---------------
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/chttpd/test/chttpd_purge_tests.erl b/src/chttpd/test/chttpd_purge_tests.erl
index 7900090..74055db 100644
--- a/src/chttpd/test/chttpd_purge_tests.erl
+++ b/src/chttpd/test/chttpd_purge_tests.erl
@@ -80,7 +80,13 @@ test_empty_purge_request(Url) ->
[?CONTENT_JSON, ?AUTH], IdsRevs),
ResultJson = ?JSON_DECODE(ResultBody),
?assert(Status =:= 201 orelse Status =:= 202),
- ?assertEqual({[{<<"purged">>,{[]}}]}, ResultJson)
+ ?assertEqual(
+ {[
+ {<<"purge_seq">>, null},
+ {<<"purged">>,{[]}}
+ ]},
+ ResultJson
+ )
end).
@@ -95,30 +101,29 @@ test_ok_purge_request(Url) ->
{ok, _, _, Body3} = create_doc(Url, "doc3"),
{Json3} = ?JSON_DECODE(Body3),
Rev3 = couch_util:get_value(<<"rev">>, Json3, undefined),
- IdsRevs = "{\"doc1\": [\"" ++ ?b2l(Rev1) ++ "\"], \"doc2\": [\"" ++
- ?b2l(Rev2) ++ "\"], \"doc3\": [\"" ++ ?b2l(Rev3) ++ "\"] }",
+
+ IdsRevsEJson = {[
+ {<<"doc1">>, [Rev1]},
+ {<<"doc2">>, [Rev2]},
+ {<<"doc3">>, [Rev3]}
+ ]},
+ IdsRevs = binary_to_list(?JSON_ENCODE(IdsRevsEJson)),
{ok, Status, _, ResultBody} = test_request:post(Url ++ "/_purge/",
[?CONTENT_JSON, ?AUTH], IdsRevs),
ResultJson = ?JSON_DECODE(ResultBody),
?assert(Status =:= 201 orelse Status =:= 202),
?assertEqual(
- {[{<<"purged">>, {[
- {<<"doc1">>, {[
- {<<"purged">>,[Rev1]},
- {<<"ok">>,true}
- ]}},
- {<<"doc2">>, {[
- {<<"purged">>,[Rev2]},
- {<<"ok">>,true}
- ]}},
- {<<"doc3">>, {[
- {<<"purged">>,[Rev3]},
- {<<"ok">>,true}
- ]}}
- ]}}]},
- ResultJson
- )
+ {[
+ {<<"purge_seq">>, null},
+ {<<"purged">>, {[
+ {<<"doc1">>, [Rev1]},
+ {<<"doc2">>, [Rev2]},
+ {<<"doc3">>, [Rev3]}
+ ]}}
+ ]},
+ ResultJson
+ )
end).
--
To stop receiving notification emails like this one, please contact
davisp@apache.org.