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