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

[aubio.git] / python / tests / test_slicing.py

diff --git a/python/tests/test_slicing.py b/python/tests/test_slicing.py
index 3316708..986918f 100755 (executable)
--- a/python/tests/test_slicing.py
+++ b/python/tests/test_slicing.py
@@ -4,8 +4,7 @@ from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
 
 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
 import shutil
@@ -28,13 +27,22 @@ class aubio_slicing_test_case(TestCase):
 
     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")
         shutil.rmtree(self.output_dir)
@@ -67,14 +75,14 @@ class aubio_slicing_wrong_ends_test_case(TestCase):
         self.output_dir = tempfile.mkdtemp(suffix = 'aubio_slicing_test_case')
 
     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,
             slice_source_at_stamps, self.source_file, regions_start, regions_end,
                 output_dir = self.output_dir)
 
     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,
                 output_dir = self.output_dir)