Mercurial > hg > auditok

changeset 321:903b5e1e8af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up tests
author Amine Sehili <amine.sehili@gmail.com>
date Sat, 19 Oct 2019 15:01:38 +0100
parents 06a39e279cd7
children 2cb8e29e1c9c
files tests/test_AudioSource.py tests/test_io.py tests/test_util.py
diffstat 3 files changed, 15 insertions(+), 85 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test_AudioSource.py	Fri Oct 18 21:56:43 2019 +0100
+++ b/tests/test_AudioSource.py	Sat Oct 19 15:01:38 2019 +0100
@@ -6,11 +6,11 @@
 from genty import genty, genty_dataset
 from auditok.io import (
     AudioParameterError,
-    DATA_FORMAT,
     BufferAudioSource,
     RawAudioSource,
     WaveAudioSource,
 )
+from auditok.signal import FORMAT
 from test_util import PURE_TONE_DICT, _sample_generator
 
 
@@ -59,7 +59,7 @@
         data_read_all = b"".join(audio_source_read_all_gen(audio_source))
         audio_source.close()
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
-        fmt = DATA_FORMAT[audio_source.sample_width]
+        fmt = FORMAT[audio_source.sample_width]
         expected = array(fmt, _sample_generator(*mono_channels)).tobytes()
 
         self.assertEqual(data_read_all, expected)
@@ -89,7 +89,7 @@
         data = b"".join(audio_source_read_all_gen(audio_source))
         audio_source.close()
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
-        fmt = DATA_FORMAT[audio_source.sample_width]
+        fmt = FORMAT[audio_source.sample_width]
         expected = array(fmt, _sample_generator(*mono_channels)).tobytes()
 
         self.assertEqual(data, expected)
@@ -114,7 +114,7 @@
     def setUp(self):
         self.data = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ012345"
         self.audio_source = BufferAudioSource(
-            data_buffer=self.data, sampling_rate=10, sample_width=1, channels=1
+            data=self.data, sampling_rate=10, sample_width=1, channels=1
         )
         self.audio_source.open()
 
@@ -441,15 +441,6 @@
             tp, 0, msg="wrong position, expected: 0.0, found: {0} ".format(tp)
         )
 
-    def test_sr10_sw1_ch1_set_data(self):
-        self.audio_source.set_data(b"12345")
-        block = self.audio_source.read(9999)
-        self.assertEqual(
-            block,
-            b"12345",
-            msg="wrong block, expected: '12345', found: {0} ".format(block),
-        )
-
     def test_sr10_sw1_ch1_read_closed(self):
         self.audio_source.close()
         with self.assertRaises(Exception):
@@ -461,7 +452,7 @@
     def setUp(self):
         self.data = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ012345"
         self.audio_source = BufferAudioSource(
-            data_buffer=self.data, sampling_rate=16, sample_width=2, channels=1
+            data=self.data, sampling_rate=16, sample_width=2, channels=1
         )
         self.audio_source.open()
 
@@ -737,39 +728,12 @@
             tp, 0, msg="wrong position, expected: 0.0, found: {0} ".format(tp)
         )
 
-    def test_sr16_sw2_ch1_set_data(self):
-        self.audio_source.set_data(b"abcdef")
-        block = self.audio_source.read(9999)
-        self.assertEqual(
-            block,
-            b"abcdef",
-            msg="wrong block, expected: 'abcdef', found: {0} ".format(block),
-        )
-
-    def test_sr16_sw2_ch1_set_data_exception(self):
-        with self.assertRaises(AudioParameterError) as audio_param_err:
-            self.audio_source.set_data("abcde")
-            self.assertEqual(
-                "The length of audio data must be an integer "
-                "multiple of `sample_width * channels`",
-                str(audio_param_err.exception),
-            )
-
-    def test_sr16_sw2_ch1_append_data_exception(self):
-        with self.assertRaises(AudioParameterError) as audio_param_err:
-            self.audio_source.append_data("abcde")
-            self.assertEqual(
-                "The length of audio data must be an integer "
-                "multiple of `sample_width * channels`",
-                str(audio_param_err.exception),
-            )
-
 
 class TestBufferAudioSource_SR11_SW4_CH1(unittest.TestCase):
     def setUp(self):
         self.data = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefgh"
         self.audio_source = BufferAudioSource(
-            data_buffer=self.data, sampling_rate=11, sample_width=4, channels=1
+            data=self.data, sampling_rate=11, sample_width=4, channels=1
         )
         self.audio_source.open()
 
@@ -966,43 +930,12 @@
             tp, 0, msg="wrong position, expected: 0.0, found: {0} ".format(tp)
         )
 
-    def test_sr11_sw4_ch1_set_data(self):
-        self.audio_source.set_data(b"abcdefgh")
-        block = self.audio_source.read(9999)
-        exp = b"abcdefgh"
-        self.assertEqual(
-            block,
-            exp,
-            msg="wrong block, expected: {}, found: {} ".format(exp, block),
-        )
-
-    def test_sr11_sw4_ch1_set_data_exception(self):
-        with self.assertRaises(AudioParameterError) as audio_param_err:
-            self.audio_source.set_data(b"abcdef")
-        self.assertEqual(
-            "The length of audio data must be an integer "
-            "multiple of `sample_width * channels`",
-            str(audio_param_err.exception),
-        )
-
-    def test_sr11_sw4_ch1_append_data_exception(self):
-        with self.assertRaises(AudioParameterError) as audio_param_err:
-            self.audio_source.append_data(b"abcdef")
-        self.assertEqual(
-            "The length of audio data must be an integer "
-            "multiple of `sample_width * channels`",
-            str(audio_param_err.exception),
-        )
-
 
 class TestBufferAudioSourceCreationException(unittest.TestCase):
     def test_wrong_sample_width_value(self):
         with self.assertRaises(AudioParameterError) as audio_param_err:
             _ = BufferAudioSource(
-                data_buffer=b"ABCDEFGHI",
-                sampling_rate=9,
-                sample_width=3,
-                channels=1,
+                data=b"ABCDEFGHI", sampling_rate=9, sample_width=3, channels=1
             )
         self.assertEqual(
             "Sample width must be one of: 1, 2 or 4 (bytes)",
@@ -1012,10 +945,7 @@
     def test_wrong_data_buffer_size(self):
         with self.assertRaises(AudioParameterError) as audio_param_err:
             _ = BufferAudioSource(
-                data_buffer=b"ABCDEFGHI",
-                sampling_rate=8,
-                sample_width=2,
-                channels=1,
+                data=b"ABCDEFGHI", sampling_rate=8, sample_width=2, channels=1
             )
         self.assertEqual(
             "The length of audio data must be an integer "
--- a/tests/test_io.py	Fri Oct 18 21:56:43 2019 +0100
+++ b/tests/test_io.py	Sat Oct 19 15:01:38 2019 +0100
@@ -8,8 +8,8 @@
 from unittest.mock import patch, Mock
 from genty import genty, genty_dataset
 from test_util import _sample_generator, _generate_pure_tone, PURE_TONE_DICT
+from auditok.signal import FORMAT
 from auditok.io import (
-    DATA_FORMAT,
     AudioIOError,
     AudioParameterError,
     BufferAudioSource,
@@ -224,7 +224,7 @@
         self.assertEqual(audio_source.sample_width, 2)
         self.assertEqual(audio_source.channels, len(frequencies))
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
-        fmt = DATA_FORMAT[audio_source.sample_width]
+        fmt = FORMAT[audio_source.sample_width]
         expected = array(fmt, _sample_generator(*mono_channels)).tobytes()
         self.assertEqual(data, expected)
 
@@ -262,7 +262,7 @@
         self.assertEqual(audio_source.sample_width, 2)
         self.assertEqual(audio_source.channels, len(frequencies))
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
-        fmt = DATA_FORMAT[audio_source.sample_width]
+        fmt = FORMAT[audio_source.sample_width]
         expected = array(fmt, _sample_generator(*mono_channels)).tobytes()
         self.assertEqual(data, expected)
 
@@ -300,7 +300,7 @@
     def test_save_raw(self, filename, frequencies):
         filename = "tests/data/test_16KHZ_{}".format(filename)
         sample_width = 2
-        fmt = DATA_FORMAT[sample_width]
+        fmt = FORMAT[sample_width]
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
         data = array(fmt, _sample_generator(*mono_channels)).tobytes()
         tmpfile = NamedTemporaryFile()
@@ -316,7 +316,7 @@
         sampling_rate = 16000
         sample_width = 2
         channels = len(frequencies)
-        fmt = DATA_FORMAT[sample_width]
+        fmt = FORMAT[sample_width]
         mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies]
         data = array(fmt, _sample_generator(*mono_channels)).tobytes()
         tmpfile = NamedTemporaryFile()
--- a/tests/test_util.py	Fri Oct 18 21:56:43 2019 +0100
+++ b/tests/test_util.py	Sat Oct 19 15:01:38 2019 +0100
@@ -3,7 +3,7 @@
 from array import array
 from genty import genty, genty_dataset
 from auditok.util import AudioEnergyValidator
-from auditok.io import DATA_FORMAT
+from auditok.signal import FORMAT
 
 
 def _sample_generator(*data_buffers):
@@ -29,7 +29,7 @@
     max_value = (2 ** (sample_width * 8) // 2) - 1
     if volume > max_value:
         volume = max_value
-    fmt = DATA_FORMAT[sample_width]
+    fmt = FORMAT[sample_width]
     total_samples = int(sampling_rate * duration_sec)
     step = frequency / sampling_rate
     two_pi_step = 2 * math.pi * step