Merge lp:~jeremywootten/pantheon-files/enable-testing-ctest-part2 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Restructure unit tests subdirectories

Reorganise /libcore/tests folder structure.

[lp:~jeremywootten/pantheon-files/enable-testing-ctest-part2]

2440. By Jeremy Wootten on 2017-02-01

Merge updates from parent and resolve conflicts

2441. By Jeremy Wootten on 2017-02-04

Merge changes from parent (add default icon theme method)

2442. By Jeremy Wootten on 2017-02-04

Merge trunk to r2470

[Cody Garver (codygarver)]

I'm concerned that `enable_testing ()` appears 6 times in this diff, are you certain it's needed more than once?

review: Needs Information

[lp:~jeremywootten/pantheon-files/enable-testing-ctest-part2]

2443. By Jeremy Wootten on 2017-02-07

Remove superfluous enable_testing() lines

[Jeremy Wootten (jeremywootten)]

Cody: You are right - enable_testing () covers subdirectories so is only needed in the root directory, it seems.

[Cody Garver (codygarver)]

Great. After resolving conflicts, this branch is ready to merge.

[lp:~jeremywootten/pantheon-files/enable-testing-ctest-part2]

2444. By Jeremy Wootten on 2017-02-08

Merge trunk to r2481

[Jeremy Wootten (jeremywootten)]

I didn't get any conflicts when I merged the trunk, but there was a warning of a criss-cross. I tried push --overwrite this time.

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2017-02-01 14:51:38 +0000
+++ libcore/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -1,5 +1,3 @@
-include (Tests)
-
 set (PKGNAME pantheon-files-core)
 set (PKGNAME_ PANTHEON_FILES_CORE)
 set (${PKGNAME_}_VERSION 0.1)
@@ -147,37 +145,5 @@
 
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-add_executable (pantheon-files-core_tests
-    tests/tests.c
-    tests/marlincore-tests-gof.c
-    tests/marlincore-tests-file.c
-    tests/marlincore-tests-icon-info.c)
-
-add_test (core pantheon-files-core_tests)
-
-target_link_libraries (pantheon-files-core_tests pantheon-files-core ${DEPS_LIBRARIES})
-add_dependencies (pantheon-files-core_tests pantheon-files-core)
-
-vala_precompile (VALA_TEST_C ${PKGNAME}-vala_tests
-  tests/Tests.vala
-  PACKAGES
-    granite
-    gtk+-3.0
-    gio-2.0
-    gee-0.8
-    gmodule-2.0
-    libcanberra
-    pantheon-files-core
-  OPTIONS
-    --thread
-    --target-glib=2.32 # Needed for new thread API
-)
-
-add_executable (${PKGNAME}-vala_tests
-    ${VALA_TEST_C}
-)
-
-target_link_libraries (${PKGNAME}-vala_tests pantheon-files-core ${DEPS_LIBRARIES})
-add_dependencies (${PKGNAME}-vala_tests pantheon-files-core)
-
-add_test (core-vala-tests ${PKGNAME}-vala_tests)
+add_subdirectory (tests)
+
 
=== added file 'libcore/tests/CMakeLists.txt'
--- libcore/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libcore/tests/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -0,0 +1,4 @@
+add_subdirectory (UtilTests)
+add_subdirectory (MarlinIconInfoTests)
+add_subdirectory (GOFFileTests)
+add_subdirectory (GOFDirectoryAsyncTests)
 
=== added directory 'libcore/tests/GOFDirectoryAsyncTests'
=== added file 'libcore/tests/GOFDirectoryAsyncTests/CMakeLists.txt'
--- libcore/tests/GOFDirectoryAsyncTests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFDirectoryAsyncTests/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -0,0 +1,32 @@
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set (CORE_LIB
+    pantheon-files-core
+)
+
+set (CFLAGS
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+)
+
+set (LIB_PATHS
+    ${DEPS_LIBRARY_DIRS}
+)
+
+set (TEST_NAME
+    gof-directory-async_tests
+)
+
+link_directories (${LIB_PATHS})
+add_definitions (${CFLAGS} -O2)
+
+
+add_executable (${TEST_NAME}
+    tests.c
+    marlincore-tests-file.c
+)
+
+target_link_libraries (${TEST_NAME} ${CORE_LIB} ${DEPS_LIBRARIES})
+add_dependencies (${TEST_NAME} ${CORE_LIB})
+
+add_test (core-${TEST_NAME} ${TEST_NAME})
 
=== added file 'libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.c'
--- libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include "marlincore-tests-file.h"
+#include "pantheon-files-core.h"
+#include "gof-file.h"
+
+GMainLoop* loop;
+
+static gboolean fatal_handler(const gchar* log_domain,
+                              GLogLevelFlags log_level,
+                              const gchar* message,
+                              gpointer user_data)
+{
+    return FALSE;
+}
+
+static void second_load_done(GOFDirectoryAsync* dir, gpointer data)
+{
+    g_message ("%s", G_STRFUNC);
+    g_assert_cmpint(dir->file->exists, ==, TRUE);
+
+    GOFDirectoryAsync *dir2 = gof_directory_async_from_file(dir->file);
+    g_assert_cmpint(dir->files_count, ==, dir2->files_count);
+    g_message ("files_count %u", dir->files_count);
+    g_object_unref (dir2);
+
+    /* some files testing inside a cached directory */
+    GOFFile *f1 = gof_file_get_by_uri ("file:///tmp/marlin-test/a");
+    g_object_unref (f1);
+
+    GOFFile *f2 = gof_file_get_by_uri ("file:///tmp/marlin-test/a");
+    g_object_unref (f2);
+
+    /* use a marlin function would show a dialog, FIXME */
+    system("rm -rf /tmp/marlin-test");
+    /* free previously allocated dir */
+    g_object_unref (dir);
+
+    g_main_loop_quit(loop);
+
+}
+
+static void first_load_done(GOFDirectoryAsync* dir, gpointer data)
+{
+    g_message ("%s", G_STRFUNC);
+    g_assert_cmpint(dir->file->exists, ==, FALSE);
+
+    system("mkdir /tmp/marlin-test");
+    system("touch /tmp/marlin-test/a");
+    system("touch /tmp/marlin-test/b");
+    system("touch /tmp/marlin-test/c");
+    system("touch /tmp/marlin-test/d");
+
+    /* we use cached directories so better block this callback */
+    g_signal_handlers_block_by_func (dir, first_load_done, NULL);
+
+    GOFDirectoryAsync *dir2;
+    dir2 = gof_directory_async_from_file(dir->file);
+    g_signal_connect(dir2, "done_loading", (GCallback) second_load_done, NULL);
+    gof_directory_async_init(dir2, NULL, NULL);
+
+    /* free previously allocated dir */
+    g_object_unref (dir);
+}
+
+void marlincore_tests_file(void)
+{
+    GOFDirectoryAsync* dir;
+
+    g_test_log_set_fatal_handler(fatal_handler, NULL);
+    system("rm -rf /tmp/marlin-test");
+
+    dir = gof_directory_async_from_gfile(g_file_new_for_path("/tmp/marlin-test"));
+    g_signal_connect(dir, "done_loading", (GCallback) first_load_done, NULL);
+    gof_directory_async_init(dir, NULL, NULL);
+
+    loop = g_main_loop_new(NULL, FALSE);
+    g_main_loop_run(loop);
+}
 
=== added file 'libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.h'
--- libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.h	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.h	2017-02-08 11:12:03 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _H_MARLIN_CORE_TESTS_FILE
+#define _H_MARLIN_CORE_TESTS_FILE
+
+#include "gof-file.h"
+
+void marlincore_tests_file(void);
+
+#endif
 
=== added file 'libcore/tests/GOFDirectoryAsyncTests/tests.c'
--- libcore/tests/GOFDirectoryAsyncTests/tests.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFDirectoryAsyncTests/tests.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include "marlincore-tests-file.h"
+#include "pantheon-files-core.h"
+
+int main (int argc, char* argv[])
+{
+    g_test_init (&argc, &argv, NULL);
+
+    g_test_add_func("/marlin/file", marlincore_tests_file);
+
+    return g_test_run();
+}
 
=== added directory 'libcore/tests/GOFFileTests'
=== added file 'libcore/tests/GOFFileTests/CMakeLists.txt'
--- libcore/tests/GOFFileTests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFFileTests/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -0,0 +1,32 @@
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set (CORE_LIB
+    pantheon-files-core
+)
+
+set (CFLAGS
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+)
+
+set (LIB_PATHS
+    ${DEPS_LIBRARY_DIRS}
+)
+
+set (TEST_NAME
+    gof-file_tests
+)
+
+link_directories (${LIB_PATHS})
+add_definitions (${CFLAGS} -O2)
+
+
+add_executable (${TEST_NAME}
+    tests.c
+    marlincore-tests-gof.c
+)
+
+target_link_libraries (${TEST_NAME} ${CORE_LIB} ${DEPS_LIBRARIES})
+add_dependencies (${TEST_NAME} ${CORE_LIB})
+
+add_test (core-${TEST_NAME} ${TEST_NAME})
 
=== added file 'libcore/tests/GOFFileTests/marlincore-tests-gof.c'
--- libcore/tests/GOFFileTests/marlincore-tests-gof.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFFileTests/marlincore-tests-gof.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include "marlincore-tests-gof.h"
+
+
+static gboolean fatal_handler(const gchar* log_domain,
+                              GLogLevelFlags log_level,
+                              const gchar* message,
+                              gpointer user_data)
+{
+    return FALSE;
+}
+
+
+void marlincore_tests_goffile(void)
+{
+    GOFFile* file;
+
+    g_test_log_set_fatal_handler(fatal_handler, NULL);
+    /* The URI is valid, the target exists */
+    file = gof_file_get_by_uri("file:///usr/share");
+    g_assert(file != NULL);
+    gof_file_query_update (file);
+    g_assert(file != NULL);
+    g_assert(file->info != NULL);
+    g_assert_cmpstr(g_file_info_get_name (file->info), ==, "share");
+    g_assert_cmpstr(g_file_info_get_display_name (file->info), ==, "share");
+    g_assert_cmpstr(file->basename, ==, "share");
+    g_assert_cmpint(file->is_directory, ==, TRUE);
+    g_assert_cmpint(file->is_hidden, ==, FALSE);
+    g_assert_cmpstr(gof_file_get_ftype (file), ==, "inode/directory");
+    g_assert_cmpint(gof_file_is_symlink(file), ==, FALSE);
+    /* TODO: formated_type needs a test too, but there are some issues with
+     * translations. */
+    g_assert_cmpstr(g_file_get_uri(file->location), ==, "file:///usr/share");
+    g_assert_cmpstr(gof_file_get_uri(file), ==, "file:///usr/share");
+
+    /* some allocations tests */
+    int i;
+    for (i=0; i<5; i++) {
+        GFile *location = g_file_new_for_path ("/usr/share");
+        file = gof_file_get(location);
+        g_object_unref (location);
+    }
+    for (i=0; i<5; i++)
+        g_object_unref (file);
+    /* we got to remove the file from the cache other the next cache lookup */
+    gof_file_remove_from_caches (file);
+    g_object_unref (file);
+    file = gof_file_get_by_uri("file:///usr/share");
+    g_object_unref (file);
+
+
+    /* The URI is valid, the target doesn't exist */
+    g_test_log_set_fatal_handler(fatal_handler, NULL);
+    file = gof_file_get_by_uri("file:///tmp/very/long/path/azerty");
+    g_assert(file != NULL);
+
+    system("rm /tmp/.marlin_backup /tmp/marlin_sym -f && touch /tmp/.marlin_backup");
+    /* The URI is valid, the target exists */
+    file = gof_file_get_by_uri("file:///tmp/.marlin_backup");
+    gof_file_query_update (file);
+    g_assert(file != NULL);
+    g_assert_cmpint(file->is_directory, ==, FALSE);
+    g_assert_cmpint(file->is_hidden, ==, TRUE); /* it's a backup, so, it's hidden */
+    g_assert_cmpint(file->size, ==, 0); /* the file is empty since we just create it it */
+
+    system("ln -s /tmp/marlin_backup~ /tmp/marlin_sym ");
+
+    /* a symlink */
+    file = gof_file_get_by_uri("file:///tmp/marlin_sym");
+    gof_file_query_update (file);
+    g_assert(file != NULL);
+    g_assert_cmpstr(gof_file_get_symlink_target(file), ==, "/tmp/marlin_backup~");
+    g_assert_cmpint(gof_file_is_symlink(file), ==, TRUE);
+    g_assert_cmpint(file->is_directory, ==, FALSE);
+    g_assert_cmpint(file->is_hidden, ==, FALSE);
+}
 
=== added file 'libcore/tests/GOFFileTests/marlincore-tests-gof.h'
--- libcore/tests/GOFFileTests/marlincore-tests-gof.h	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFFileTests/marlincore-tests-gof.h	2017-02-08 11:12:03 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _H_MARLIN_CORE_TESTS_GOF
+#define _H_MARLIN_CORE_TESTS_GOF
+
+#include "gof-file.h"
+
+void marlincore_tests_goffile(void);
+
+#endif
 
=== added file 'libcore/tests/GOFFileTests/tests.c'
--- libcore/tests/GOFFileTests/tests.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/GOFFileTests/tests.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include "marlincore-tests-gof.h"
+#include "pantheon-files-core.h"
+
+int main (int argc, char* argv[])
+{
+    g_test_init (&argc, &argv, NULL);
+
+    g_test_add_func("/marlin/goffile", marlincore_tests_goffile);
+
+    return g_test_run();
+}
 
=== removed file 'libcore/tests/Makefile.am'
--- libcore/tests/Makefile.am	2013-08-10 20:20:23 +0000
+++ libcore/tests/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# GLIB - Library of useful C routines
-
-#GTESTER = gtester 			# for non-GLIB packages
-GTESTER = /usr/bin/gtester		# for the GLIB package
-GTESTER_REPORT = /usr/bin/gtester-report	# for the GLIB package
-
-check_PROGRAMS = coremarlin_tests
-coremarlin_tests_SOURCES = tests.c \
-    marlincore-tests-gof.c \
-    marlincore-tests-file.c
-
-coremarlin_tests_LDADD = \
-    $(top_srcdir)/libcore/libmarlincore.la \
-    $(top_srcdir)/libwidgets/libmarlinwidgets.la \
-    $(CORE_LIBS) \
-    $(NULL)
-coremarlin_tests_CFLAGS = $(CORE_CFLAGS) -I.. -I$(top_srcdir)/libcore
-TESTS_ENVIRONMENT= $(GTESTER)
-TESTS = coremarlin_tests
-
 
=== added directory 'libcore/tests/MarlinIconInfoTests'
=== added file 'libcore/tests/MarlinIconInfoTests/CMakeLists.txt'
--- libcore/tests/MarlinIconInfoTests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libcore/tests/MarlinIconInfoTests/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -0,0 +1,32 @@
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set (CORE_LIB
+    pantheon-files-core
+)
+
+set (CFLAGS
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+)
+
+set (LIB_PATHS
+    ${DEPS_LIBRARY_DIRS}
+)
+
+set (TEST_NAME
+    marlin-icon-info_tests
+)
+
+link_directories (${LIB_PATHS})
+add_definitions (${CFLAGS} -O2)
+
+
+add_executable (${TEST_NAME}
+    tests.c
+    marlincore-tests-icon-info.c
+)
+
+target_link_libraries (${TEST_NAME} ${CORE_LIB} ${DEPS_LIBRARIES})
+add_dependencies (${TEST_NAME} ${CORE_LIB})
+
+add_test (core-${TEST_NAME} ${TEST_NAME})
 
=== added file 'libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.c'
--- libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2012, ammonkey <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include "marlincore-tests-icon-info.h"
+
+GMainLoop* loop;
+
+static gboolean fatal_handler(const gchar* log_domain,
+                              GLogLevelFlags log_level,
+                              const gchar* message,
+                              gpointer user_data)
+{
+    return FALSE;
+}
+
+static gboolean
+show_infos (gpointer data)
+{
+    marlin_icon_info_infos_caches ();
+    g_main_loop_quit (loop);
+
+    return FALSE;
+}
+
+void marlincore_tests_icon_info (void)
+{
+    GOFFile* file;
+    g_test_log_set_fatal_handler (fatal_handler, NULL);
+    /* The URI is valid, the target exists */
+    file = gof_file_get_by_uri ("file:///usr/share/icons/hicolor/16x16/apps/system-file-manager.svg");
+    g_assert(file != NULL);
+    gof_file_query_update (file);
+    g_assert(file->pix == NULL);
+    file->flags = 2;
+    gof_file_update_icon (file, 128);
+    g_assert(file->pix != NULL);
+    gof_file_update_icon (file, 32);
+    /*gof_file_update_icon (file, 16);*/
+    g_message ("pix ref count %u", G_OBJECT (file->pix)->ref_count);
+    g_object_unref (file->pix);
+    g_timeout_add_seconds_full (0, 2, show_infos, NULL, NULL);
+
+    loop = g_main_loop_new(NULL, FALSE);
+    g_main_loop_run(loop);
+}
 
=== added file 'libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.h'
--- libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.h	1970-01-01 00:00:00 +0000
+++ libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.h	2017-02-08 11:12:03 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2012, ammonkey <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _H_MARLIN_CORE_TESTS_ICON_INFO
+#define _H_MARLIN_CORE_TESTS_ICON_INFO
+
+#include "gof-file.h"
+#include "marlin-icon-info.h"
+
+void marlincore_tests_icon_info (void);
+
+#endif
 
=== added file 'libcore/tests/MarlinIconInfoTests/tests.c'
--- libcore/tests/MarlinIconInfoTests/tests.c	1970-01-01 00:00:00 +0000
+++ libcore/tests/MarlinIconInfoTests/tests.c	2017-02-08 11:12:03 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011, Lucas Baudin <[e-mail]>
+ *
+ * Marlin 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 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Marlin 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include "marlincore-tests-icon-info.h"
+#include "pantheon-files-core.h"
+
+int main (int argc, char* argv[])
+{
+    g_test_init (&argc, &argv, NULL);
+
+    /* only used for local tests with local files */
+    g_test_add_func ("/marlin/icon_info", marlincore_tests_icon_info);
+
+    return g_test_run();
+}
 
=== added directory 'libcore/tests/UtilTests'
=== added file 'libcore/tests/UtilTests/CMakeLists.txt'
--- libcore/tests/UtilTests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libcore/tests/UtilTests/CMakeLists.txt	2017-02-08 11:12:03 +0000
@@ -0,0 +1,45 @@
+set (PKGNAME pantheon-files-core)
+set (PKGNAME_ PANTHEON_FILES_CORE)
+set (${PKGNAME_}_VERSION 0.1)
+# increase the version number if you break the API
+
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set (CFLAGS
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+)
+
+set (LIB_PATHS
+    ${DEPS_LIBRARY_DIRS}
+)
+
+link_directories (${LIB_PATHS})
+add_definitions (${CFLAGS} -O2)
+
+vala_precompile (VALA_TEST_C ${PKGNAME}-vala_tests
+  UtilTests.vala
+  PACKAGES
+    granite
+    gtk+-3.0
+    gio-2.0
+    gee-0.8
+    gmodule-2.0
+    libcanberra
+    pantheon-files-core
+    pantheon-files-core-C
+  OPTIONS
+    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/
+    --thread
+    --target-glib=2.32 # Needed for new thread API
+)
+
+add_executable (${PKGNAME}-vala_tests
+    ${VALA_TEST_C}
+)
+
+target_link_libraries (${PKGNAME}-vala_tests pantheon-files-core ${DEPS_LIBRARIES})
+add_dependencies (${PKGNAME}-vala_tests pantheon-files-core)
+
+add_test (core-vala-tests ${PKGNAME}-vala_tests)
+
 
=== renamed file 'libcore/tests/Tests.vala' => 'libcore/tests/UtilTests/UtilTests.vala'
=== removed file 'libcore/tests/marlincore-tests-file.c'
--- libcore/tests/marlincore-tests-file.c	2017-01-05 19:16:00 +0000
+++ libcore/tests/marlincore-tests-file.c	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gio/gio.h>
-#include "marlincore-tests-file.h"
-#include "pantheon-files-core.h"
-#include "gof-file.h"
-
-GMainLoop* loop;
-
-static gboolean fatal_handler(const gchar* log_domain,
-                              GLogLevelFlags log_level,
-                              const gchar* message,
-                              gpointer user_data)
-{
-    return FALSE;
-}
-
-static void second_load_done(GOFDirectoryAsync* dir, gpointer data)
-{
-    g_message ("%s", G_STRFUNC);
-    g_assert_cmpint(dir->file->exists, ==, TRUE);
-
-    GOFDirectoryAsync *dir2 = gof_directory_async_from_file(dir->file);
-    g_assert_cmpint(dir->files_count, ==, dir2->files_count);
-    g_message ("files_count %u", dir->files_count);
-    g_object_unref (dir2);
-
-    /* some files testing inside a cached directory */
-    GOFFile *f1 = gof_file_get_by_uri ("file:///tmp/marlin-test/a");
-    g_object_unref (f1);
-
-    GOFFile *f2 = gof_file_get_by_uri ("file:///tmp/marlin-test/a");
-    g_object_unref (f2);
-
-    /* use a marlin function would show a dialog, FIXME */
-    system("rm -rf /tmp/marlin-test");
-    /* free previously allocated dir */
-    g_object_unref (dir);
-
-    g_main_loop_quit(loop);
-
-}
-
-static void first_load_done(GOFDirectoryAsync* dir, gpointer data)
-{
-    g_message ("%s", G_STRFUNC);
-    g_assert_cmpint(dir->file->exists, ==, FALSE);
-
-    system("mkdir /tmp/marlin-test");
-    system("touch /tmp/marlin-test/a");
-    system("touch /tmp/marlin-test/b");
-    system("touch /tmp/marlin-test/c");
-    system("touch /tmp/marlin-test/d");
-
-    /* we use cached directories so better block this callback */
-    g_signal_handlers_block_by_func (dir, first_load_done, NULL);
-
-    GOFDirectoryAsync *dir2;
-    dir2 = gof_directory_async_from_file(dir->file);
-    g_signal_connect(dir2, "done_loading", (GCallback) second_load_done, NULL);
-    gof_directory_async_init(dir2, NULL, NULL);
-
-    /* free previously allocated dir */
-    g_object_unref (dir);
-}
-
-void marlincore_tests_file(void)
-{
-    GOFDirectoryAsync* dir;
-
-    g_test_log_set_fatal_handler(fatal_handler, NULL);
-    system("rm -rf /tmp/marlin-test");
-
-    dir = gof_directory_async_from_gfile(g_file_new_for_path("/tmp/marlin-test"));
-    g_signal_connect(dir, "done_loading", (GCallback) first_load_done, NULL);
-    gof_directory_async_init(dir, NULL, NULL);
-
-    loop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(loop);
-}
 
=== removed file 'libcore/tests/marlincore-tests-file.h'
--- libcore/tests/marlincore-tests-file.h	2011-05-12 19:41:47 +0000
+++ libcore/tests/marlincore-tests-file.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _H_MARLIN_CORE_TESTS_FILE
-#define _H_MARLIN_CORE_TESTS_FILE
-
-#include "gof-file.h"
-
-void marlincore_tests_file(void);
-
-#endif
 
=== removed file 'libcore/tests/marlincore-tests-gof.c'
--- libcore/tests/marlincore-tests-gof.c	2017-01-05 19:16:00 +0000
+++ libcore/tests/marlincore-tests-gof.c	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gio/gio.h>
-#include "marlincore-tests-gof.h"
-
-
-static gboolean fatal_handler(const gchar* log_domain,
-                              GLogLevelFlags log_level,
-                              const gchar* message,
-                              gpointer user_data)
-{
-    return FALSE;
-}
-
-
-void marlincore_tests_goffile(void)
-{
-    GOFFile* file;
-
-    g_test_log_set_fatal_handler(fatal_handler, NULL);
-    /* The URI is valid, the target exists */
-    file = gof_file_get_by_uri("file:///usr/share");
-    g_assert(file != NULL);
-    gof_file_query_update (file);
-    g_assert(file != NULL);
-    g_assert(file->info != NULL);
-    g_assert_cmpstr(g_file_info_get_name (file->info), ==, "share");
-    g_assert_cmpstr(g_file_info_get_display_name (file->info), ==, "share");
-    g_assert_cmpstr(file->basename, ==, "share");
-    g_assert_cmpint(file->is_directory, ==, TRUE);
-    g_assert_cmpint(file->is_hidden, ==, FALSE);
-    g_assert_cmpstr(gof_file_get_ftype (file), ==, "inode/directory");
-    g_assert_cmpint(gof_file_is_symlink(file), ==, FALSE);
-    /* TODO: formated_type needs a test too, but there are some issues with
-     * translations. */
-    g_assert_cmpstr(g_file_get_uri(file->location), ==, "file:///usr/share");
-    g_assert_cmpstr(gof_file_get_uri(file), ==, "file:///usr/share");
-
-    /* some allocations tests */
-    int i;
-    for (i=0; i<5; i++) {
-        GFile *location = g_file_new_for_path ("/usr/share");
-        file = gof_file_get(location);
-        g_object_unref (location);
-    }
-    for (i=0; i<5; i++)
-        g_object_unref (file);
-    /* we got to remove the file from the cache other the next cache lookup */
-    gof_file_remove_from_caches (file);
-    g_object_unref (file);
-    file = gof_file_get_by_uri("file:///usr/share");
-    g_object_unref (file);
-
-
-    /* The URI is valid, the target doesn't exist */
-    g_test_log_set_fatal_handler(fatal_handler, NULL);
-    file = gof_file_get_by_uri("file:///tmp/very/long/path/azerty");
-    g_assert(file != NULL);
-
-    system("rm /tmp/.marlin_backup /tmp/marlin_sym -f && touch /tmp/.marlin_backup");
-    /* The URI is valid, the target exists */
-    file = gof_file_get_by_uri("file:///tmp/.marlin_backup");
-    gof_file_query_update (file);
-    g_assert(file != NULL);
-    g_assert_cmpint(file->is_directory, ==, FALSE);
-    g_assert_cmpint(file->is_hidden, ==, TRUE); /* it's a backup, so, it's hidden */
-    g_assert_cmpint(file->size, ==, 0); /* the file is empty since we just create it it */
-
-    system("ln -s /tmp/marlin_backup~ /tmp/marlin_sym ");
-
-    /* a symlink */
-    file = gof_file_get_by_uri("file:///tmp/marlin_sym");
-    gof_file_query_update (file);
-    g_assert(file != NULL);
-    g_assert_cmpstr(gof_file_get_symlink_target(file), ==, "/tmp/marlin_backup~");
-    g_assert_cmpint(gof_file_is_symlink(file), ==, TRUE);
-    g_assert_cmpint(file->is_directory, ==, FALSE);
-    g_assert_cmpint(file->is_hidden, ==, FALSE);
-}
 
=== removed file 'libcore/tests/marlincore-tests-gof.h'
--- libcore/tests/marlincore-tests-gof.h	2011-05-10 07:52:36 +0000
+++ libcore/tests/marlincore-tests-gof.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _H_MARLIN_CORE_TESTS_GOF
-#define _H_MARLIN_CORE_TESTS_GOF
-
-#include "gof-file.h"
-
-void marlincore_tests_goffile(void);
-
-#endif
 
=== removed file 'libcore/tests/marlincore-tests-icon-info.c'
--- libcore/tests/marlincore-tests-icon-info.c	2017-02-01 17:03:01 +0000
+++ libcore/tests/marlincore-tests-icon-info.c	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012, ammonkey <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gio/gio.h>
-#include "marlincore-tests-icon-info.h"
-
-GMainLoop* loop;
-
-static gboolean fatal_handler(const gchar* log_domain,
-                              GLogLevelFlags log_level,
-                              const gchar* message,
-                              gpointer user_data)
-{
-    return FALSE;
-}
-
-static gboolean
-show_infos (gpointer data)
-{
-    marlin_icon_info_infos_caches ();
-    g_main_loop_quit (loop);
-
-    return FALSE;
-}
-
-void marlincore_tests_icon_info (void)
-{
-    GOFFile* file;
-    g_test_log_set_fatal_handler (fatal_handler, NULL);
-    /* The URI is valid, the target exists */
-    file = gof_file_get_by_uri ("file:///usr/share/icons/hicolor/16x16/apps/system-file-manager.svg");
-    g_assert(file != NULL);
-    gof_file_query_update (file);
-    g_assert(file->pix == NULL);
-    file->flags = 2;
-    gof_file_update_icon (file, 128);
-    g_assert(file->pix != NULL);
-    gof_file_update_icon (file, 32);
-    /*gof_file_update_icon (file, 16);*/
-    g_message ("pix ref count %u", G_OBJECT (file->pix)->ref_count);
-    g_object_unref (file->pix);
-    g_timeout_add_seconds_full (0, 2, show_infos, NULL, NULL);
-
-    loop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(loop);
-}
 
=== removed file 'libcore/tests/marlincore-tests-icon-info.h'
--- libcore/tests/marlincore-tests-icon-info.h	2012-01-14 22:01:23 +0000
+++ libcore/tests/marlincore-tests-icon-info.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2012, ammonkey <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _H_MARLIN_CORE_TESTS_ICON_INFO
-#define _H_MARLIN_CORE_TESTS_ICON_INFO
-
-#include "gof-file.h"
-#include "marlin-icon-info.h"
-
-void marlincore_tests_icon_info (void);
-
-#endif
 
=== removed file 'libcore/tests/tests.c'
--- libcore/tests/tests.c	2017-02-01 17:03:01 +0000
+++ libcore/tests/tests.c	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin 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 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include "marlincore-tests-gof.h"
-#include "marlincore-tests-file.h"
-#include "marlincore-tests-icon-info.h"
-#include "pantheon-files-core.h"
-
-int main (int argc, char* argv[])
-{
-    g_test_init (&argc, &argv, NULL);
-
-    g_test_add_func("/marlin/file", marlincore_tests_file);
-    g_test_add_func("/marlin/goffile", marlincore_tests_goffile);
-    /* only used for local tests with local files */
-    g_test_add_func ("/marlin/icon_info", marlincore_tests_icon_info);
-
-    return g_test_run();
-}