You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2014/07/22 01:57:34 UTC
[21/43] couchdb commit: updated refs/heads/1963-eunit-bigcouch to
424dca5
Port 083-config-no-files.t etap test suite to eunit
Merged into couch_config_tests suite.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/49d63256
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/49d63256
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/49d63256
Branch: refs/heads/1963-eunit-bigcouch
Commit: 49d63256c2d1f669536708b98fa470130246a5a7
Parents: af16d28
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon May 26 09:46:06 2014 +0400
Committer: Russell Branca <ch...@apache.org>
Committed: Mon Jul 21 16:43:37 2014 -0700
----------------------------------------------------------------------
test/couchdb/couch_config_tests.erl | 37 +++++++++++++++++++++-
test/etap/083-config-no-files.t | 53 --------------------------------
2 files changed, 36 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/49d63256/test/couchdb/couch_config_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb/couch_config_tests.erl b/test/couchdb/couch_config_tests.erl
index fdd2479..9e9dfe7 100644
--- a/test/couchdb/couch_config_tests.erl
+++ b/test/couchdb/couch_config_tests.erl
@@ -44,6 +44,9 @@ setup(Chain) ->
{ok, Pid} = couch_config:start_link(Chain),
Pid.
+setup_empty() ->
+ setup([]).
+
setup_register() ->
ConfigPid = setup(),
SentinelFunc = fun() ->
@@ -92,7 +95,8 @@ couch_config_test_() ->
couch_config_del_tests(),
config_override_tests(),
config_persistent_changes_tests(),
- config_register_tests()
+ config_register_tests(),
+ config_no_files_tests()
]
}.
@@ -195,6 +199,20 @@ config_register_tests() ->
}
}.
+config_no_files_tests() ->
+ {
+ "Test couch_config with no files",
+ {
+ foreach,
+ fun setup_empty/0, fun teardown/1,
+ [
+ should_ensure_that_no_ini_files_loaded(),
+ should_create_non_persistent_option(),
+ should_create_persistent_option()
+ ]
+ }
+ }.
+
should_load_all_configs() ->
?_assert(length(couch_config:all()) > 0).
@@ -426,3 +444,20 @@ should_not_trigger_handler_after_related_process_death({_, SentinelPid}) ->
true
end
end).
+
+should_ensure_that_no_ini_files_loaded() ->
+ ?_assertEqual(0, length(couch_config:all())).
+
+should_create_non_persistent_option() ->
+ ?_assertEqual("80",
+ begin
+ ok = couch_config:set("httpd", "port", "80", false),
+ couch_config:get("httpd", "port")
+ end).
+
+should_create_persistent_option() ->
+ ?_assertEqual("127.0.0.1",
+ begin
+ ok = couch_config:set("httpd", "bind_address", "127.0.0.1"),
+ couch_config:get("httpd", "bind_address")
+ end).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/49d63256/test/etap/083-config-no-files.t
----------------------------------------------------------------------
diff --git a/test/etap/083-config-no-files.t b/test/etap/083-config-no-files.t
deleted file mode 100755
index 3ad0905..0000000
--- a/test/etap/083-config-no-files.t
+++ /dev/null
@@ -1,53 +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(3),
- case (catch test()) of
- ok ->
- etap:end_tests();
- Other ->
- etap:diag(io_lib:format("Test died abnormally: ~p", [Other])),
- etap:bail(Other)
- end,
- ok.
-
-test() ->
- application:start(config),
-
- etap:fun_is(
- fun(KVPairs) -> length(KVPairs) == 0 end,
- config:all(),
- "No INI files specified returns 0 key/value pairs."
- ),
-
- ok = config:set("httpd", "port", "80", false),
-
- etap:is(
- config:get("httpd", "port"),
- "80",
- "Created a new non-persisted k/v pair."
- ),
-
- ok = config:set("httpd", "bind_address", "127.0.0.1"),
- etap:is(
- config:get("httpd", "bind_address"),
- "127.0.0.1",
- "Asking for a persistent key/value pair doesn't choke."
- ),
-
- ok.