From 65b87132b3fbae259e6c336b40167ca8fd8c669f Mon Sep 17 00:00:00 2001 From: david Date: Sun, 25 Nov 2012 17:20:04 +2000 Subject: [PATCH] [Patch v2 04/17] test: add database routines for testing --- c2/e92a806609bcaa0aef1e1c28dff0caa2728c54 | 187 ++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 c2/e92a806609bcaa0aef1e1c28dff0caa2728c54 diff --git a/c2/e92a806609bcaa0aef1e1c28dff0caa2728c54 b/c2/e92a806609bcaa0aef1e1c28dff0caa2728c54 new file mode 100644 index 000000000..d85dc22bf --- /dev/null +++ b/c2/e92a806609bcaa0aef1e1c28dff0caa2728c54 @@ -0,0 +1,187 @@ +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 35EF3431FC7 + for ; Sat, 24 Nov 2012 13:20:40 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 orfxzOxrsRwi for ; + Sat, 24 Nov 2012 13:20:37 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 43135431FCB + for ; Sat, 24 Nov 2012 13:20:33 -0800 (PST) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1TcN9L-0006SK-Ih; Sat, 24 Nov 2012 17:20:32 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TcN9G-0008Cd-3a; Sat, 24 Nov 2012 17:20:26 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 04/17] test: add database routines for testing +Date: Sat, 24 Nov 2012 17:20:04 -0400 +Message-Id: <1353792017-31459-5-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net> +References: <1353792017-31459-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Sat, 24 Nov 2012 21:20:40 -0000 + +From: David Bremner + +Initially, provide a way to create "stub" messages in the notmuch +database without corresponding files. This is essentially cut and +paste from lib/database.cc. This is a seperate file since we don't +want to export these symbols from libnotmuch or bloat the library with +non-exported code. +--- + test/Makefile.local | 1 + + test/database-test.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ + test/database-test.h | 21 +++++++++++++++ + 3 files changed, 93 insertions(+) + create mode 100644 test/database-test.c + create mode 100644 test/database-test.h + +diff --git a/test/Makefile.local b/test/Makefile.local +index 8da4c56..8479f91 100644 +--- a/test/Makefile.local ++++ b/test/Makefile.local +@@ -45,5 +45,6 @@ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \ + $(dir)/symbol-test $(dir)/symbol-test.o \ + $(dir)/arg-test $(dir)/arg-test.o \ + $(dir)/hex-xcode $(dir)/hex-xcode.o \ ++ $(dir)/database-test.o \ + $(dir)/parse-time $(dir)/parse-time.o \ + $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* +diff --git a/test/database-test.c b/test/database-test.c +new file mode 100644 +index 0000000..739e03b +--- /dev/null ++++ b/test/database-test.c +@@ -0,0 +1,71 @@ ++/* ++ * Database routines intended only for testing, not exported from ++ * library. ++ * ++ * Copyright (c) 2012 David Bremner ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see http://www.gnu.org/licenses/ . ++ * ++ * Author: David Bremner ++ */ ++ ++#include "notmuch-private.h" ++#include "database-test.h" ++ ++notmuch_status_t ++notmuch_database_add_stub_message (notmuch_database_t *notmuch, ++ const char *message_id, ++ const char **tags) ++{ ++ const char **tag; ++ notmuch_status_t ret; ++ notmuch_private_status_t private_status; ++ notmuch_message_t *message; ++ ++ ret = _notmuch_database_ensure_writable (notmuch); ++ if (ret) ++ return ret; ++ ++ message = _notmuch_message_create_for_message_id (notmuch, ++ message_id, ++ &private_status); ++ if (message == NULL) { ++ return COERCE_STATUS (private_status, ++ "Unexpected status value from _notmuch_message_create_for_message_id"); ++ ++ } ++ ++ if (private_status != NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) ++ return NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; ++ ++ _notmuch_message_add_term (message, "type", "mail"); ++ ++ if (tags) { ++ ret = notmuch_message_freeze (message); ++ if (ret) ++ return ret; ++ ++ for (tag = tags; *tag; tag++) { ++ ret = notmuch_message_add_tag (message, *tag); ++ if (ret) ++ return ret; ++ } ++ } ++ ++ ret = notmuch_message_thaw (message); ++ if (ret) ++ return ret; ++ ++ return NOTMUCH_STATUS_SUCCESS; ++} +diff --git a/test/database-test.h b/test/database-test.h +new file mode 100644 +index 0000000..84f7988 +--- /dev/null ++++ b/test/database-test.h +@@ -0,0 +1,21 @@ ++#ifndef _DATABASE_TEST_H ++#define _DATABASE_TEST_H ++/* Add a new stub message to the given notmuch database. ++ * ++ * At least the following return values are possible: ++ * ++ * NOTMUCH_STATUS_SUCCESS: Message successfully added to database. ++ * ++ * NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: Message has the same message ++ * ID as another message already in the database. ++ * ++ * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only ++ * mode so no message can be added. ++ */ ++ ++notmuch_status_t ++notmuch_database_add_stub_message (notmuch_database_t *database, ++ const char *message_id, ++ const char **tag_list); ++ ++#endif +-- +1.7.10.4 + -- 2.26.2