[couchdb] branch master updated: Simplify couch_key_tree test setup

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 730dcf7  Simplify couch_key_tree test setup
730dcf7 is described below

commit 730dcf795117c51939e491b04400757f8d61a9f6
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri Jan 12 01:56:21 2018 -0500

    Simplify couch_key_tree test setup
    
    Avoid starting 4 applications (config, couch_log, ioq and couch_epi) just to
    handle a call to config:get. Instead just mock the config directly.
    
    This also speeds up the test suite a bit.
---
 src/couch/test/couch_key_tree_tests.erl | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/couch/test/couch_key_tree_tests.erl b/src/couch/test/couch_key_tree_tests.erl
index 8aa886f..88d9203 100644
--- a/src/couch/test/couch_key_tree_tests.erl
+++ b/src/couch/test/couch_key_tree_tests.erl
@@ -17,14 +17,18 @@
 -define(DEPTH, 10).
 
 setup() ->
-    test_util:start(?MODULE, [], [{dont_mock, [config]}]).
+    meck:new(config),
+    meck:expect(config, get, fun(_, _, Default) -> Default end).
+
+teardown(_) ->
+    meck:unload(config).
 
 key_tree_merge_test_()->
     {
         "Key tree merge",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_merge_with_empty_tree(),
                 should_merge_reflexive(),
@@ -51,7 +55,7 @@ key_tree_missing_leaves_test_()->
         "Missing tree leaves",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_not_find_missing_leaves(),
                 should_find_missing_leaves()
@@ -64,7 +68,7 @@ key_tree_remove_leaves_test_()->
         "Remove tree leaves",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_have_no_effect_on_removing_no_leaves(),
                 should_have_no_effect_on_removing_non_existant_branch(),
@@ -81,7 +85,7 @@ key_tree_get_leaves_test_()->
         "Leaves retrieving",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_extract_subtree(),
                 should_extract_subsubtree(),
@@ -103,7 +107,7 @@ key_tree_leaf_counting_test_()->
         "Leaf counting",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_have_no_leaves_for_empty_tree(),
                 should_have_single_leaf_for_tree_with_single_node(),
@@ -118,7 +122,7 @@ key_tree_stemming_test_()->
         "Stemming",
         {
             setup,
-            fun setup/0, fun test_util:stop/1,
+            fun setup/0, fun teardown/1,
             [
                 should_have_no_effect_for_stemming_more_levels_than_exists(),
                 should_return_one_deepest_node(),

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].