test_*.py: use aubio module

diff --git a/interfaces/python/aubio/__init__.py b/interfaces/python/aubio/__init__.py
index e13766a7d125c25410cde5f2f0efdbbd7f333229..85c71808d191f637342f1a5c4fdfff5f3c08ba12 100644 (file)
--- a/interfaces/python/aubio/__init__.py
+++ b/interfaces/python/aubio/__init__.py
@@ -1,4 +1,5 @@
 import numpy
+from _aubio import *
 
 class fvec(numpy.ndarray):
 

diff --git a/interfaces/python/test_aubio.py b/interfaces/python/test_aubio.py
index 0af59566e4c83383a6f9706658c9b5bd9965bb89..9af5ba2f2a8083657553d2a6dc55adc25debd633 100644 (file)
--- a/interfaces/python/test_aubio.py
+++ b/interfaces/python/test_aubio.py
@@ -1,13 +1,10 @@
 from numpy.testing import TestCase, run_module_suite
-from numpy.testing import assert_equal
-from _aubio import *
-from numpy import array
 
 class aubiomodule_test_case(TestCase):
 
-  def setUp(self):
+  def test_import(self):
     """ try importing aubio """
-
+    import aubio 
 
 if __name__ == '__main__':
   from unittest import main

diff --git a/interfaces/python/test_cvec.py b/interfaces/python/test_cvec.py
index 99051a98b64d960504a45bd4e34d08e8d3cf59df..86916464ad539eaff7d60d45c522db801a864f5b 100644 (file)
--- a/interfaces/python/test_cvec.py
+++ b/interfaces/python/test_cvec.py
@@ -1,6 +1,6 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
-from _aubio import cvec
+from aubio import cvec
 from numpy import array, shape, pi
 
 class aubio_cvec_test_case(TestCase):

diff --git a/interfaces/python/test_fft.py b/interfaces/python/test_fft.py
index 4ac92f158a1f765952c24629a7ac5c805a46f16a..eb20c41f7edf26a12d0e1226c1a5821ab640e3db 100644 (file)
--- a/interfaces/python/test_fft.py
+++ b/interfaces/python/test_fft.py
@@ -1,8 +1,7 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
 # WARNING: numpy also has an fft object
-from _aubio import fft, cvec
-from aubio import fvec
+from aubio import fvec, fft, cvec
 from numpy import array, shape
 from math import pi
 

diff --git a/interfaces/python/test_filter.py b/interfaces/python/test_filter.py
index 443e21f1656240bcf9d0d270a6cf2c7681fb7bf3..5aae9ff274e74b06619da70a6458c2e3342c21bd 100644 (file)
--- a/interfaces/python/test_filter.py
+++ b/interfaces/python/test_filter.py
@@ -1,7 +1,6 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
-from _aubio import *
-from aubio import fvec
+from aubio import fvec, digital_filter
 from numpy import array
 
 def array_from_text_file(filename, dtype = 'float'):

diff --git a/interfaces/python/test_filterbank.py b/interfaces/python/test_filterbank.py
index e95e87c62a7b8f2cfbc46fae78b7d9cfd436f695..483ab0e4583d7dc80035684f2a9bdf6ab812ecd2 100644 (file)
--- a/interfaces/python/test_filterbank.py
+++ b/interfaces/python/test_filterbank.py
@@ -1,8 +1,7 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
 from numpy import array, shape
-from _aubio import *
-#from aubio import cvec
+from aubio import cvec, filterbank
 
 class aubio_filter_test_case(TestCase):
 

diff --git a/interfaces/python/test_fvec.py b/interfaces/python/test_fvec.py
index bd94af662d8403cb424b1a937c1e303179ba8a86..3077ffe69a9f6c5fe7445ffbd5aeb64a695a5b54 100644 (file)
--- a/interfaces/python/test_fvec.py
+++ b/interfaces/python/test_fvec.py
@@ -1,7 +1,6 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
-from _aubio import *
-from aubio import fvec
+from aubio import fvec, zero_crossing_rate, alpha_norm, min_removal
 from numpy import array, shape
 
 class aubio_fvec_test_case(TestCase):

diff --git a/interfaces/python/test_onsetdetection.py b/interfaces/python/test_onsetdetection.py
index 23b70ba6f7f34399efc179921c769403792136a7..895ee49418beede4556f6eaabb09c8cefd1662be 100644 (file)
--- a/interfaces/python/test_onsetdetection.py
+++ b/interfaces/python/test_onsetdetection.py
@@ -1,7 +1,7 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
 # WARNING: numpy also has an fft object
-from _aubio import specdesc, cvec
+from aubio import specdesc, cvec
 from numpy import array, shape, arange, zeros, log
 from math import pi
 

diff --git a/interfaces/python/test_phasevoc.py b/interfaces/python/test_phasevoc.py
index e1153d509e17380635a16757b0c5aab42f76e44f..71b3e140bc008f31cee3cb85ac03afde9d64445e 100644 (file)
--- a/interfaces/python/test_phasevoc.py
+++ b/interfaces/python/test_phasevoc.py
@@ -1,7 +1,6 @@
 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
-from aubio import fvec
-from _aubio import *
+from aubio import fvec, cvec, pvoc
 from numpy import array, shape
 
 class aubio_pvoc_test_case(TestCase):