From 969bbb20ff4e07e532467511340ceac481c52bd2 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sun, 8 Dec 2013 13:00:13 -0500
Subject: [PATCH] python/tests/test_zero_crossing_rate.py: update

---
 python/tests/test_zero_crossing_rate.py     | 51 ++++++++++++++++++++++++++
 python/tests/test_zero_crossing_rate.py.old | 56 -----------------------------
 2 files changed, 51 insertions(+), 56 deletions(-)
 create mode 100644 python/tests/test_zero_crossing_rate.py
 delete mode 100644 python/tests/test_zero_crossing_rate.py.old

diff --git a/python/tests/test_zero_crossing_rate.py b/python/tests/test_zero_crossing_rate.py
new file mode 100644
index 00000000..5919d848
--- /dev/null
+++ b/python/tests/test_zero_crossing_rate.py
@@ -0,0 +1,51 @@
+from aubio import fvec, zero_crossing_rate
+
+#! /usr/bin/env python
+
+from numpy.testing import TestCase
+
+buf_size = 2048
+
+class zero_crossing_rate_test_case(TestCase):
+
+    def setUp(self):
+        self.vector = fvec(buf_size)
+
+    def test(self):
+        """ create and delete fvec """
+        pass
+
+    def test_zeroes(self):
+        """ check zero crossing rate on a buffer of 0. """
+        self.assertEqual(0., zero_crossing_rate(self.vector))
+
+    def test_ones(self):
+        """ check zero crossing rate on a buffer of 1. """
+        self.vector[:] = 1.
+        self.assertEqual(0., zero_crossing_rate(self.vector))
+
+    def test_impulse(self):
+        """ check zero crossing rate on a buffer with an impulse """
+        self.vector[buf_size / 2] = 1.
+        self.assertEqual(0., zero_crossing_rate(self.vector))
+
+    def test_negative_impulse(self):
+        """ check zero crossing rate on a buffer with a negative impulse """
+        self.vector[buf_size / 2] = -1.
+        self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
+
+    def test_single(self):
+        """ check zero crossing rate on single crossing """
+        self.vector[buf_size / 2 - 1] = 1.
+        self.vector[buf_size / 2] = -1.
+        self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
+
+    def test_single_with_gap(self):
+        """ check zero crossing rate on single crossing with a gap"""
+        self.vector[buf_size / 2 - 2] = 1.
+        self.vector[buf_size / 2] = -1.
+        self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
+
+if __name__ == '__main__':
+    from unittest import main
+    main()
diff --git a/python/tests/test_zero_crossing_rate.py.old b/python/tests/test_zero_crossing_rate.py.old
deleted file mode 100644
index 1b1d9111..00000000
--- a/python/tests/test_zero_crossing_rate.py.old
+++ /dev/null
@@ -1,56 +0,0 @@
-from aubio import zero_crossing_rate
-
-#! /usr/bin/env python
-
-from numpy.testing import TestCase
-
-buf_size = 2048
-channels = 1
-
-class zero_crossing_rate_test_case(TestCase):
-
-  def setUp(self):
-    self.vector = new_fvec(buf_size, channels)
-
-  def tearDown(self):
-    del_fvec(self.vector)
-
-  def test(self):
-    """ create and delete fvec """
-    pass
-
-  def test_zeroes(self):
-    """ check zero crossing rate on a buffer of 0. """
-    self.assertEqual(0., zero_crossing_rate(self.vector))
-
-  def test_ones(self):
-    """ check zero crossing rate on a buffer of 1. """
-    for index in range(buf_size):
-      for channel in range(channels):
-        fvec_write_sample(self.vector, 1., channel, index)
-    self.assertEqual(0., zero_crossing_rate(self.vector))
-
-  def test_impulse(self):
-    """ check zero crossing rate on a buffer with an impulse """
-    fvec_write_sample(self.vector, 1., 0, buf_size / 2)
-    self.assertEqual(0., zero_crossing_rate(self.vector))
-
-  def test_negative_impulse(self):
-    """ check zero crossing rate on a buffer with a negative impulse """
-    fvec_write_sample(self.vector, -1., 0, buf_size / 2)
-    self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
-
-  def test_single(self):
-    """ check zero crossing rate on single crossing """
-    fvec_write_sample(self.vector, +1., 0, buf_size / 2 - 1)
-    fvec_write_sample(self.vector, -1., 0, buf_size / 2)
-    self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
-
-  def test_single_with_gap(self):
-    """ check zero crossing rate on single crossing with a gap"""
-    fvec_write_sample(self.vector, +1., 0, buf_size / 2 - 2)
-    fvec_write_sample(self.vector, -1., 0, buf_size / 2)
-    self.assertEqual(2./buf_size, zero_crossing_rate(self.vector))
-
-if __name__ == '__main__':
-  unittest.main()
-- 
2.11.0