[geary/wip/email-flag-refinement: 2/6] Add some unit tests for setting email flags
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/email-flag-refinement: 2/6] Add some unit tests for setting email flags
- Date: Wed, 13 Feb 2019 08:30:42 +0000 (UTC)
commit 539893fb72148fa43e75f8d52691598109ddb88f
Author: Michael Gratton <mike vee net>
Date: Wed Feb 13 18:41:49 2019 +1100
Add some unit tests for setting email flags
test/engine/imap-db/imap-db-folder-test.vala | 321 +++++++++++++++++++++++++++
test/meson.build | 1 +
test/test-engine.vala | 1 +
3 files changed, 323 insertions(+)
---
diff --git a/test/engine/imap-db/imap-db-folder-test.vala b/test/engine/imap-db/imap-db-folder-test.vala
new file mode 100644
index 00000000..abb3fefd
--- /dev/null
+++ b/test/engine/imap-db/imap-db-folder-test.vala
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2019 Michael Gratton <mike vee net>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later). See the COPYING file in this distribution.
+ */
+
+
+class Geary.ImapDB.FolderTest : TestCase {
+
+
+ private GLib.File? tmp_dir = null;
+ private Geary.AccountInformation? config = null;
+ private Account? account = null;
+ private Folder? folder = null;
+
+
+ public FolderTest() {
+ base("Geary.ImapDB.FolderTest");
+ add_test("create_email", create_email);
+ add_test("merge_email", merge_email);
+ add_test("merge_add_flags", merge_add_flags);
+ add_test("merge_remove_flags", merge_remove_flags);
+ //add_test("merge_existing_preview", merge_existing_preview);
+ add_test("set_flags", set_flags);
+ add_test("set_flags_on_deleted", set_flags_on_deleted);
+ }
+
+ public override void set_up() throws GLib.Error {
+ this.tmp_dir = GLib.File.new_for_path(
+ GLib.DirUtils.make_tmp("geary-imap-db-account-test-XXXXXX")
+ );
+
+ this.config = new Geary.AccountInformation(
+ "test",
+ ServiceProvider.OTHER,
+ new MockCredentialsMediator(),
+ new Geary.RFC822.MailboxAddress(null, "test example com")
+ );
+
+ this.account = new Account(config);
+ this.account.open_async.begin(
+ this.tmp_dir,
+ GLib.File.new_for_path(_SOURCE_ROOT_DIR).get_child("sql"),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ this.account.open_async.end(async_result());
+
+ this.account.db.exec(
+ "INSERT INTO FolderTable (id, name) VALUES (1, 'test');"
+ );
+
+ this.account.list_folders_async.begin(
+ this.account.imap_folder_root,
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ this.folder = traverse(
+ this.account.list_folders_async.end(async_result())
+ ).first();
+ }
+
+ public override void tear_down() throws GLib.Error {
+ this.folder = null;
+ this.account.close_async.begin(
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ this.account.close_async.end(async_result());
+ this.account = null;
+ this.config = null;
+
+ delete_file(this.tmp_dir);
+ this.tmp_dir = null;
+ }
+
+ public void create_email() throws GLib.Error {
+ Email mock = new_mock_remote_email(1, "test");
+
+ this.folder.create_or_merge_email_async.begin(
+ Collection.single(mock),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Gee.Map<Email,bool> results =
+ this.folder.create_or_merge_email_async.end(async_result());
+
+ assert_int(1, results.size);
+ assert(results.get(mock));
+ }
+
+ public void merge_email() throws GLib.Error {
+ Email.Field fixture_fields = Email.Field.RECEIVERS;
+ string fixture_to = "test example com";
+ this.account.db.exec(
+ "INSERT INTO MessageTable (id, fields, to_field) " +
+ "VALUES (1, %d, '%s');".printf(fixture_fields, fixture_to)
+ );
+ this.account.db.exec("""
+ INSERT INTO MessageLocationTable (id, message_id, folder_id, ordering)
+ VALUES (1, 1, 1, 1);
+ """);
+
+ string mock_subject = "test subject";
+ Email mock = new_mock_remote_email(1, mock_subject);
+
+ this.folder.create_or_merge_email_async.begin(
+ Collection.single(mock),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Gee.Map<Email,bool> results =
+ this.folder.create_or_merge_email_async.end(async_result());
+
+ assert_int(1, results.size);
+ assert(!results.get(mock));
+
+ // Fetch it again to make sure it's been merged using required
+ // fields to check
+ this.folder.fetch_email_async.begin(
+ (EmailIdentifier) mock.id,
+ fixture_fields | mock.fields,
+ Folder.ListFlags.NONE,
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Email? merged = null;
+ try {
+ merged = this.folder.fetch_email_async.end(async_result());
+ } catch (EngineError.INCOMPLETE_MESSAGE err) {
+ assert_no_error(err);
+ }
+
+ assert_string(fixture_to, merged.to.to_string());
+ assert_string(mock_subject, merged.subject.to_string());
+ }
+
+ public void merge_add_flags() throws GLib.Error {
+ // Note: Flags in the DB are expected to be Imap.MessageFlags,
+ // and flags passed in to ImapDB.Folder are expected to be
+ // Imap.EmailFlags
+
+ Email.Field fixture_fields = Email.Field.FLAGS;
+ Imap.MessageFlags fixture_flags =
+ new Imap.MessageFlags(Collection.single(Imap.MessageFlag.SEEN));
+ this.account.db.exec(
+ "INSERT INTO MessageTable (id, fields, flags) " +
+ "VALUES (1, %d, '%s');".printf(
+ fixture_fields, fixture_flags.serialize()
+ )
+ );
+ this.account.db.exec("""
+ INSERT INTO MessageLocationTable (id, message_id, folder_id, ordering)
+ VALUES (1, 1, 1, 1);
+ """);
+
+ Imap.EmailFlags test_flags = Imap.EmailFlags.from_api_email_flags(
+ new EmailFlags.with(EmailFlags.UNREAD)
+ ) ;
+ Email test = new_mock_remote_email(1, null, test_flags);
+
+ this.folder.create_or_merge_email_async.begin(
+ Collection.single(test),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Gee.Map<Email,bool> results =
+ this.folder.create_or_merge_email_async.end(async_result());
+
+ assert_int(1, results.size);
+ assert(!results.get(test));
+
+ assert_flags((EmailIdentifier) test.id, test_flags);
+ }
+
+ public void merge_remove_flags() throws GLib.Error {
+ // Note: Flags in the DB are expected to be Imap.MessageFlags,
+ // and flags passed in to ImapDB.Folder are expected to be
+ // Imap.EmailFlags
+
+ Email.Field fixture_fields = Email.Field.FLAGS;
+ Imap.MessageFlags fixture_flags =
+ new Imap.MessageFlags(Gee.Collection.empty<Geary.Imap.MessageFlag>());
+ this.account.db.exec(
+ "INSERT INTO MessageTable (id, fields, flags) " +
+ "VALUES (1, %d, '%s');".printf(
+ fixture_fields, fixture_flags.serialize()
+ )
+ );
+ this.account.db.exec("""
+ INSERT INTO MessageLocationTable (id, message_id, folder_id, ordering)
+ VALUES (1, 1, 1, 1);
+ """);
+
+ Imap.EmailFlags test_flags = Imap.EmailFlags.from_api_email_flags(
+ new EmailFlags()
+ ) ;
+ Email test = new_mock_remote_email(1, null, test_flags);
+ this.folder.create_or_merge_email_async.begin(
+ Collection.single(test),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Gee.Map<Email,bool> results =
+ this.folder.create_or_merge_email_async.end(async_result());
+
+ assert_int(1, results.size);
+ assert(!results.get(test));
+
+ assert_flags((EmailIdentifier) test.id, test_flags);
+ }
+
+ public void set_flags() throws GLib.Error {
+ // Note: Flags in the DB are expected to be Imap.MessageFlags,
+ // and flags passed in to ImapDB.Folder are expected to be
+ // Imap.EmailFlags
+
+ Email.Field fixture_fields = Email.Field.FLAGS;
+ Imap.MessageFlags fixture_flags =
+ new Imap.MessageFlags(Collection.single(Imap.MessageFlag.SEEN));
+ this.account.db.exec(
+ "INSERT INTO MessageTable (id, fields, flags) " +
+ "VALUES (1, %d, '%s');".printf(
+ fixture_fields, fixture_flags.serialize()
+ )
+ );
+ this.account.db.exec("""
+ INSERT INTO MessageLocationTable (id, message_id, folder_id, ordering)
+ VALUES (1, 1, 1, 1);
+ """);
+
+ Imap.EmailFlags test_flags = Imap.EmailFlags.from_api_email_flags(
+ new EmailFlags.with(EmailFlags.UNREAD)
+ );
+ EmailIdentifier test = new EmailIdentifier(1, new Imap.UID(1));
+
+ this.folder.set_email_flags_async.begin(
+ Collection.single_map(test, test_flags),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ this.folder.set_email_flags_async.end(async_result());
+
+ assert_flags(test, test_flags);
+ }
+
+ public void set_flags_on_deleted() throws GLib.Error {
+ // Note: Flags in the DB are expected to be Imap.MessageFlags,
+ // and flags passed in to ImapDB.Folder are expected to be
+ // Imap.EmailFlags
+
+ Email.Field fixture_fields = Email.Field.FLAGS;
+ Imap.MessageFlags fixture_flags =
+ new Imap.MessageFlags(Collection.single(Imap.MessageFlag.SEEN));
+ this.account.db.exec(
+ "INSERT INTO MessageTable (id, fields, flags) " +
+ "VALUES (1, %d, '%s');".printf(
+ fixture_fields, fixture_flags.serialize()
+ )
+ );
+ this.account.db.exec("""
+ INSERT INTO MessageLocationTable
+ (id, message_id, folder_id, ordering, remove_marker)
+ VALUES
+ (1, 1, 1, 1, 1);
+ """);
+
+ Imap.EmailFlags test_flags = Imap.EmailFlags.from_api_email_flags(
+ new EmailFlags.with(EmailFlags.UNREAD)
+ );
+ EmailIdentifier test = new EmailIdentifier(1, new Imap.UID(1));
+
+ this.folder.set_email_flags_async.begin(
+ Collection.single_map(test, test_flags),
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ this.folder.set_email_flags_async.end(async_result());
+
+ assert_flags(test, test_flags);
+ }
+
+ private Email new_mock_remote_email(int64 uid,
+ string? subject = null,
+ EmailFlags? flags = null) {
+ Email mock = new Email(
+ new EmailIdentifier.no_message_id(new Imap.UID(uid))
+ );
+ if (subject != null) {
+ mock.set_message_subject(new RFC822.Subject(subject));
+ }
+ if (flags != null) {
+ mock.set_flags(flags);
+ }
+ return mock;
+ }
+
+ private void assert_flags(EmailIdentifier id, EmailFlags expected)
+ throws GLib.Error {
+ this.folder.fetch_email_async.begin(
+ id,
+ Email.Field.FLAGS,
+ Folder.ListFlags.INCLUDE_MARKED_FOR_REMOVE,
+ null,
+ (obj, ret) => { async_complete(ret); }
+ );
+ Email? merged = null;
+ try {
+ merged = this.folder.fetch_email_async.end(async_result());
+ } catch (EngineError.INCOMPLETE_MESSAGE err) {
+ assert_no_error(err);
+ }
+
+ assert_true(
+ expected.equal_to(merged.email_flags),
+ "Unexpected merged flags: %s".printf(merged.to_string())
+ );
+ }
+
+}
diff --git a/test/meson.build b/test/meson.build
index 26eed436..8061c9cc 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -39,6 +39,7 @@ geary_test_engine_sources = [
'engine/imap-db/imap-db-account-test.vala',
'engine/imap-db/imap-db-attachment-test.vala',
'engine/imap-db/imap-db-database-test.vala',
+ 'engine/imap-db/imap-db-folder-test.vala',
'engine/imap-engine/account-processor-test.vala',
'engine/mime-content-type-test.vala',
'engine/rfc822-mailbox-address-test.vala',
diff --git a/test/test-engine.vala b/test/test-engine.vala
index a520c379..6a9a17a2 100644
--- a/test/test-engine.vala
+++ b/test/test-engine.vala
@@ -50,6 +50,7 @@ int main(string[] args) {
engine.add_suite(new Geary.ImapDB.AttachmentTest().get_suite());
engine.add_suite(new Geary.ImapDB.AttachmentIoTest().get_suite());
engine.add_suite(new Geary.ImapDB.DatabaseTest().get_suite());
+ engine.add_suite(new Geary.ImapDB.FolderTest().get_suite());
engine.add_suite(new Geary.ImapEngine.AccountProcessorTest().get_suite());
engine.add_suite(new Geary.Inet.Test().get_suite());
engine.add_suite(new Geary.JS.Test().get_suite());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]