X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fcount;h=05713fdc7eb250a65b618fbd152846f93d08a134;hb=8c3d19313e590590db3ecfe0fb7177f4f6aee023;hp=8e587ff9e96cec34178a9b656a1e63b980feee57;hpb=423e4fbfebdb5b49044184676e3fdda85955fdb0;p=notmuch

diff --git a/test/count b/test/count
index 8e587ff9..05713fdc 100755
--- a/test/count
+++ b/test/count
@@ -4,24 +4,28 @@ test_description='"notmuch count" for messages and threads'
 
 add_email_corpus
 
+# Note: The 'wc -l' results below are wrapped in arithmetic evaluation
+# $((...)) to strip whitespace. This is for portability, as 'wc -l'
+# emits whitespace on some BSD variants.
+
 test_begin_subtest "message count is the default for notmuch count"
 test_expect_equal \
-    "`notmuch search --output=messages '*' | wc -l`" \
+    "$((`notmuch search --output=messages '*' | wc -l`))" \
     "`notmuch count '*'`"
 
 test_begin_subtest "message count with --output=messages"
 test_expect_equal \
-    "`notmuch search --output=messages '*' | wc -l`" \
+    "$((`notmuch search --output=messages '*' | wc -l`))" \
     "`notmuch count --output=messages '*'`"
 
 test_begin_subtest "thread count with --output=threads"
 test_expect_equal \
-    "`notmuch search --output=threads '*' | wc -l`" \
+    "$((`notmuch search --output=threads '*' | wc -l`))" \
     "`notmuch count --output=threads '*'`"
 
 test_begin_subtest "thread count is the default for notmuch search"
 test_expect_equal \
-    "`notmuch search '*' | wc -l`" \
+    "$((`notmuch search '*' | wc -l`))" \
     "`notmuch count --output=threads '*'`"
 
 test_begin_subtest "count with no matching messages"
@@ -34,4 +38,50 @@ test_expect_equal \
     "0" \
     "`notmuch count --output=threads from:cworth and not from:cworth`"
 
+test_begin_subtest "message count is the default for batch count"
+notmuch count --batch >OUTPUT <<EOF
+
+from:cworth
+EOF
+notmuch count --output=messages >EXPECTED
+notmuch count --output=messages from:cworth >>EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "batch message count"
+notmuch count --batch --output=messages >OUTPUT <<EOF
+from:cworth
+
+tag:inbox
+EOF
+notmuch count --output=messages from:cworth >EXPECTED
+notmuch count --output=messages >>EXPECTED
+notmuch count --output=messages tag:inbox >>EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "batch thread count"
+notmuch count --batch --output=threads >OUTPUT <<EOF
+
+from:cworth
+from:cworth and not from:cworth
+foo
+EOF
+notmuch count --output=threads >EXPECTED
+notmuch count --output=threads from:cworth >>EXPECTED
+notmuch count --output=threads from:cworth and not from:cworth >>EXPECTED
+notmuch count --output=threads foo >>EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "batch message count with input file"
+cat >INPUT <<EOF
+from:cworth
+
+tag:inbox
+EOF
+notmuch count --input=INPUT --output=messages >OUTPUT
+notmuch count --output=messages from:cworth >EXPECTED
+notmuch count --output=messages >>EXPECTED
+notmuch count --output=messages tag:inbox >>EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
+
+
 test_done