Changeset aee840b

Timestamp:

Jan 12, 2014, 3:33:07 AM (10 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:

6f27719

Parents:

8203ae5

Message:

python/lib/aubio/slicing.py: error checking, add more tests, use get_default_sound

Location:

python

Files:

• lib/aubio/slicing.py (modified) (1 diff)
• tests/sounds/chocolate_1min.wav (added)
• tests/test_slicing.py (modified) (3 diffs)
• tests/utils.py (modified) (1 diff)

python/lib/aubio/slicing.py

@@ -6 +6 @@
         samplerate = 0,
         hopsize = 256):
+
+    if timestamps == None or len(timestamps) == 0:
+        raise ValueError ("no timestamps given")
+
+    if timestamps_end != None and len(timestamps_end) != len(timestamps):
+        raise ValueError ("len(timestamps_end) != len(timestamps)")
 
     source_base_name, source_ext = os.path.splitext(os.path.basename(source_file))

python/tests/test_slicing.py

@@ -6 +6 @@
 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
 
 import tempfile
@@ -13 +14 @@
 
     def setUp(self):
-        self.source_file = 'chocolate_1min.wav'
+        self.source_file = get_default_test_sound(self)
         self.output_dir = tempfile.mkdtemp(suffix = 'aubio_slicing_test_case')
 
@@ -37 +38 @@
         shutil.rmtree(self.output_dir)
 
+class aubio_slicing_wrong_starts_test_case(TestCase):
+
+    def setUp(self):
+        self.source_file = get_default_test_sound(self)
+        self.output_dir = tempfile.mkdtemp(suffix = 'aubio_slicing_test_case')
+
+    def test_slice_start_empty(self):
+        regions_start = []
+        self.assertRaises(ValueError,
+                slice_source_at_stamps,
+                self.source_file, regions_start, output_dir = self.output_dir)
+
+    def test_slice_start_none(self):
+        regions_start = None
+        self.assertRaises(ValueError,
+                slice_source_at_stamps,
+                self.source_file, regions_start, output_dir = self.output_dir)
+
+    def tearDown(self):
+        shutil.rmtree(self.output_dir)
+
+class aubio_slicing_wrong_ends_test_case(TestCase):
+
+    def setUp(self):
+        self.source_file = get_default_test_sound(self)
+        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_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_end = None
+        slice_source_at_stamps (self.source_file, regions_start, regions_end,
+                output_dir = self.output_dir)
+        original_samples = count_samples_in_file(self.source_file)
+        written_samples = count_samples_in_directory(self.output_dir)
+        assert_equal(original_samples, written_samples,
+            "number samples written different from number of original samples")
+
+    def tearDown(self):
+        shutil.rmtree(self.output_dir)
+
 if __name__ == '__main__':
     from unittest import main

python/tests/utils.py

@@ -12 +12 @@
     datadir = os.path.join(os.path.dirname(__file__), rel_dir)
     return glob.glob(os.path.join(datadir,'*.*'))
+
+def get_default_test_sound(TestCase, rel_dir = 'sounds'):
+    all_sounds = list_all_sounds(rel_dir)
+    if len(all_sounds) == 0:
+        TestCase.skipTest("please add some sounds in \'python/tests/sounds\'")
+    else:
+        return all_sounds[0]
 
 def array_from_yaml_file(filename):