From 3f6d703833af0c2c7b6aa31525b6593588312e94 Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Sun, 31 May 2009 00:22:25 +0000
Subject: Had to swap macro definitions to support R12B.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@780350 13f79535-47bb-0310-9956-ffa450edef68
---
 test/etap/021-btree-reductions.t | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/etap/021-btree-reductions.t')

diff --git a/test/etap/021-btree-reductions.t b/test/etap/021-btree-reductions.t
index eb84f09b..9ae7dbbf 100755
--- a/test/etap/021-btree-reductions.t
+++ b/test/etap/021-btree-reductions.t
@@ -2,8 +2,8 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
--define(FILE_NAME, "./test/etap/temp.021").
--define(ROWS, 1000).
+filename() -> "./test/etap/temp.021".
+rows() -> 1000.
 
 main(_) ->
     code:add_pathz("src/couchdb"),
@@ -23,7 +23,7 @@ test()->
         (rereduce, Reds) -> lists:sum(Reds)
     end,
     
-    {ok, Fd} = couch_file:open(?FILE_NAME, [create,overwrite]),
+    {ok, Fd} = couch_file:open(filename(), [create,overwrite]),
     {ok, Btree} = couch_btree:open(nil, Fd, [{reduce, ReduceFun}]),
     
     % Create a list, of {"even", Value} or {"odd", Value} pairs.
@@ -32,7 +32,7 @@ test()->
             "even" -> {"odd", [{{Key, Idx}, 1} | Acc]};
             _ -> {"even", [{{Key, Idx}, 1} | Acc]}
         end
-    end, {"odd", []}, lists:seq(1, ?ROWS)),
+    end, {"odd", []}, lists:seq(1, rows())),
 
     {ok, Btree2} = couch_btree:add_remove(Btree, EvenOddKVs, []),
 
@@ -46,7 +46,7 @@ test()->
 
     etap:fun_is(
         fun
-            ({ok, [{{"odd", _}, ?ROWS div 2}, {{"even", _}, ?ROWS div 2}]}) ->
+            ({ok, [{{"odd", _}, 500}, {{"even", _}, 500}]}) ->
                 true;
             (_) ->
                 false
@@ -57,7 +57,7 @@ test()->
 
     etap:fun_is(
         fun
-            ({ok, [{{"odd", _}, ?ROWS div 2}, {{"even", _}, ?ROWS div 2}]}) ->
+            ({ok, [{{"odd", _}, 500}, {{"even", _}, 500}]}) ->
                 true;
             (_) ->
                 false
@@ -68,7 +68,7 @@ test()->
 
     etap:fun_is(
         fun
-            ({ok, [{{"even", _}, ?ROWS div 2}, {{"odd", _}, ?ROWS div 2}]}) ->
+            ({ok, [{{"even", _}, 500}, {{"odd", _}, 500}]}) ->
                 true;
             (_) ->
                 false
@@ -79,7 +79,7 @@ test()->
     
     etap:fun_is(
         fun
-            ({ok, [{{"odd", _}, ?ROWS div 2}, {{"even", _}, ?ROWS div 2}]}) ->
+            ({ok, [{{"odd", _}, 500}, {{"even", _}, 500}]}) ->
                 true;
             (_) ->
                 false
@@ -90,7 +90,7 @@ test()->
     
     etap:fun_is(
         fun
-            ({ok, [{{"even", _}, ?ROWS div 2}]}) -> true;
+            ({ok, [{{"even", _}, 500}]}) -> true;
             (_) -> false
         end,
         couch_btree:fold_reduce(Btree2, fwd, SK1, EK1, GroupFun, FoldFun, []),
@@ -99,7 +99,7 @@ test()->
 
     etap:fun_is(
         fun
-            ({ok, [{{"odd", _}, ?ROWS div 2}]}) -> true;
+            ({ok, [{{"odd", _}, 500}]}) -> true;
             (_) -> false
         end,
         couch_btree:fold_reduce(Btree2, fwd, SK2, EK2, GroupFun, FoldFun, []),
@@ -108,7 +108,7 @@ test()->
 
     etap:fun_is(
         fun
-            ({ok, [{{"odd", _}, ?ROWS div 2}]}) -> true;
+            ({ok, [{{"odd", _}, 500}]}) -> true;
             (_) -> false
         end,
         couch_btree:fold_reduce(Btree2, rev, EK2, SK2, GroupFun, FoldFun, []),
@@ -117,7 +117,7 @@ test()->
     
     etap:fun_is(
         fun
-            ({ok, [{{"even", _}, ?ROWS div 2}, {{"odd", _}, ?ROWS div 2}]}) ->
+            ({ok, [{{"even", _}, 500}, {{"odd", _}, 500}]}) ->
                 true;
             (_) ->
                 false
-- 
cgit v1.2.3