#80 move mail initial test

added initial move mail test.

src/tests/.gitignore

@@ -12,3 +12,5 @@ test_storage_mock_rbox
 /rmb_test
 /storage_mock_rbox_test
 /storage_rbox_test
+/it_test_copy_rbox
+/it_test_move_rbox

src/tests/Makefile.am

@@ -67,6 +67,11 @@ it_test_copy_rbox_SOURCES = storage-rbox/it_test_copy_rbox.cpp storage-rbox/Test
 it_test_copy_rbox_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDOVECOT_INCLUDE) 
 it_test_copy_rbox_LDADD = $(storage_shlibs) $(gtest_shlibs)
 
+TESTS += it_test_move_rbox
+it_test_move_rbox_SOURCES = storage-rbox/it_test_move_rbox.cpp storage-rbox/TestCase.cpp storage-rbox/TestCase.h
+it_test_move_rbox_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDOVECOT_INCLUDE) 
+it_test_move_rbox_LDADD = $(storage_shlibs) $(gtest_shlibs)
+
 TESTS += it_test_sync_rbox
 it_test_sync_rbox_SOURCES = sync-rbox/it_test_sync_rbox.cpp sync-rbox/TestCase.cpp sync-rbox/TestCase.h
 it_test_sync_rbox_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDOVECOT_INCLUDE) 

src/tests/storage-rbox/it_test_copy_rbox.cpp

@@ -176,15 +176,12 @@ TEST_F(StorageTest, mail_copy_mail_in_inbox) {
   mail_search_args_unref(&search_args);
 
   while (mailbox_search_next(search_ctx, &mail)) {
-    //  if (ctx->move)
-    //      ret2 = mailbox_move(&save_ctx, mail);
-    //    else
     save_ctx = mailbox_save_alloc(desttrans);  // src save context
     mailbox_save_copy_flags(save_ctx, mail);
 
     int ret2 = mailbox_copy(&save_ctx, mail);
     EXPECT_EQ(ret2, 0);
-    break;  // only copy one mail.
+    break;  // only move one mail.
   }
 
   if (mailbox_search_deinit(&search_ctx) < 0) {

src/tests/storage-rbox/it_test_move_rbox.cpp

@@ -0,0 +1,206 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Copyright (c) 2017 Tallence AG and the authors
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ */
+
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "TestCase.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"           // turn off warnings for Dovecot :-(
+#pragma GCC diagnostic ignored "-Wundef"            // turn off warnings for Dovecot :-(
+#pragma GCC diagnostic ignored "-Wredundant-decls"  // turn off warnings for Dovecot :-(
+#ifndef __cplusplus
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"  // turn off warnings for Dovecot :-(
+#endif
+
+extern "C" {
+#include "lib.h"
+#include "mail-user.h"
+#include "mail-storage.h"
+#include "mail-storage-service.h"
+#include "mail-namespace.h"
+#include "mailbox-list.h"
+#include "ioloop.h"
+#include "istream.h"
+#include "doveadm.h"
+#include "doveadm-util.h"
+#include "doveadm-cmd.h"
+#include "doveadm-mailbox-list-iter.h"
+#include "doveadm-mail-iter.h"
+#include "doveadm-mail.h"
+#include "mail-search-build.h"
+
+#include "libdict-rados-plugin.h"
+#include "mail-search-parser-private.h"
+#include "mail-search.h"
+}
+#include "rbox-storage.hpp"
+#include "../mocks/mock_test.h"
+#include "dovecot-ceph-plugin-config.h"
+
+using ::testing::AtLeast;
+using ::testing::Return;
+
+#pragma GCC diagnostic pop
+
+#if DOVECOT_PREREQ(2, 3)
+#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
+#else
+#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
+#endif
+
+#ifndef i_zero
+#define i_zero(p) memset(p, 0, sizeof(*(p)))
+#endif
+
+TEST_F(StorageTest, init) {}
+
+TEST_F(StorageTest, mailbox_open_inbox) {
+  struct mail_namespace *ns = mail_namespace_find_inbox(s_test_mail_user->namespaces);
+  struct mailbox *box = mailbox_alloc(ns->list, "INBOX", MAILBOX_FLAG_READONLY);
+  ASSERT_GE(mailbox_open(box), 0);
+  mailbox_free(&box);
+}
+
+static void add_mail(const char *message, const char *mailbox, struct mail_namespace *_ns) {
+  struct mail_namespace *ns = mail_namespace_find_inbox(_ns);
+  ASSERT_NE(ns, nullptr);
+  struct mailbox *box = mailbox_alloc(ns->list, mailbox, (mailbox_flags)0);
+  ASSERT_NE(box, nullptr);
+  ASSERT_GE(mailbox_open(box), 0);
+
+  struct istream *input = i_stream_create_from_data(message, strlen(message));
+
+#ifdef DOVECOT_CEPH_PLUGIN_HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE
+  struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+#else
+  char reason[256];
+  struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL, reason);
+#endif
+  struct mail_save_context *save_ctx = mailbox_save_alloc(trans);
+  ssize_t ret;
+  bool save_failed = FALSE;
+
+  if (mailbox_save_begin(&save_ctx, input) < 0) {
+    i_error("Saving failed: %s", mailbox_get_last_internal_error(box, NULL));
+    mailbox_transaction_rollback(&trans);
+    FAIL() << "saving failed: " << mailbox_get_last_internal_error(box, NULL);
+  } else {
+    do {
+      if (mailbox_save_continue(save_ctx) < 0) {
+        save_failed = TRUE;
+        ret = -1;
+        FAIL() << "mailbox_save_continue() failed";
+        break;
+      }
+    } while ((ret = i_stream_read(input)) > 0);
+    EXPECT_EQ(ret, -1);
+
+    if (input->stream_errno != 0) {
+      FAIL() << "read(msg input) failed: " << i_stream_get_error(input);
+    } else if (save_failed) {
+      FAIL() << "Saving failed: " << mailbox_get_last_internal_error(box, NULL);
+    } else if (mailbox_save_finish(&save_ctx) < 0) {
+      FAIL() << "Saving failed: " << mailbox_get_last_internal_error(box, NULL);
+    } else if (mailbox_transaction_commit(&trans) < 0) {
+      FAIL() << "Save transaction commit failed: " << mailbox_get_last_internal_error(box, NULL);
+    } else {
+      ret = 0;
+    }
+
+    EXPECT_EQ(save_ctx, nullptr);
+    if (save_ctx != nullptr)
+      mailbox_save_cancel(&save_ctx);
+
+    EXPECT_EQ(trans, nullptr);
+    if (trans != nullptr)
+      mailbox_transaction_rollback(&trans);
+
+    EXPECT_TRUE(input->eof);
+    EXPECT_GE(ret, 0);
+  }
+  i_stream_unref(&input);
+  mailbox_free(&box);
+}
+
+TEST_F(StorageTest, mail_copy_mail_in_inbox) {
+  struct mailbox_transaction_context *desttrans;
+  struct mail_save_context *save_ctx;
+  struct mail *mail;
+  struct mail_search_context *search_ctx;
+  struct mail_search_args *search_args;
+  struct mail_search_arg *sarg;
+
+  const char *message =
+      "From: user@domain.org\n"
+      "Date: Sat, 24 Mar 2017 23:00:00 +0200\n"
+      "Mime-Version: 1.0\n"
+      "Content-Type: text/plain; charset=us-ascii\n"
+      "\n"
+      "body\n";
+
+  const char *mailbox = "INBOX";
+
+  // testdata
+  add_mail(message, mailbox, StorageTest::s_test_mail_user->namespaces);
+
+  search_args = mail_search_build_init();
+  sarg = mail_search_build_add(search_args, SEARCH_ALL);
+  ASSERT_NE(sarg, nullptr);
+
+  struct mail_namespace *ns = mail_namespace_find_inbox(s_test_mail_user->namespaces);
+  ASSERT_NE(ns, nullptr);
+
+  struct mailbox *box = mailbox_alloc(ns->list, mailbox, MAILBOX_FLAG_SAVEONLY);
+
+  if (mailbox_open(box) < 0) {
+    i_error("Opening mailbox %s failed: %s", mailbox, mailbox_get_last_internal_error(box, NULL));
+    FAIL() << " Forcing a resync on mailbox INBOX Failed";
+  }
+#ifdef DOVECOT_CEPH_PLUGIN_HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE
+  desttrans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+#else
+  char reason[256];
+  desttrans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL, reason);
+#endif
+
+  search_ctx = mailbox_search_init(desttrans, search_args, NULL, 0, NULL);
+  mail_search_args_unref(&search_args);
+
+  while (mailbox_search_next(search_ctx, &mail)) {
+    save_ctx = mailbox_save_alloc(desttrans);  // src save context
+    mailbox_save_copy_flags(save_ctx, mail);
+
+    int ret2 = mailbox_move(&save_ctx, mail);
+    EXPECT_EQ(ret2, 0);
+    break;  // only copy one mail.
+  }
+
+  if (mailbox_search_deinit(&search_ctx) < 0) {
+    FAIL() << "search deinit failed";
+  }
+
+  if (mailbox_transaction_commit(&desttrans) < 0) {
+    FAIL() << "tnx commit failed";
+  }
+  if (mailbox_sync(box, 0) < 0) {
+    FAIL() << "sync failed";
+  }
+
+  mailbox_free(&box);
+}
+
+TEST_F(StorageTest, deinit) {}
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}