Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7EFD11698 for ; Thu, 28 Aug 2014 17:27:24 +0000 (UTC) Received: (qmail 589 invoked by uid 500); 28 Aug 2014 17:27:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 482 invoked by uid 500); 28 Aug 2014 17:27:24 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 191 invoked by uid 99); 28 Aug 2014 17:27:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 17:27:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0BDB4A04A0C; Thu, 28 Aug 2014 17:27:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 17:27:32 -0000 Message-Id: <028b736f013f4040a17703a0b2882965@git.apache.org> In-Reply-To: <246c8843d93a42e78b3768a98479c21c@git.apache.org> References: <246c8843d93a42e78b3768a98479c21c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/22] couch-mrview commit: updated refs/heads/1963-eunit-bigcouch to cc9c436 Port couch_mrview/06-all-docs.t etap test suite to eunit Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/40e770ed Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/40e770ed Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/40e770ed Branch: refs/heads/1963-eunit-bigcouch Commit: 40e770edb38dd10cc50797ed82c12f9715a0de36 Parents: 776605b Author: Alexander Shorin Authored: Thu Jun 12 02:39:46 2014 +0400 Committer: Russell Branca Committed: Thu Aug 28 10:27:04 2014 -0700 ---------------------------------------------------------------------- .../test/couch_mrview_all_docs_tests.erl | 154 +++++++++++++++++++ test/06-all-docs.t | 127 --------------- 2 files changed, 154 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/40e770ed/src/couch_mrview/test/couch_mrview_all_docs_tests.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview/test/couch_mrview_all_docs_tests.erl b/src/couch_mrview/test/couch_mrview_all_docs_tests.erl new file mode 100644 index 0000000..6d73c68 --- /dev/null +++ b/src/couch_mrview/test/couch_mrview_all_docs_tests.erl @@ -0,0 +1,154 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + +-module(couch_mrview_all_docs_tests). + +-include("../../../test/couchdb/couch_eunit.hrl"). +-include_lib("couchdb/couch_db.hrl"). + +-define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). +-define(TIMEOUT, 1000). + + +start() -> + {ok, Pid} = couch_server_sup:start_link(?CONFIG_CHAIN), + Pid. + +stop(Pid) -> + erlang:monitor(process, Pid), + couch_server_sup:stop(), + receive + {'DOWN', _, _, Pid, _} -> + ok + after ?TIMEOUT -> + throw({timeout, server_stop}) + end. + +setup() -> + {ok, Db} = couch_mrview_test_util:init_db(?tempdb(), map), + Db. + +teardown(Db) -> + couch_db:close(Db), + couch_server:delete(Db#db.name, [?ADMIN_USER]), + ok. + + +all_docs_test_() -> + { + "_all_docs view tests", + { + setup, + fun start/0, fun stop/1, + { + foreach, + fun setup/0, fun teardown/1, + [ + fun should_query/1, + fun should_query_with_range/1, + fun should_query_with_range_rev/1, + fun should_query_with_limit_and_skip/1, + fun should_query_with_include_docs/1, + fun should_query_empty_views/1 + ] + } + } + }. + + +should_query(Db) -> + Result = run_query(Db, []), + Expect = {ok, [ + {meta, [{total, 11}, {offset, 0}]}, + mk_row(<<"1">>, <<"1-08d53a5760b95fce6df2e2c5b008be39">>), + mk_row(<<"10">>, <<"1-a05b6ea2bc0243949f103d5b4f15f71e">>), + mk_row(<<"2">>, <<"1-b57c77a9e6f7574ca6469f0d6dcd78bb">>), + mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>), + mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), + mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), + mk_row(<<"6">>, <<"1-aca21c2e7bc5f8951424fcfc5d1209d8">>), + mk_row(<<"7">>, <<"1-4374aeec17590d82f16e70f318116ad9">>), + mk_row(<<"8">>, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>), + mk_row(<<"9">>, <<"1-558c8487d9aee25399a91b5d31d90fe2">>), + mk_row(<<"_design/bar">>, <<"1-a44e1dd1994a7717bf89c894ebd1f081">>) + ]}, + ?_assertEqual(Expect, Result). + +should_query_with_range(Db) -> + Result = run_query(Db, [{start_key, <<"3">>}, {end_key, <<"5">>}]), + Expect = {ok, [ + {meta, [{total, 11}, {offset, 3}]}, + mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>), + mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), + mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>) + ]}, + ?_assertEqual(Expect, Result). + +should_query_with_range_rev(Db) -> + Result = run_query(Db, [ + {direction, rev}, + {start_key, <<"5">>}, {end_key, <<"3">>}, + {inclusive_end, true} + ]), + Expect = {ok, [ + {meta, [{total, 11}, {offset, 5}]}, + mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), + mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), + mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>) + ]}, + ?_assertEqual(Expect, Result). + +should_query_with_limit_and_skip(Db) -> + Result = run_query(Db, [ + {start_key, <<"2">>}, + {limit, 3}, + {skip, 3} + ]), + Expect = {ok, [ + {meta, [{total, 11}, {offset, 5}]}, + mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), + mk_row(<<"6">>, <<"1-aca21c2e7bc5f8951424fcfc5d1209d8">>), + mk_row(<<"7">>, <<"1-4374aeec17590d82f16e70f318116ad9">>) + ]}, + ?_assertEqual(Expect, Result). + +should_query_with_include_docs(Db) -> + Result = run_query(Db, [ + {start_key, <<"8">>}, + {end_key, <<"8">>}, + {include_docs, true} + ]), + Doc = {[ + {<<"_id">>,<<"8">>}, + {<<"_rev">>, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>}, + {<<"val">>, 8} + ]}, + Val = {[{rev, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>}]}, + Expect = {ok, [ + {meta, [{total, 11}, {offset, 8}]}, + {row, [{id, <<"8">>}, {key, <<"8">>}, {value, Val}, {doc, Doc}]} + ]}, + ?_assertEqual(Expect, Result). + +should_query_empty_views(Db) -> + Result = couch_mrview:query_view(Db, <<"_design/bar">>, <<"bing">>), + Expect = {ok, [ + {meta, [{total, 0}, {offset, 0}]} + ]}, + ?_assertEqual(Expect, Result). + + +mk_row(Id, Rev) -> + {row, [{id, Id}, {key, Id}, {value, {[{rev, Rev}]}}]}. + +run_query(Db, Opts) -> + couch_mrview:query_all_docs(Db, Opts). http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/40e770ed/test/06-all-docs.t ---------------------------------------------------------------------- diff --git a/test/06-all-docs.t b/test/06-all-docs.t deleted file mode 100644 index a3aafa0..0000000 --- a/test/06-all-docs.t +++ /dev/null @@ -1,127 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang -*- - -% Licensed under the Apache License, Version 2.0 (the "License"); you may not -% use this file except in compliance with the License. You may obtain a copy of -% the License at -% -% http://www.apache.org/licenses/LICENSE-2.0 -% -% Unless required by applicable law or agreed to in writing, software -% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -% License for the specific language governing permissions and limitations under -% the License. - -main(_) -> - test_util:run(6, fun() -> test() end). - - -test() -> - test_util:start_couch(), - - {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map), - - test_basic(Db), - test_range(Db), - test_rev_range(Db), - test_limit_and_skip(Db), - test_include_docs(Db), - test_empty_view(Db), - - ok. - - -test_basic(Db) -> - Result = run_query(Db, []), - Expect = {ok, [ - {meta, [{total, 11}, {offset, 0}]}, - mk_row(<<"1">>, <<"1-08d53a5760b95fce6df2e2c5b008be39">>), - mk_row(<<"10">>, <<"1-a05b6ea2bc0243949f103d5b4f15f71e">>), - mk_row(<<"2">>, <<"1-b57c77a9e6f7574ca6469f0d6dcd78bb">>), - mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>), - mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), - mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), - mk_row(<<"6">>, <<"1-aca21c2e7bc5f8951424fcfc5d1209d8">>), - mk_row(<<"7">>, <<"1-4374aeec17590d82f16e70f318116ad9">>), - mk_row(<<"8">>, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>), - mk_row(<<"9">>, <<"1-558c8487d9aee25399a91b5d31d90fe2">>), - mk_row(<<"_design/bar">>, <<"1-a44e1dd1994a7717bf89c894ebd1f081">>) - ]}, - etap:is(Result, Expect, "Simple view query worked."). - - -test_range(Db) -> - Result = run_query(Db, [{start_key, <<"3">>}, {end_key, <<"5">>}]), - Expect = {ok, [ - {meta, [{total, 11}, {offset, 3}]}, - mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>), - mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), - mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>) - ]}, - etap:is(Result, Expect, "Query with range works."). - - -test_rev_range(Db) -> - Result = run_query(Db, [ - {direction, rev}, - {start_key, <<"5">>}, {end_key, <<"3">>}, - {inclusive_end, true} - ]), - Expect = {ok, [ - {meta, [{total, 11}, {offset, 5}]}, - mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), - mk_row(<<"4">>, <<"1-fcaf5852c08ffb239ac8ce16c409f253">>), - mk_row(<<"3">>, <<"1-7fbf84d56f8017880974402d60f5acd6">>) - ]}, - etap:is(Result, Expect, "Query with reversed range works."). - - -test_limit_and_skip(Db) -> - Result = run_query(Db, [ - {start_key, <<"2">>}, - {limit, 3}, - {skip, 3} - ]), - Expect = {ok, [ - {meta, [{total, 11}, {offset, 5}]}, - mk_row(<<"5">>, <<"1-aaac5d460fd40f9286e57b9bf12e23d2">>), - mk_row(<<"6">>, <<"1-aca21c2e7bc5f8951424fcfc5d1209d8">>), - mk_row(<<"7">>, <<"1-4374aeec17590d82f16e70f318116ad9">>) - ]}, - etap:is(Result, Expect, "Query with limit and skip works."). - - -test_include_docs(Db) -> - Result = run_query(Db, [ - {start_key, <<"8">>}, - {end_key, <<"8">>}, - {include_docs, true} - ]), - Doc = {[ - {<<"_id">>,<<"8">>}, - {<<"_rev">>, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>}, - {<<"val">>, 8} - ]}, - Val = {[{rev, <<"1-55b9a29311341e07ec0a7ca13bc1b59f">>}]}, - Expect = {ok, [ - {meta, [{total, 11}, {offset, 8}]}, - {row, [{id, <<"8">>}, {key, <<"8">>}, {value, Val}, {doc, Doc}]} - ]}, - etap:is(Result, Expect, "Query with include docs works."). - - -test_empty_view(Db) -> - Result = couch_mrview:query_view(Db, <<"_design/bar">>, <<"bing">>), - Expect = {ok, [ - {meta, [{total, 0}, {offset, 0}]} - ]}, - etap:is(Result, Expect, "Empty views are correct."). - - -mk_row(Id, Rev) -> - {row, [{id, Id}, {key, Id}, {value, {[{rev, Rev}]}}]}. - - -run_query(Db, Opts) -> - couch_mrview:query_all_docs(Db, Opts).