diff --git a/include/tests/test.h b/include/tests/test.h index bd942cf8..6a150a32 100644 --- a/include/tests/test.h +++ b/include/tests/test.h @@ -100,8 +100,6 @@ void loop_strings_not_equal(gchar *, gchar *, unsigned int, unsigned int); test_equal(tests_failed, 0) -void test_cp_data_dir(); -void test_rm_data_dir(); gchar *test_data_file(const gchar *); bool test_data_file_exists(const gchar *); diff --git a/tests/Data/album.db b/tests/Data/album.db deleted file mode 100644 index 97cfee0c..00000000 --- a/tests/Data/album.db +++ /dev/null @@ -1,8 +0,0 @@ -0 -6 -1 1993 Link's Awakening -1 1998 Link's Awakening DX -1 2002 Wind Waker -1 2013 Wind Waker HD -1 2006 Twilight Princess GC -1 2006 Twilight Princess Wii diff --git a/tests/Data/artist.db b/tests/Data/artist.db deleted file mode 100644 index d7450f4a..00000000 --- a/tests/Data/artist.db +++ /dev/null @@ -1,5 +0,0 @@ -0 -3 -1 Link's Awakening -1 Wind Waker -1 Twilight Princess diff --git a/tests/Data/cur_track b/tests/Data/cur_track deleted file mode 100644 index 12decc13..00000000 --- a/tests/Data/cur_track +++ /dev/null @@ -1,2 +0,0 @@ -0 -3 diff --git a/tests/Data/deck b/tests/Data/deck deleted file mode 100644 index 8e645fcb..00000000 --- a/tests/Data/deck +++ /dev/null @@ -1,4 +0,0 @@ -1 -2 -1 4 0 1 2 3 -1 5 4 5 6 7 8 diff --git a/tests/Data/genre.db b/tests/Data/genre.db deleted file mode 100644 index f84d51ee..00000000 --- a/tests/Data/genre.db +++ /dev/null @@ -1,3 +0,0 @@ -0 -1 -1 Zelda Music diff --git a/tests/Data/library.db b/tests/Data/library.db deleted file mode 100644 index 0c0130e9..00000000 --- a/tests/Data/library.db +++ /dev/null @@ -1,3 +0,0 @@ -0 -1 -1 1 /home/Zelda/Music diff --git a/tests/Data/playlist.db b/tests/Data/playlist.db deleted file mode 100644 index 315bdfb2..00000000 --- a/tests/Data/playlist.db +++ /dev/null @@ -1,6 +0,0 @@ -0 -2 -1 Banned -4 0 1 2 3 -1 Favorites -8 16 17 18 19 20 21 22 23 diff --git a/tests/Data/track.db b/tests/Data/track.db deleted file mode 100644 index 92ef7a65..00000000 --- a/tests/Data/track.db +++ /dev/null @@ -1,50 +0,0 @@ -0 -24 -1 0 0 0 0 1 2001 1 10 0 100 Koholint Island -Links Awakening/1 - Koholint Island.ogg -1 0 0 0 0 2 2002 2 11 1 110 Animal Village -Links Awakening/2 - Animal Village.ogg -1 0 0 0 0 3 2003 3 12 2 120 Dream Shrine -Links Awakening/3 - Dream Shrine.ogg -1 0 0 0 0 4 2004 4 13 3 130 Goponga Swamp -Links Awakening/4 - Goponga Swamp.ogg -1 0 0 1 0 1 2003 5 14 4 140 Kanalet Castle -Links Awakening/1 - Kanalet Castle.ogg -1 0 0 1 0 2 2004 6 15 5 150 Mabe Village -Links Awakening/2 - Mabe Village.ogg -1 0 0 1 0 3 2005 7 16 6 160 Mt. Tamaranch -Links Awakening/3 - Mt Tamaranch.ogg -1 0 0 1 0 4 2006 8 17 7 170 Tal Tal Heights -Links Awakening/4 - Tal Tal Heights.ogg -1 0 1 2 0 1 2005 9 18 8 180 Dragon Roost Island -Wind Waker/1 - Dragon Roost Island.ogg -1 0 1 2 0 2 2006 1 19 9 190 Eastern Fairy Island -Wind Waker/2 - Eastern Fairy Island.ogg -1 0 1 2 0 3 2007 2 20 0 200 Forsaken Fortress -Wind Waker/3 - Forsaken Fortress.ogg -1 0 1 2 0 4 2008 3 21 1 210 Ghost Ship -Wind Waker/4 - Ghost Ship.ogg -1 0 1 3 0 1 2007 4 22 2 220 Outset Isle -Wind Waker/1 - Outset Isle.ogg -1 0 1 3 0 2 2008 5 23 3 230 Tingle Island -Wind Waker/2 - Tingle Island.ogg -1 0 1 3 0 3 2009 6 24 4 240 Tower of the Gods -Wind Waker/3 - Tower of the Gods.ogg -1 0 1 3 0 4 2010 7 25 5 250 Windfall Island -Wind Waker/4 - Windfall Island.ogg -1 0 2 4 0 1 2009 8 26 6 260 City in the Sky -Twilight Princess/1 - City in the Sky.ogg -1 0 2 4 0 2 2010 9 27 7 270 Gerudo Desert -Twilight Princess/2 - Gerudo Desert.ogg -1 0 2 4 0 3 2011 1 28 8 280 Arbiter's Grounds -Twilight Princess/3 - Arbiters Grounds.ogg -1 0 2 4 0 4 2012 2 29 9 290 Bridge of Eldin -Twilight Princess/4 - Bridge of Eldin.ogg -1 0 2 5 0 1 2011 3 30 0 300 Death Mountain -Twilight Princess/1 - Death Mountain.ogg -1 0 2 5 0 2 2012 4 10 1 310 Hidden Village -Twilight Princess/2 - Hidden Village.ogg -1 0 2 5 0 3 2013 5 11 2 320 Malo Mart -Twilight Princess/3 - Malo Mart.ogg -1 0 2 5 0 4 2014 6 12 3 330 Faron Woods -Twilight Princess/4 - Faron Woods.ogg diff --git a/tests/sanity.c b/tests/sanity.c index e7b8b38e..e15aac20 100644 --- a/tests/sanity.c +++ b/tests/sanity.c @@ -81,17 +81,6 @@ static void test_utilities() test_equal(test_data_file_exists(NULL), (bool)false); test_equal(test_data_file_exists("sanity"), (bool)false); - test_cp_data_dir(); - test_equal(test_data_file_exists(NULL), (bool)true); - test_equal(test_data_file_exists("artist.db"), (bool)true); - test_equal(test_data_file_exists("cur_track"), (bool)true); - test_equal(test_data_file_exists("library.db"), (bool)true); - test_equal(test_data_file_exists("genre.db"), (bool)true); - test_equal(test_data_file_exists("playlist.db"), (bool)true); - test_equal(test_data_file_exists("track.db"), (bool)true); - test_equal(test_data_file_exists("album.db"), (bool)true); - test_equal(test_data_file_exists("deck"), (bool)true); - g_free(dir); g_free(file); g_free(ddata); diff --git a/tests/test.c b/tests/test.c index bdea3aa8..8e37e936 100644 --- a/tests/test.c +++ b/tests/test.c @@ -120,35 +120,7 @@ bool test_data_file_exists(const gchar *name) return ret; } -void test_cp_data_dir() -{ - const gchar *file = NULL; - gchar *dst_dir = test_data_file(NULL); - GDir *dir = g_dir_open("tests/Data", 0, NULL); - - if (!dir) - goto out; - g_mkdir_with_parents(dst_dir, 0755); - - /* TODO: This could be a good place to use vfs_copy_file_range() */ - while((file = g_dir_read_name(dir)) != NULL) { - gchar *orig = g_strjoin("/", "tests/Data", file, NULL); - gchar *dst = g_strjoin("/", dst_dir, file, NULL); - gchar *cmd = g_strjoin(" ", "cp", orig, dst, NULL); - - system(cmd); - - g_free(orig); - g_free(dst); - g_free(cmd); - } - - g_dir_close(dir); -out: - g_free(dst_dir); -} - -void test_rm_data_dir() +static void test_rm_data_dir() { const gchar *file = NULL; gchar *path = test_data_file(NULL);