More tests for FileUtils.count_music_file, a bug discovered (sudirect…

…ory searching does not update music file count) and fixed
tech2mar · Jul 21, 2014 · 5fc6483 · 5fc6483
1 parent 899d9fa
commit 5fc6483
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 1 deletion.
diff --git a/core/Utils/FileUtils.vala b/core/Utils/FileUtils.vala
@@ -207,7 +207,7 @@ namespace Noise.FileUtils {
                     files.add (file.get_uri ());
                 }
                 else if(file_info.get_file_type() == FileType.DIRECTORY) {
-                    count_music_files (file, files);
+                    index += count_music_files (file, files);
                 }
             }
         }

diff --git a/core/tests/Tests.vala b/core/tests/Tests.vala
@@ -23,6 +23,9 @@ void add_file_utils_tests () {
     Test.add_func ("/FileUtils/is_valid_content_type", () => {
         assert (Noise.FileUtils.count_music_files (File.new_for_path ("../tests/data/count_music_files/"),
                 new Gee.ArrayList<string>()) == 3);
+
+        assert (Noise.FileUtils.count_music_files (File.new_for_path ("../tests/data/count_music_files_subdir/"),
+                new Gee.ArrayList<string>()) == 4);
     });
 
     Test.add_func ("/FileUtils/count_music_files", () => {

diff --git a/tests/data/count_music_files_subdir/file1.mp3 b/tests/data/count_music_files_subdir/file1.mp3
diff --git a/tests/data/count_music_files_subdir/file1.ogg b/tests/data/count_music_files_subdir/file1.ogg
diff --git a/tests/data/count_music_files_subdir/file1.wav b/tests/data/count_music_files_subdir/file1.wav
diff --git a/tests/data/count_music_files_subdir/sub/file1.mp3 b/tests/data/count_music_files_subdir/sub/file1.mp3