Changeset f36ecea for python/tests

Timestamp:

Jan 12, 2014, 5:54:42 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

4320679

Parents:

d945976

Message:

python/lib/aubio/slicing.py: use start and end stamps, make sure read > 0, improve tests

Location:

python/tests

Files:

• test_slicing.py (modified) (4 diffs)
• utils.py (modified) (1 diff)

python/tests/test_slicing.py

@@ -5 +5 @@
 
 from aubio import slice_source_at_stamps
-from utils import count_samples_in_file, count_samples_in_directory
-from utils import get_default_test_sound
+from utils import *
 
 import tempfile
@@ -29 +28 @@
     def test_slice_start_beyond_end(self):
         regions_start = [i*1000 for i in range(1, n_slices)]
-        regions_start += [count_samples_in_file(self.source_file)]
         regions_start += [count_samples_in_file(self.source_file) + 1000]
         slice_source_at_stamps(self.source_file, regions_start, output_dir = self.output_dir)
+
+    def test_slice_start_every_blocksize(self):
+        hopsize = 200
+        regions_start = [i*hopsize for i in range(1, n_slices)]
+        regions_start += [count_samples_in_file(self.source_file) + 1000]
+        slice_source_at_stamps(self.source_file, regions_start, output_dir = self.output_dir,
+                hopsize = 200)
 
     def tearDown(self):
         original_samples = count_samples_in_file(self.source_file)
         written_samples = count_samples_in_directory(self.output_dir)
+        total_files = count_files_in_directory(self.output_dir)
+        assert_equal(n_slices, total_files,
+            "number of slices created different from expected")
         assert_equal(written_samples, original_samples,
             "number of samples written different from number of original samples")
@@ -68 +76 @@
 
     def test_slice_wrong_ends(self):
-        regions_start = [i*1000 for i in range(1, 100)]
+        regions_start = [i*1000 for i in range(1, n_slices)]
         regions_end = []
         self.assertRaises (ValueError,
@@ -75 +83 @@
 
     def test_slice_no_ends(self):
-        regions_start = [i*1000 for i in range(1, 100)]
+        regions_start = [i*1000 for i in range(1, n_slices)]
         regions_end = None
         slice_source_at_stamps (self.source_file, regions_start, regions_end,

python/tests/utils.py

@@ -48 +48 @@
                     total_frames += count_samples_in_file(file_path)
     return total_frames
+
+def count_files_in_directory(samples_dir):
+    import os
+    total_files = 0
+    for f in os.walk(samples_dir):
+        if len(f[2]):
+            for each in f[2]:
+                file_path = os.path.join(f[0], each)
+                if file_path:
+                    total_files += 1
+    return total_files