tests/test_analyzer_dc.py: new test, making test_analyzing.py obsolete

diff --git a/tests/test_analyzer_dc.py b/tests/test_analyzer_dc.py
new file mode 100755 (executable)
index 0000000..a737ab2
--- /dev/null
+++ b/tests/test_analyzer_dc.py
@@ -0,0 +1,30 @@
+#! /usr/bin/env python
+
+from unit_timeside import *
+from timeside.decoder import *
+from timeside.analyzer.dc import MeanDCShift
+from timeside.analyzer.core import AnalyzerResultContainer
+
+class TestAnalyzerDC(TestCase):
+
+    def setUp(self):
+        self.analyzer = MeanDCShift()
+
+    def testOnSweep(self):
+        "runs on sweep"
+        self.source = os.path.join (os.path.dirname(__file__),  "samples", "sweep.wav")
+        self.expected = [{"value": -0.0, "name": "Mean DC shift", "unit": "%", "id": "mean_dc_shift"}]
+
+    def testOnGuitar(self):
+        "runs on guitar"
+        self.source = os.path.join (os.path.dirname(__file__),  "samples", "guitar.wav")
+        self.expected = [{"value": 0.054, "name": "Mean DC shift", "unit": "%", "id": "mean_dc_shift"}]
+
+    def tearDown(self):
+        decoder = FileDecoder(self.source)
+        (decoder | self.analyzer).run()
+        results = self.analyzer.results()
+        self.assertEquals(results, AnalyzerResultContainer(self.expected))
+
+if __name__ == '__main__':
+    unittest.main(testRunner=TestRunner())

diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py
index d1e4553ecfd226fd463f7b037e86592464b89e13..c5ea551d64d5477b6f650171d8afd86936cbd588 100755 (executable)
--- a/tests/test_analyzer_level.py
+++ b/tests/test_analyzer_level.py
@@ -12,16 +12,21 @@ class TestAnalyzerLevel(TestCase):
     def testOnSweep(self):
         "runs on sweep"
         self.source = os.path.join (os.path.dirname(__file__),  "samples", "sweep.wav")
+        self.expected = [{"value": -6.021, "name": "Max level", "unit": "dBFS", "id": "max_level"},
+                {"value": -9.856, "name": "RMS level", "unit": "dBFS", "id": "rms_level"}]
 
     def testOnGuitar(self):
         "runs on guitar"
         self.source = os.path.join (os.path.dirname(__file__),  "samples", "guitar.wav")
+        self.expected = [{"value": -4.258, "name": "Max level", "unit": "dBFS", "id": "max_level"},
+                {"value": -21.945, "name": "RMS level", "unit": "dBFS", "id": "rms_level"}]
 
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
         results = self.analyzer.results()
-        print results
+        self.assertEquals(results, self.expected)
+        #print results
         #print results.to_yaml()
         #print results.to_json()
         #print results.to_xml()

diff --git a/tests/test_analyzing.py b/tests/test_analyzing.py
deleted file mode 100755 (executable)
index 368c0a2..0000000
--- a/tests/test_analyzing.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /usr/bin/env python
-
-from timeside.decoder import *
-from timeside.analyzer import *
-from unit_timeside import *
-
-import os.path
-
-__all__ = ['TestAnalyzing']
-
-class TestAnalyzing(TestCase):
-    "Test all analyzers"
-
-    def setUp(self):
-        self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")
-
-    def testDC(self):
-        "Test mean DC shift"
-        self.analyzer = MeanDCShift()
-        self.value = -0
-
-    def testMeanLevel(self):
-        "Test mean level"
-        self.analyzer = MeanLevel()
-        self.value = -9.856
-
-    def testMaxLevel(self):
-        "Test max level"
-        self.analyzer = MaxLevel()
-        self.value = -6.0209999999999999
-
-    def tearDown(self):
-        decoder = FileDecoder(self.source)
-        (decoder | self.analyzer).run()
-        self.assertEquals(self.analyzer.result(), self.value)
-
-
-if __name__ == '__main__':
-    unittest.main(testRunner=TestRunner())
-