[PATCH 3/4 v42] test: Add more helpers for emacs tests.

diff --git a/17/a02293a1ba8975f193fbf9bc9de6a1a2323860 b/17/a02293a1ba8975f193fbf9bc9de6a1a2323860
new file mode 100644 (file)
index 0000000..dcdab09
--- /dev/null
+++ b/17/a02293a1ba8975f193fbf9bc9de6a1a2323860
@@ -0,0 +1,105 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 84E9942119F\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:57 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id gkl1YG2Liw7P for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jan 2012 10:05:57 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 47195429E5B   for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:53 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so2883135wgb.2\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:52 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.181.12.106 with SMTP id ep10mr14308805wid.8.1327341951982;\r
+       Mon, 23 Jan 2012 10:05:51 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id t15sm14311494wiv.6.2012.01.23.10.05.50\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 23 Jan 2012 10:05:51 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id F07B8A0B03; Mon, 23 Jan 2012 18:05:48 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4 v42] test: Add more helpers for emacs tests.\r
+Date: Mon, 23 Jan 2012 18:05:46 +0000\r
+Message-Id: <1327341947-29206-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327341947-29206-1-git-send-email-dme@dme.org>\r
+References: <1326804748-8989-2-git-send-email-dme@dme.org>\r
+       <1327341947-29206-1-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlEKBTYkJkTHENL/mb1dcsxPPAlbI5QWZCh65bSCX6K514flh1mPHwnMidjhIt6hWd/wtgv\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 23 Jan 2012 18:05:57 -0000\r
+\r
+---\r
+\r
+Split out from the tests and re-factored.\r
+\r
+ test/test-lib.el |   22 ++++++++++++++++++++++\r
+ 1 files changed, 22 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 96752f0..c4a5db4 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -20,6 +20,8 @@\r
+ ;;\r
+ ;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+ \r
++(require 'cl) ;; This code is generally used uncompiled.\r
++\r
+ ;; `read-file-name' by default uses `completing-read' function to read\r
+ ;; user input.  It does not respect `standard-input' variable which we\r
+ ;; use in tests to provide user input.  So replace it with a plain\r
+@@ -92,3 +94,23 @@ nothing."\r
+                  result\r
+                (prin1-to-string result)))\r
+        (test-output))))\r
++\r
++(defun notmuch-test-report-unexpected (output expected)\r
++  "Report that the OUTPUT does not match the EXPECTED result."\r
++  (concat "Expect:\t" (prin1-to-string expected) "\n"\r
++        "Output:\t" (prin1-to-string output) "\n"))\r
++\r
++(defun notmuch-test-compare (output expected)\r
++  "Compare OUTPUT with EXPECTED. Report any discrepencies."\r
++  (if (equal output expected)\r
++      t\r
++    (cond\r
++     ((and (listp output)\r
++         (listp expected))\r
++      (apply #'concat (loop for o in output\r
++                          for e in expected\r
++                          if (not (equal o e))\r
++                          collect (notmuch-test-report-unexpected o e))))\r
++   \r
++     (t\r
++      (notmuch-test-report-unexpected output expected)))))\r
+-- \r
+1.7.8.3\r
+\r