9e/283adef6a29e185421610058a9e060db6798e0

   1 Return-Path: <dmitry.kurochkin@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 5EE2B429E45\r
   6         for <notmuch@notmuchmail.org>; Fri, 17 Feb 2012 06:52:26 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 1.061\r
  10 X-Spam-Level: *\r
  11 X-Spam-Status: No, score=1.061 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_BL_SPAMCOP_NET=1.246,\r
  14         RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_SORBS_WEB=0.614] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id oWJDFG1lVdbU for <notmuch@notmuchmail.org>;\r
  18         Fri, 17 Feb 2012 06:52:24 -0800 (PST)\r
  19 Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
  20  [74.125.83.53])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  22  3FDD6429E42    for <notmuch@notmuchmail.org>; Fri, 17 Feb 2012 06:52:24 -0800\r
  23  (PST)\r
  24 Received: by eeke51 with SMTP id e51so1866152eek.26\r
  25         for <notmuch@notmuchmail.org>; Fri, 17 Feb 2012 06:52:23 -0800 (PST)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  28         bh=LxQlRBDe/lO9TI1FmdmvnCqydzCuWjNqrSIjM6OCMZM=;\r
  29         b=rFv5cE7R7uOZTy9w7aaaXXCc76F8KUAvC1RtqeZSLrf1IkbM7chAOEK4tHWzJuVesY\r
  30         5RSE1sIq1pSiec1h+gVkQxmilEm1rmC0pPSwa4rluSiSbZmSkpZJfe5Xef+3ybV34foo\r
  31         onkY9OQVli/b5SILxD5VBWf+u9JoTYJTmiyw4=\r
  32 Received: by 10.213.105.140 with SMTP id t12mr1157134ebo.71.1329490343032;\r
  33         Fri, 17 Feb 2012 06:52:23 -0800 (PST)\r
  34 Received: from localhost ([83.149.45.5])\r
  35         by mx.google.com with ESMTPS id v51sm39300413eef.2.2012.02.17.06.51.21\r
  36         (version=TLSv1/SSLv3 cipher=OTHER);\r
  37         Fri, 17 Feb 2012 06:52:22 -0800 (PST)\r
  38 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v10 2/2] emacs: Tests for user-defined sections\r
  41 Date: Fri, 17 Feb 2012 18:48:08 +0400\r
  42 Message-Id: <1329490088-8323-3-git-send-email-dmitry.kurochkin@gmail.com>\r
  43 X-Mailer: git-send-email 1.7.9\r
  44 In-Reply-To: <1329490088-8323-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  45 References: <1310079227-19120-1-git-send-email-daniel.schoepe@googlemail.com>\r
  46         <1329490088-8323-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  47 Cc: Daniel Schoepe <daniel.schoepe@googlemail.com>\r
  48 X-BeenThere: notmuch@notmuchmail.org\r
  49 X-Mailman-Version: 2.1.13\r
  50 Precedence: list\r
  51 List-Id: "Use and development of the notmuch mail system."\r
  52         <notmuch.notmuchmail.org>\r
  53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  54         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  56 List-Post: <mailto:notmuch@notmuchmail.org>\r
  57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  59         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  60 X-List-Received-Date: Fri, 17 Feb 2012 14:52:26 -0000\r
  61 \r
  62 From: Daniel Schoepe <daniel.schoepe@googlemail.com>\r
  63 \r
  64 A new file was added for notmuch-hello tests.\r
  65 ---\r
  66  test/emacs-hello                                   |   47 ++++++++++++++++++++\r
  67  test/emacs.expected-output/notmuch-hello           |    3 +-\r
  68  .../notmuch-hello-new-section                      |    4 ++\r
  69  .../notmuch-hello-no-saved-searches                |    3 +-\r
  70  .../notmuch-hello-section-counts                   |    5 ++\r
  71  .../notmuch-hello-section-hidden-tag               |    4 ++\r
  72  .../notmuch-hello-section-with-empty               |    4 ++\r
  73  .../emacs.expected-output/notmuch-hello-with-empty |    3 +-\r
  74  test/notmuch-test                                  |    1 +\r
  75  9 files changed, 71 insertions(+), 3 deletions(-)\r
  76  create mode 100755 test/emacs-hello\r
  77  create mode 100644 test/emacs.expected-output/notmuch-hello-new-section\r
  78  create mode 100644 test/emacs.expected-output/notmuch-hello-section-counts\r
  79  create mode 100644 test/emacs.expected-output/notmuch-hello-section-hidden-tag\r
  80  create mode 100644 test/emacs.expected-output/notmuch-hello-section-with-empty\r
  81 \r
  82 diff --git a/test/emacs-hello b/test/emacs-hello\r
  83 new file mode 100755\r
  84 index 0000000..b235e3a\r
  85 --- /dev/null\r
  86 +++ b/test/emacs-hello\r
  87 @@ -0,0 +1,47 @@\r
  88 +#!/usr/bin/env bash\r
  89 +\r
  90 +test_description="Testing emacs notmuch-hello view"\r
  91 +. test-lib.sh\r
  92 +\r
  93 +EXPECTED=$TEST_DIRECTORY/emacs.expected-output\r
  94 +\r
  95 +add_email_corpus\r
  96 +\r
  97 +test_begin_subtest "User-defined section with inbox tag"\r
  98 +test_emacs "(let ((notmuch-hello-sections\r
  99 +                   (list (lambda () (notmuch-hello-insert-searches\r
 100 +                                     \"Test\" '((\"inbox\" . \"tag:inbox\")))))))\r
 101 +           (notmuch-hello)\r
 102 +           (test-output))"\r
 103 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section\r
 104 +\r
 105 +test_begin_subtest "User-defined section with empty, hidden entry"\r
 106 +test_emacs "(let ((notmuch-hello-sections\r
 107 +                   (list (lambda () (notmuch-hello-insert-searches\r
 108 +                                     \"Test-with-empty\"\r
 109 +                                     '((\"inbox\" . \"tag:inbox\")\r
 110 +                                       (\"doesnotexist\" . \"tag:doesnotexist\"))\r
 111 +                                     :hide-empty-searches t)))))\r
 112 +             (notmuch-hello)\r
 113 +             (test-output))"\r
 114 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty\r
 115 +\r
 116 +test_begin_subtest "User-defined section, unread tag filtered out"\r
 117 +test_emacs "(let ((notmuch-hello-sections\r
 118 +                   (list (lambda () (notmuch-hello-insert-tags-section\r
 119 +                                     \"Test-with-filtered\"\r
 120 +                                     :hide-tags '(\"unread\"))))))\r
 121 +             (notmuch-hello)\r
 122 +             (test-output))"\r
 123 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag\r
 124 +\r
 125 +test_begin_subtest "User-defined section, different query for counts"\r
 126 +test_emacs "(let ((notmuch-hello-sections\r
 127 +                   (list (lambda () (notmuch-hello-insert-tags-section\r
 128 +                                     \"Test-with-counts\"\r
 129 +                                     :filter-count \"tag:signed\")))))\r
 130 +             (notmuch-hello)\r
 131 +             (test-output))"\r
 132 +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts\r
 133 +\r
 134 +test_done\r
 135 diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello\r
 136 index 3e59595..1470790 100644\r
 137 --- a/test/emacs.expected-output/notmuch-hello\r
 138 +++ b/test/emacs.expected-output/notmuch-hello\r
 139 @@ -6,9 +6,10 @@ Saved searches: [edit]\r
 140  \r
 141  Search:                                                                     .\r
 142  \r
 143 -[Show all tags]\r
 144 +All tags: [show]\r
 145  \r
 146          Type a search query and hit RET to view matching threads.\r
 147                 Edit saved searches with the `edit' button.\r
 148    Hit RET or click on a saved search or tag name to view matching threads.\r
 149        `=' to refresh this screen. `s' to search messages. `q' to quit.\r
 150 +                           Customize this page.\r
 151 diff --git a/test/emacs.expected-output/notmuch-hello-new-section b/test/emacs.expected-output/notmuch-hello-new-section\r
 152 new file mode 100644\r
 153 index 0000000..c64d712\r
 154 --- /dev/null\r
 155 +++ b/test/emacs.expected-output/notmuch-hello-new-section\r
 156 @@ -0,0 +1,4 @@\r
 157 +Test: [hide]\r
 158 +\r
 159 +         52 inbox  \r
 160 +\r
 161 diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 162 index ef0e5d0..05475b1 100644\r
 163 --- a/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 164 +++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 165 @@ -2,9 +2,10 @@\r
 166  \r
 167  Search:                                                                     .\r
 168  \r
 169 -[Show all tags]\r
 170 +All tags: [show]\r
 171  \r
 172          Type a search query and hit RET to view matching threads.\r
 173                 Edit saved searches with the `edit' button.\r
 174    Hit RET or click on a saved search or tag name to view matching threads.\r
 175        `=' to refresh this screen. `s' to search messages. `q' to quit.\r
 176 +                           Customize this page.\r
 177 diff --git a/test/emacs.expected-output/notmuch-hello-section-counts b/test/emacs.expected-output/notmuch-hello-section-counts\r
 178 new file mode 100644\r
 179 index 0000000..9d79659\r
 180 --- /dev/null\r
 181 +++ b/test/emacs.expected-output/notmuch-hello-section-counts\r
 182 @@ -0,0 +1,5 @@\r
 183 +Test-with-counts: [hide]\r
 184 +\r
 185 +          2 attachment             7 signed          \r
 186 +          7 inbox                  7 unread          \r
 187 +\r
 188 diff --git a/test/emacs.expected-output/notmuch-hello-section-hidden-tag b/test/emacs.expected-output/notmuch-hello-section-hidden-tag\r
 189 new file mode 100644\r
 190 index 0000000..3688e7c\r
 191 --- /dev/null\r
 192 +++ b/test/emacs.expected-output/notmuch-hello-section-hidden-tag\r
 193 @@ -0,0 +1,4 @@\r
 194 +Test-with-filtered: [hide]\r
 195 +\r
 196 +          4 attachment            52 inbox                  7 signed \r
 197 +\r
 198 diff --git a/test/emacs.expected-output/notmuch-hello-section-with-empty b/test/emacs.expected-output/notmuch-hello-section-with-empty\r
 199 new file mode 100644\r
 200 index 0000000..8209fed\r
 201 --- /dev/null\r
 202 +++ b/test/emacs.expected-output/notmuch-hello-section-with-empty\r
 203 @@ -0,0 +1,4 @@\r
 204 +Test-with-empty: [hide]\r
 205 +\r
 206 +         52 inbox  \r
 207 +\r
 208 diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty\r
 209 index 71edba7..5e53222 100644\r
 210 --- a/test/emacs.expected-output/notmuch-hello-with-empty\r
 211 +++ b/test/emacs.expected-output/notmuch-hello-with-empty\r
 212 @@ -6,9 +6,10 @@ Saved searches: [edit]\r
 213  \r
 214  Search:                                                                     .\r
 215  \r
 216 -[Show all tags]\r
 217 +All tags: [show]\r
 218  \r
 219          Type a search query and hit RET to view matching threads.\r
 220                 Edit saved searches with the `edit' button.\r
 221    Hit RET or click on a saved search or tag name to view matching threads.\r
 222        `=' to refresh this screen. `s' to search messages. `q' to quit.\r
 223 +                           Customize this page.\r
 224 diff --git a/test/notmuch-test b/test/notmuch-test\r
 225 index e14d34e..f03b594 100755\r
 226 --- a/test/notmuch-test\r
 227 +++ b/test/notmuch-test\r
 228 @@ -54,6 +54,7 @@ TESTS="\r
 229    argument-parsing\r
 230    emacs-test-functions\r
 231    emacs-address-cleaning\r
 232 +  emacs-hello\r
 233    emacs-show\r
 234  "\r
 235  TESTS=${NOTMUCH_TESTS:=$TESTS}\r
 236 -- \r
 237 1.7.9\r
 238 \r