Fix(tests): do not get samples from relative path anymore but use test_samples module

diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst
index c5c82a9413742d6408bf3b68102e5a8a5168b922..9dc79ee0df672d8042882c37aae29487e99ec649 100644 (file)
--- a/doc/source/tutorial/quick_start.rst
+++ b/doc/source/tutorial/quick_start.rst
@@ -4,15 +4,6 @@
 
 A most basic operation, transcoding, is easily performed with two processors:
 
-
-.. testsetup:: test_1,test_2,test_3
-
-   import timeside
-   import os
-   ModulePath =  os.path.dirname(os.path.realpath(timeside.analyzer.core.__file__))
-   wavFile = os.path.join(ModulePath , '../../tests/samples/sweep.wav')
-   decoder = timeside.decoder.file.FileDecoder(wavFile)
-
 .. testcleanup:: test_1
 
    os.remove('sweep.ogg')
@@ -29,9 +20,10 @@ A most basic operation, transcoding, is easily performed with two processors:
 .. doctest:: test_1
 
  >>> import timeside
+ >>> from timeside.tools.test_samples import samples
  >>> from timeside.core import get_processor
- >>> decoder = get_processor('file_decoder')('sweep.wav')# doctest: +SKIP
- >>> encoder = get_processor('vorbis_encoder')('sweep.ogg')
+ >>> decoder = get_processor('file_decoder')(samples["sweep.wav"])
+ >>> encoder = get_processor('vorbis_encoder')("sweep.ogg")
  >>> pipe = decoder | encoder
  >>> pipe.run()
 

diff --git a/tests/test_core_processors.py b/tests/test_core_processors.py
index d621e54b572fb69dbf4470e17313919a68ca6b1b..d537052cb8290b5345db33ffbd530d4f15ba6f4c 100644 (file)
--- a/tests/test_core_processors.py
+++ b/tests/test_core_processors.py
@@ -8,6 +8,8 @@ from timeside.core import Processor
 from timeside.api import IProcessor
 from timeside.component import implements, interfacedoc
 
+from timeside.tools.test_samples import samples
+
 SAMPLE_RATE_FORCED = 16000
 OTHER_SAMPLE_RATE = 32000
 
@@ -47,8 +49,7 @@ class TestForceSampleRate(unittest.TestCase):
             return OTHER_SAMPLE_RATE
 
     def setUp(self):
-        self.source = os.path.join(os.path.dirname(__file__), "samples",
-                                   "sweep.wav")
+        self.source = samples['sweep.wav']
         self.source_samplerate = 44100
         self.decoder = FileDecoder(uri=self.source)
 

diff --git a/tests/test_decoder_utils.py b/tests/test_decoder_utils.py
index 7a05fcd0b10213213c06077cc6ce05447ee4cecb..ea75f0e5b59e140ad9e6a4d190f7ca118d342709 100755 (executable)
--- a/tests/test_decoder_utils.py
+++ b/tests/test_decoder_utils.py
@@ -14,8 +14,7 @@ class TestGetUri(unittest.TestCase):
     "Test get_uri function"
     def testFileName(self):
         "Retrieve the uri from a filename"
-        self.source = os.path.join(os.path.dirname(__file__),
-                                   "samples/sweep.wav")
+        self.source = samples["sweep.wav"]
 
         self.uri = path2uri(os.path.abspath(self.source))
 
@@ -32,15 +31,15 @@ class TestGetUriWrongUri(unittest.TestCase):
     def testMissingFile(self):
         "Missing file raise IOerror"
         self.source = os.path.join(os.path.dirname(__file__),
-                                   "a_missing_file_blahblah.wav")
+                                   "a_missing_file.wav")
 
     def testNotValidUri(self):
         "Not valid uri raise IOerror"
-        self.source = os.path.join("://not/a/valid/uri/parisson.com")
+        self.source = "://not/a/valid/uri/parisson.com"
 
     def testNotSupportedUriProtocol(self):
         "Not supported uri protocol raise IOerror"
-        self.source = os.path.join("mailto://john.doe@parisson.com")
+        self.source = "mailto://john.doe@parisson.com"
 
     def tearDown(self):
         self.assertRaises(IOError, get_uri, self.source)

diff --git a/tests/test_decoding.py b/tests/test_decoding.py
index a0f97ff28c2844f652719e925a4251a8ca7c3aab..2af036a4581bc3bc2f6a8aba04a4ddd7c2ed136a 100755 (executable)
--- a/tests/test_decoding.py
+++ b/tests/test_decoding.py
@@ -210,8 +210,7 @@ class TestDecodingSegmentDefaultDuration(TestDecodingSegment):
 class TestDecodingSegmentBadParameters(unittest.TestCase):
 
     def setUp(self):
-        self.source = os.path.join(os.path.dirname(__file__),
-                                   "samples/sweep.wav")
+        self.source = samples["sweep.wav"]
 
     def test_bad_start_value(self):
         "Test decoding segment with start value exceeding the media duration"
@@ -343,7 +342,7 @@ class TestDecodingWrongFiles(unittest.TestCase):
     def testMissingFile(self):
         "Test decoding missing file"
         self.source = os.path.join(os.path.dirname(__file__),
-                                   "a_missing_file_blahblah.wav")
+                                   "a_missing_file.wav")
         self.assertRaises(IOError, FileDecoder, self.source)
 
     def testDevNull(self):

diff --git a/tests/test_decoding_stack.py b/tests/test_decoding_stack.py
index 93c45e216816c1e02e3686732c66b223c50e686f..242b83ff765fdb8948fa25c159216badc90fe347 100755 (executable)
--- a/tests/test_decoding_stack.py
+++ b/tests/test_decoding_stack.py
@@ -6,8 +6,7 @@ from timeside.decoder.file import FileDecoder
 from timeside.analyzer.level import Level
 from timeside.core import ProcessPipe
 from unit_timeside import unittest, TestRunner
-
-import os.path
+from timeside.tools.test_samples import samples
 
 #from glib import GError as GST_IOError
 # HINT : to use later with Gnonlin only
@@ -27,8 +26,7 @@ class TestDecodingFromStack(unittest.TestCase):
         self.test_exact_duration = True
         self.source_duration = 8
         self.expected_mime_type = 'audio/x-wav'
-        self.source = os.path.join(os.path.dirname(__file__),
-                                   "samples/sweep.wav")
+        self.source = samples["sweep.wav"]
 
     def testProcess(self):
         "Test decoder stack: test process"

diff --git a/tests/test_graphing.py b/tests/test_graphing.py
index 51bad4d9111b93abc277743477fe8201d58df855..d1c9690982271ac8ab3758065dc310acbe827e0f 100755 (executable)
--- a/tests/test_graphing.py
+++ b/tests/test_graphing.py
@@ -1,14 +1,17 @@
 #! /usr/bin/env python
 
 from timeside.decoder.file import FileDecoder
-from unit_timeside import *
+from unit_timeside import unittest, TestRunner
+from timeside.tools.test_samples import samples
 
+import tempfile
 import os.path
 
 __all__ = ['TestGraphing']
 
 
 class TestGraphing(unittest.TestCase):
+
     "Test all graphers with WAV input media format"
 
     def setUp(self):
@@ -18,63 +21,84 @@ class TestGraphing(unittest.TestCase):
     def testWav2Waveform(self):
         "Test WAV to Waveform"
         from timeside.grapher.waveform_simple import Waveform
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_waveform_sweep_wav.png"
-        self.grapher = Waveform(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="waveform.png",
+                                                 delete=True)
+        self.grapher = Waveform(width=1024, height=256,
+                                bg_color=(255, 255, 255),
+                                color_scheme='default')
 
     # WAVEFORM CENTROID
     def testWav2WaveformCentroid(self):
         "Test WAV to WaveformCentroid"
         from timeside.grapher.waveform_centroid import WaveformCentroid
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_waveform_centroid_sweep_wav.png"
-        self.grapher = WaveformCentroid(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="waveform_centr.png",
+                                                 delete=True)
+        self.grapher = WaveformCentroid(width=1024, height=256,
+                                        bg_color=(0, 0, 0),
+                                        color_scheme='default')
 
     # WAVEFORMS TRANSPARENT
     def testWav2WaveformTransparent(self):
         "Test WAV to WaveformTransparent"
         from timeside.grapher.waveform_transparent import WaveformTransparent
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_waveform_transparent_sweep_wav.png"
-        self.grapher = WaveformTransparent(width=1024, height=256, bg_color=None, color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="waveform_trans.png",
+                                                 delete=True)
+        self.grapher = WaveformTransparent(width=1024, height=256,
+                                           bg_color=None,
+                                           color_scheme='default')
 
     # WAVEFORMS CONTOUR BLACK
     def testWav2WaveformContourBlack(self):
         "Test WAV to WaveformContourBlack"
         from timeside.grapher.waveform_contour import WaveformContourBlack
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_waveform_contour_bk_sweep_wav.png"
-        self.grapher = WaveformContourBlack(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="waveform_cont_bk.png",
+                                                 delete=True)
+        self.grapher = WaveformContourBlack(
+            width=1024, height=256, bg_color=(0, 0, 0), color_scheme='default')
 
     # WAVEFORMS CONTOUR WHITE
     def testWav2WaveformContourWhite(self):
         "Test WAV to WaveformContourWhite"
         from timeside.grapher.waveform_contour import WaveformContourWhite
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_waveform_contour_wh_sweep_wav.png"
-        self.grapher = WaveformContourWhite(width=1024, height=256, bg_color=(255,255,255), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="waveform_cont_wh.png",
+                                                 delete=True)
+        self.grapher = WaveformContourWhite(width=1024, height=256,
+                                            bg_color=(255, 255, 255),
+                                            color_scheme='default')
 
     # LOG SPECTROGRAMS
-    def testWav2Spectrogram(self):
+    def testWav2SpectrogramLog(self):
         "Test WAV to Spectrogram"
         from timeside.grapher.spectrogram_log import SpectrogramLog
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_spectrogram_log_sweep_wav.png"
-        self.grapher = SpectrogramLog(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="spectrogram_log.png",
+                                                 delete=True)
+        self.grapher = SpectrogramLog(width=1024, height=256,
+                                      bg_color=(0, 0, 0),
+                                      color_scheme='default')
 
     # LIN SPECTROGRAMS
-    def testWav2Spectrogram(self):
+    def testWav2SpectrogramLin(self):
         "Test WAV to SpectrogramLinear"
         from timeside.grapher.spectrogram_lin import SpectrogramLinear
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-        self.image = "/tmp/test_spectrogram_lin_sweep_wav.png"
-        self.grapher = SpectrogramLinear(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
+        self.source = samples["sweep.wav"]
+        self.image = tempfile.NamedTemporaryFile(suffix="spectrogram_lin.png",
+                                                 delete=True)
+        self.grapher = SpectrogramLinear(width=1024, height=256,
+                                         bg_color=(0, 0, 0),
+                                         color_scheme='default')
 
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.grapher).run()
         self.grapher.render(self.image)
+        self.assertGreater(os.path.getsize(self.image.name), 0)
+        self.image.close()
 
 if __name__ == '__main__':
     unittest.main(testRunner=TestRunner())
-

diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py
index 93d08643f82b08ec3bd36685a585d78fb002e0cc..2f6b4bcf2dbadcef27d9e820ca312ef90a4d88fd 100755 (executable)
--- a/tests/test_yaafe.py
+++ b/tests/test_yaafe.py
@@ -2,6 +2,8 @@
 
 from unit_timeside import unittest, TestRunner
 from timeside.decoder.file import FileDecoder
+from timeside.tools.test_samples import samples
+
 from timeside import _WITH_YAAFE
 if _WITH_YAAFE:
     from timeside.analyzer.externals.yaafe import Yaafe
@@ -16,8 +18,7 @@ class TestYaafe(unittest.TestCase):
 
     def testOnSweepWithFeaturePlan(self):
         "runs on sweep"
-        self.source = os.path.join(os.path.dirname(__file__),
-                                   "samples", "sweep.wav")
+        self.source = samples["sweep.wav"]
 
         # Setup Yaafe Analyzer
         # Define Yaafe Feature Plan