[tracker] tests/libtracker-common: moving test to the expected location

[Ivan Frade <ifrade src gnome org>]

commit d81b43128863e05142a7eac6a324bc866e0e9e17
Author: Ivan Frade <ivan frade gmail com>
Date:   Thu Oct 13 11:26:41 2011 +0300

    tests/libtracker-common: moving test to the expected location
    
    Test is for a function in tracker-file-utils.c, so it should go
    to tracker-file-utils-test.c (it was in tracker-file-utils.c)

 tests/libtracker-common/tracker-file-utils-test.c |   34 +++++++++++++++++++++
 tests/libtracker-common/tracker-utils-test.c      |   30 ------------------
 2 files changed, 34 insertions(+), 30 deletions(-)
---
diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
index e8268f0..45eebf4 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@ -181,6 +181,37 @@ test_file_get_mime_type (void)
 	g_free (dir_name);
 }
 
+
+#define assert_filename_match(a, b) { \
+	g_assert (tracker_filename_casecmp_without_extension (a, b) == TRUE); \
+	g_assert (tracker_filename_casecmp_without_extension (b, a) == TRUE); }
+
+#define assert_no_filename_match(a, b) { \
+	g_assert (tracker_filename_casecmp_without_extension (a, b) == FALSE); \
+	g_assert (tracker_filename_casecmp_without_extension (b, a) == FALSE); }
+
+static void
+test_case_match_filename_without_extension ()
+{
+	assert_filename_match ("test.mp3", "test.mp3");
+	assert_filename_match ("test.mp3", "test.wav");
+	assert_filename_match ("test.mp3", "test.mp");
+	assert_filename_match ("test.mp3", "test.");
+	assert_filename_match ("test.mp3", "test");
+	assert_filename_match ("01 - Song 1 (Remix).wav", "01 - Song 1 (Remix).flac");
+
+	assert_no_filename_match ("test.mp3", "bacon.mp3");
+
+	/* Pathological cases, mainly testing that nothing crashes */
+	assert_no_filename_match (".", "\n");
+	assert_no_filename_match ("as", "as..");
+	assert_no_filename_match ("...as", "...as..");
+	assert_no_filename_match (".", "test.");
+	assert_filename_match ("", ".");
+}
+
+
+
 int
 main (int argc, char **argv)
 {
@@ -200,6 +231,9 @@ main (int argc, char **argv)
 	g_test_add_func ("/tracker/libtracker-common/tracker-file-utils/file_get_mime_type",
 	                 test_file_get_mime_type);
 
+	g_test_add_func ("/libtracker-common/tracker-utils/case_match_filename_without_extension",
+	                 test_case_match_filename_without_extension);
+
 	result = g_test_run ();
 
 	tracker_locale_shutdown ();
diff --git a/tests/libtracker-common/tracker-utils-test.c b/tests/libtracker-common/tracker-utils-test.c
index 2ed2524..0ee82b5 100644
--- a/tests/libtracker-common/tracker-utils-test.c
+++ b/tests/libtracker-common/tracker-utils-test.c
@@ -75,33 +75,6 @@ test_seconds_estimate_to_string ()
 	g_print ("%s\n", result);
 }
 
-#define assert_filename_match(a, b) { \
-	g_assert (tracker_filename_casecmp_without_extension (a, b) == TRUE); \
-	g_assert (tracker_filename_casecmp_without_extension (b, a) == TRUE); }
-
-#define assert_no_filename_match(a, b) { \
-	g_assert (tracker_filename_casecmp_without_extension (a, b) == FALSE); \
-	g_assert (tracker_filename_casecmp_without_extension (b, a) == FALSE); }
-
-static void
-test_case_match_filename_without_extension ()
-{
-	assert_filename_match ("test.mp3", "test.mp3");
-	assert_filename_match ("test.mp3", "test.wav");
-	assert_filename_match ("test.mp3", "test.mp");
-	assert_filename_match ("test.mp3", "test.");
-	assert_filename_match ("test.mp3", "test");
-	assert_filename_match ("01 - Song 1 (Remix).wav", "01 - Song 1 (Remix).flac");
-
-	assert_no_filename_match ("test.mp3", "bacon.mp3");
-
-	/* Pathological cases, mainly testing that nothing crashes */
-	assert_no_filename_match (".", "\n");
-	assert_no_filename_match ("as", "as..");
-	assert_no_filename_match ("...as", "...as..");
-	assert_no_filename_match (".", "test.");
-	assert_filename_match ("", ".");
-}
 
 int
 main (int argc, char **argv)
@@ -119,9 +92,6 @@ main (int argc, char **argv)
 	g_test_add_func ("/libtracker-common/tracker-utils/seconds_estimate_to_string",
 	                 test_seconds_estimate_to_string);
 
-	g_test_add_func ("/libtracker-common/tracker-utils/case_match_filename_without_extension",
-	                 test_case_match_filename_without_extension);
-
 	ret = g_test_run ();
 
 	tracker_locale_shutdown ();