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 4166E11E04 for ; Mon, 16 Jun 2014 22:52:50 +0000 (UTC) Received: (qmail 98555 invoked by uid 500); 16 Jun 2014 22:52:44 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98360 invoked by uid 500); 16 Jun 2014 22:52:44 -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 96961 invoked by uid 99); 16 Jun 2014 22:52:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2014 22:52:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3E25A941785; Mon, 16 Jun 2014 22:52:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Mon, 16 Jun 2014 22:53:17 -0000 Message-Id: In-Reply-To: <86731430c5194546a2188404fdce3eb5@git.apache.org> References: <86731430c5194546a2188404fdce3eb5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] couchdb commit: updated refs/heads/1963-eunit to bfb7eb9 Port couch_mrview/02-map-views.t etap test suite to eunit Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/53baad86 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/53baad86 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/53baad86 Branch: refs/heads/1963-eunit Commit: 53baad869f4fbb51d03916fca76f9c4fd8394f79 Parents: 3b36d11 Author: Alexander Shorin Authored: Wed Jun 11 18:14:22 2014 +0400 Committer: Alexander Shorin Committed: Tue Jun 17 01:42:12 2014 +0400 ---------------------------------------------------------------------- src/couch_mrview/Makefile.am | 2 +- src/couch_mrview/test/02-map-views.t | 131 ------------------ .../test/couch_mrview_map_views_tests.erl | 138 +++++++++++++++++++ 3 files changed, 139 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/53baad86/src/couch_mrview/Makefile.am ---------------------------------------------------------------------- diff --git a/src/couch_mrview/Makefile.am b/src/couch_mrview/Makefile.am index d12b745..dfe412b 100644 --- a/src/couch_mrview/Makefile.am +++ b/src/couch_mrview/Makefile.am @@ -33,8 +33,8 @@ source_files = \ src/couch_mrview_util.erl test_files = \ + test/couch_mrview_map_views_tests.erl \ test/couch_mrview_modules_load_tests.erl \ - test/02-map-views.t \ test/03-red-views.t \ test/04-index-info.t \ test/05-collation.t \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/53baad86/src/couch_mrview/test/02-map-views.t ---------------------------------------------------------------------- diff --git a/src/couch_mrview/test/02-map-views.t b/src/couch_mrview/test/02-map-views.t deleted file mode 100644 index 7e1ca0c..0000000 --- a/src/couch_mrview/test/02-map-views.t +++ /dev/null @@ -1,131 +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:init_code_path(), - - etap:plan(6), - case (catch test()) of - ok -> - etap:end_tests(); - Other -> - etap:diag(io_lib:format("Test died abnormally: ~p", [Other])), - etap:bail(Other) - end, - timer:sleep(300), - ok. - -test() -> - couch_server_sup:start_link(test_util:config_files()), - - {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, 10}, {offset, 0}]}, - {row, [{id, <<"1">>}, {key, 1}, {value, 1}]}, - {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, - {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, - {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, - {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, - {row, [{id, <<"6">>}, {key, 6}, {value, 6}]}, - {row, [{id, <<"7">>}, {key, 7}, {value, 7}]}, - {row, [{id, <<"8">>}, {key, 8}, {value, 8}]}, - {row, [{id, <<"9">>}, {key, 9}, {value, 9}]}, - {row, [{id, <<"10">>}, {key, 10}, {value, 10}]} - ]}, - 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, 10}, {offset, 2}]}, - {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, - {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, - {row, [{id, <<"5">>}, {key, 5}, {value, 5}]} - ]}, - 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, 10}, {offset, 5}]}, - {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, - {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, - {row, [{id, <<"3">>}, {key, 3}, {value, 3}]} - ]}, - 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, 10}, {offset, 4}]}, - {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, - {row, [{id, <<"6">>}, {key, 6}, {value, 6}]}, - {row, [{id, <<"7">>}, {key, 7}, {value, 7}]} - ]}, - 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} - ]}, - Expect = {ok, [ - {meta, [{total, 10}, {offset, 7}]}, - {row, [{id, <<"8">>}, {key, 8}, {value, 8}, {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."). - - -run_query(Db, Opts) -> - couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>, Opts). http://git-wip-us.apache.org/repos/asf/couchdb/blob/53baad86/src/couch_mrview/test/couch_mrview_map_views_tests.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview/test/couch_mrview_map_views_tests.erl b/src/couch_mrview/test/couch_mrview_map_views_tests.erl new file mode 100644 index 0000000..c09490e --- /dev/null +++ b/src/couch_mrview/test/couch_mrview_map_views_tests.erl @@ -0,0 +1,138 @@ +% 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_map_views_tests). + +-include("../../../test/couchdb/couch_eunit.hrl"). +-include_lib("couchdb/couch_db.hrl"). + +-define(TIMEOUT, 1000). +-define(ADMIN_USER, {user_ctx, #user_ctx{roles=[<<"_admin">>]}}). + + +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. + + +map_views_test_() -> + { + "Map views", + { + setup, + fun start/0, fun stop/1, + { + foreach, + fun setup/0, fun teardown/1, + [ + fun should_map/1, + fun should_map_with_range/1, + fun should_map_with_limit_and_skip/1, + fun should_map_with_include_docs/1, + fun should_map_empty_views/1 + ] + } + } + }. + + +should_map(Db) -> + Result = run_query(Db, []), + Expect = {ok, [ + {meta, [{total, 10}, {offset, 0}]}, + {row, [{id, <<"1">>}, {key, 1}, {value, 1}]}, + {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, + {row, [{id, <<"6">>}, {key, 6}, {value, 6}]}, + {row, [{id, <<"7">>}, {key, 7}, {value, 7}]}, + {row, [{id, <<"8">>}, {key, 8}, {value, 8}]}, + {row, [{id, <<"9">>}, {key, 9}, {value, 9}]}, + {row, [{id, <<"10">>}, {key, 10}, {value, 10}]} + ]}, + ?_assertEqual(Expect, Result). + +should_map_with_range(Db) -> + Result = run_query(Db, [ + {direction, rev}, + {start_key, 5}, {end_key, 3}, + {inclusive_end, true} + ]), + Expect = {ok, [ + {meta, [{total, 10}, {offset, 5}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]} + ]}, + ?_assertEqual(Expect, Result). + +should_map_with_limit_and_skip(Db) -> + Result = run_query(Db, [ + {start_key, 2}, + {limit, 3}, + {skip, 3} + ]), + Expect = {ok, [ + {meta, [{total, 10}, {offset, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]}, + {row, [{id, <<"6">>}, {key, 6}, {value, 6}]}, + {row, [{id, <<"7">>}, {key, 7}, {value, 7}]} + ]}, + ?_assertEqual(Expect, Result). + +should_map_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} + ]}, + Expect = {ok, [ + {meta, [{total, 10}, {offset, 7}]}, + {row, [{id, <<"8">>}, {key, 8}, {value, 8}, {doc, Doc}]} + ]}, + ?_assertEqual(Expect, Result). + +should_map_empty_views(Db) -> + Result = couch_mrview:query_view(Db, <<"_design/bar">>, <<"bing">>), + Expect = {ok, [ + {meta, [{total, 0}, {offset, 0}]} + ]}, + ?_assertEqual(Expect, Result). + + +run_query(Db, Opts) -> + couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>, Opts).