test: Add file-operations-move test

This patch includes the addition of the sync alternative to the
file-operations-move function and a test for it.

3 files changed, 755 insertions, 1 deletions

diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
index 08b06de10..b05b591b1 100644
--- a/test/automated/displayless/meson.build
+++ b/test/automated/displayless/meson.build
@@ -10,6 +10,9 @@ tests = [
   ]],
   ['test-file-operations-dir-has-files', [
     'test-file-operations-dir-has-files.c'
+  ]],
+  ['test-file-operations-move-files', [
+    'test-file-operations-move-files.c'
   ]]
 ]
 
diff --git a/test/automated/displayless/test-file-operations-move-files.c b/test/automated/displayless/test-file-operations-move-files.c
new file mode 100644
index 000000000..1b2e678aa
--- /dev/null
+++ b/test/automated/displayless/test-file-operations-move-files.c
@@ -0,0 +1,750 @@
+#include <glib.h>
+#include <glib/gprintf.h>
+#include "src/nautilus-directory.h"
+#include "src/nautilus-file-utilities.h"
+#include "src/nautilus-search-directory.h"
+#include "src/nautilus-directory.h"
+#include "src/nautilus-file-operations.c"
+#include "src/nautilus-file-undo-manager.h"
+#include <unistd.h>
+#include "eel/eel-string.h"
+
+static void
+test_move_one_file (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+    GFileOutputStream *out = NULL;
+    g_autoptr (GError) error = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_true (file != NULL);
+    out = g_file_create (file, G_FILE_CREATE_NONE, NULL, &error);
+    if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+    {
+        g_object_unref (out);
+    }
+    files = g_list_prepend (files, g_object_ref (file));
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir_child");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    g_assert_false (g_file_query_exists (file, NULL));
+
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+    g_assert_true (g_file_delete (first_dir, NULL, NULL));
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+}
+
+static void
+test_move_one_empty_directory (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+    files = g_list_prepend (files, g_object_ref (file));
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir_child");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    g_assert_false (g_file_query_exists (file, NULL));
+
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+    g_assert_true (g_file_delete (first_dir, NULL, NULL));
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+}
+
+static void
+test_move_directories_small (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 10; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        g_file_make_directory (file, NULL, NULL);
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 10; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}
+
+static void
+test_move_directories_medium (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 1000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        g_file_make_directory (file, NULL, NULL);
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 1000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}
+
+/* Test not included as it would timeout on the CI. */
+
+/*static void
+test_move_directories_large (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 10000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        g_file_make_directory (file, NULL, NULL);
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 10000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}*/
+
+
+static void
+test_move_files_small (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+    GFileOutputStream *out = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 10; i++)
+    {
+        g_autoptr (GError) error = NULL;
+
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        out = g_file_create (file, G_FILE_CREATE_NONE, NULL, &error);
+        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        {
+            g_object_unref (out);
+        }
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 10; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}
+
+static void
+test_move_files_medium (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+    GFileOutputStream *out = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 1000; i++)
+    {
+        g_autoptr (GError) error = NULL;
+
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        out = g_file_create (file, G_FILE_CREATE_NONE, NULL, &error);
+        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        {
+            g_object_unref (out);
+        }
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 1000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}
+
+
+/* Test not included as it would timeout on the CI. */
+
+/*static void
+test_move_files_large (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) dir = NULL;
+    g_autolist (GFile) files = NULL;
+    g_autofree gchar *file_name = NULL;
+    GFileOutputStream *out = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+
+    for (int i = 0; i < 10000; i++)
+    {
+        g_autoptr (GError) error = NULL;
+
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (root, file_name);
+        g_assert_true (file != NULL);
+        out = g_file_create (file, G_FILE_CREATE_NONE, NULL, &error);
+        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        {
+            g_object_unref (out);
+        }
+        files = g_list_prepend (files, g_object_ref (file));
+    }
+
+    dir = g_file_get_child (root, "dir");
+    g_assert_true (dir != NULL);
+    g_file_make_directory (dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    for (int i = 0; i < 10000; i++)
+    {
+        file_name = g_strdup_printf ("file_%i", i);
+        file = g_file_get_child (dir, file_name);
+        g_assert_true (g_file_query_exists (file, NULL));
+        g_assert_true (g_file_delete (file, NULL, NULL));
+    }
+
+    g_assert_true (g_file_query_exists (dir, NULL));
+    g_assert_true (g_file_delete (dir, NULL, NULL));
+}*/
+
+/* The hierarchy looks like this:
+ * /tmp/first_dir/first_dir_child
+ * /tmp/second_dir
+ * We're moving first_dir to second_dir.
+ */
+static void
+test_move_first_hierarchy (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    files = g_list_prepend (files, g_object_ref (first_dir));
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "first_dir_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+
+    g_assert_true (g_file_delete (file, NULL, NULL));
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    g_assert_false (g_file_query_exists (first_dir, NULL));
+}
+
+/* The hierarchy looks like this:
+ * /tmp/first_dir/first_child
+ * /tmp/first_dir/second_child
+ * /tmp/second_dir
+ * We're moving first_dir to second_dir.
+ */
+static void
+test_move_second_hierarchy (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    files = g_list_prepend (files, g_object_ref (first_dir));
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+    file = g_file_get_child (first_dir, "second_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "first_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    file = g_file_get_child (result_file, "second_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+
+    file = g_file_get_child (first_dir, "second_child");
+    g_assert_false (g_file_query_exists (file, NULL));    
+
+    g_assert_false (g_file_query_exists (first_dir, NULL));
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+}
+
+/* The hierarchy looks like this:
+ * /tmp/first_dir/first_child/second_child
+ * /tmp/second_dir
+ * We're moving first_dir to second_dir.
+ */
+static void
+test_move_third_hierarchy (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    files = g_list_prepend (files, g_object_ref (first_dir));
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+    file = g_file_get_child (file, "second_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "first_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+
+    file = g_file_get_child (file, "second_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    file = g_file_get_child (result_file, "first_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    file = g_file_get_child (file, "second_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+
+    g_assert_false (g_file_query_exists (first_dir, NULL));
+
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+}
+
+/* The hierarchy looks like this:
+ * /tmp/first_dir/first_dir_dir1/dir1_child
+ * /tmp/first_dir/first_dir_dir2/dir2_child
+ * /tmp/second_dir
+ * We're moving first_dir to second_dir.
+ */
+static void
+test_move_fourth_hierarchy (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    files = g_list_prepend (files, g_object_ref (first_dir));
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_dir1");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    file = g_file_get_child (file, "dir1_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_dir2");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    file = g_file_get_child (file, "dir2_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    second_dir = g_file_get_child (root, "second_dir");
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        second_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (second_dir, "first_dir");
+
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "first_dir_dir1");
+    g_assert_true (g_file_query_exists (file, NULL));
+    file = g_file_get_child (file, "dir1_child");
+    g_assert_true (g_file_delete (file, NULL, NULL));
+    file = g_file_get_child (result_file, "first_dir_dir1");
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    file = g_file_get_child (result_file, "first_dir_dir2");
+    g_assert_true (g_file_query_exists (file, NULL));
+    file = g_file_get_child (file, "dir2_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+    file = g_file_get_child (result_file, "first_dir_dir2");
+    g_assert_true (g_file_delete (file, NULL, NULL));
+
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_dir_dir1");
+    g_assert_false (g_file_query_exists (file, NULL));
+    file = g_file_get_child (file, "dir1_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    file = g_file_get_child (first_dir, "first_dir_dir1");
+    g_assert_false (g_file_delete (file, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_dir_dir2");
+    g_assert_false (g_file_query_exists (file, NULL));
+    file = g_file_get_child (file, "dir2_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    file = g_file_get_child (first_dir, "first_dir_dir2");
+    g_assert_false (g_file_query_exists (file, NULL));
+
+    g_assert_false (g_file_query_exists (first_dir, NULL));
+
+    g_assert_true (g_file_delete (second_dir, NULL, NULL));
+}
+
+/* The hierarchy looks like this:
+ * /tmp/first_dir/first_dir_child
+ * /tmp/second_dir/second_dir_child
+ * /tmp/third_dir
+ * We're moving first_dir and second_dir to third_dir.
+ */
+static void
+test_move_fifth_hierarchy (void)
+{
+    g_autoptr (GFile) root = NULL;
+    g_autoptr (GFile) first_dir = NULL;
+    g_autoptr (GFile) second_dir = NULL;
+    g_autoptr (GFile) third_dir = NULL;
+    g_autoptr (GFile) file = NULL;
+    g_autoptr (GFile) result_file = NULL;
+    g_autolist (GFile) files = NULL;
+
+    root = g_file_new_for_path (g_get_tmp_dir ());
+    first_dir = g_file_get_child (root, "first_dir");
+    files = g_list_prepend (files, g_object_ref (first_dir));
+    g_assert_true (first_dir != NULL);
+    g_file_make_directory (first_dir, NULL, NULL);
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    second_dir = g_file_get_child (root, "second_dir");
+    files = g_list_prepend (files, g_object_ref (second_dir));
+    g_assert_true (second_dir != NULL);
+    g_file_make_directory (second_dir, NULL, NULL);
+
+    file = g_file_get_child (second_dir, "second_dir_child");
+    g_assert_true (file != NULL);
+    g_file_make_directory (file, NULL, NULL);
+
+    third_dir = g_file_get_child (root, "third_dir");
+    g_assert_true (third_dir != NULL);
+    g_file_make_directory (third_dir, NULL, NULL);
+
+    nautilus_file_operations_move_sync (files,
+                                        third_dir,
+                                        NULL,
+                                        NULL,
+                                        NULL);
+
+    result_file = g_file_get_child (third_dir, "first_dir");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "first_dir_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+
+    result_file = g_file_get_child (third_dir, "second_dir");
+    g_assert_true (g_file_query_exists (result_file, NULL));
+    file = g_file_get_child (result_file, "second_dir_child");
+    g_assert_true (g_file_query_exists (file, NULL));
+    g_assert_true (g_file_delete (file, NULL, NULL));
+    g_assert_true (g_file_delete (result_file, NULL, NULL));
+
+    file = g_file_get_child (first_dir, "first_dir_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    g_assert_false (g_file_query_exists (first_dir, NULL));
+
+    file = g_file_get_child (second_dir, "second_dir_child");
+    g_assert_false (g_file_query_exists (file, NULL));
+    g_assert_false (g_file_query_exists (second_dir, NULL));
+
+    g_assert_true (g_file_delete (third_dir, NULL, NULL));
+}
+
+static void
+setup_test_suite (void)
+{
+    g_test_add_func ("/test-move-one-file/1.0",
+                     test_move_one_file);
+    g_test_add_func ("/test-move-one-empty-directory/1.0",
+                     test_move_one_empty_directory);
+    g_test_add_func ("/test-move-files/1.0",
+                     test_move_files_small);
+    g_test_add_func ("/test-move-files/1.1",
+                     test_move_files_medium);
+    // g_test_add_func ("/test-move-files/1.2",
+    //                  test_move_files_large);
+    g_test_add_func ("/test-move-directories/1.0",
+                     test_move_directories_small);
+    g_test_add_func ("/test-move-directories/1.1",
+                     test_move_directories_medium);
+    // g_test_add_func ("/test-move-directories/1.2",
+    //                  test_move_directories_large);
+    g_test_add_func ("/test-move-hierarchy/1.0",
+                     test_move_first_hierarchy);
+    g_test_add_func ("/test-move-hierarchy/1.1",
+                     test_move_second_hierarchy);
+    g_test_add_func ("/test-move-hierarchy/1.2",
+                     test_move_third_hierarchy);
+    g_test_add_func ("/test-move-hierarchy/1.3",
+                     test_move_fourth_hierarchy);
+    g_test_add_func ("/test-move-hierarchy/1.4",
+                     test_move_fifth_hierarchy);
+}
+
+int
+main (int argc, char *argv[])
+{
+    g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
+
+    g_test_init (&argc, &argv, NULL);
+    g_test_set_nonfatal_assertions ();
+    nautilus_ensure_extension_points();
+    undo_manager = nautilus_file_undo_manager_new ();
+
+    setup_test_suite ();
+
+    return g_test_run ();
+}
\ No newline at end of file
diff --git a/test/meson.build b/test/meson.build
index 815705509..ab588efd3 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -14,7 +14,8 @@
 # G_TEST_BUILDDIR and G_TEST_SRCDIR cannot be preset, since
 # the test sources are scattered.
 test_env = [
-  'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data'))
+  'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data')),
+  'RUNNING_TESTS=@0@'.format('TRUE')
 ]
 
 subdir('automated')