]> git.gag.com Git - debian/gnuradio/commitdiff
renamed test macro for consistency
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 2 Oct 2007 19:30:33 +0000 (19:30 +0000)
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 2 Oct 2007 19:30:33 +0000 (19:30 +0000)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6574 221aa14e-8319-0410-a670-987f0aec2ac5

gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
gnuradio-core/src/lib/runtime/gr_complex.h

index 7c0003c1f9b64a9781b9117be910921c8dc1c9fc..aee0e4614aff6ae826ff22cd688652de0f7efc95 100644 (file)
@@ -148,9 +148,9 @@ test_random_io (fir_maker_t maker)
       // arithmetic.
       
       for (int o = 0; o < ol; o++){
-       ASSERT_COMPLEXES_EQUAL (expected_output[o],
-                               actual_output[o],
-                               abs (expected_output[o]) * ERR_DELTA);
+       CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o],
+                                      actual_output[o],
+                                      abs (expected_output[o]) * ERR_DELTA);
       }
 
       delete f1;
index 1af7c91fc458237a31eeaa58277b03c0f4340469..1d57cd0cd471b57116d30281f06ea9a3690ed476 100644 (file)
@@ -147,8 +147,8 @@ test_random_io (fir_maker_t maker)
       // arithmetic.
       
       for (int o = 0; o < ol; o++){
-       ASSERT_COMPLEXES_EQUAL (expected_output[o], actual_output[o],
-                               abs (expected_output[o]) * ERR_DELTA);
+       CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o], actual_output[o],
+                                      abs (expected_output[o]) * ERR_DELTA);
       }
 
       delete f1;
index 5163a0e14032c1370661c7b4958c5798bfde3cce..93b84b9c31137098d6058bad0c9721a4fcb74d78 100644 (file)
@@ -146,9 +146,9 @@ test_random_io (fir_maker_t maker)
       // arithmetic.
       
       for (int o = 0; o < ol; o++){
-       ASSERT_COMPLEXES_EQUAL (expected_output[o],
-                               actual_output[o],
-                               abs (expected_output[o]) * ERR_DELTA);
+       CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o],
+                                      actual_output[o],
+                                      abs (expected_output[o]) * ERR_DELTA);
       }
 
       delete f1;
index ddbbf9c6e8efedee1a3423717a505b1b4361f82d..1aea34fbb3fc9d19573d4054d3cf092527a2e9ae 100644 (file)
@@ -145,9 +145,9 @@ test_random_io (fir_maker_t maker)
       // arithmetic.
       
       for (int o = 0; o < ol; o++){
-       ASSERT_COMPLEXES_EQUAL (expected_output[o],
-                               actual_output[o],
-                               abs (expected_output[o]) * ERR_DELTA);
+       CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o],
+                                      actual_output[o],
+                                      abs (expected_output[o]) * ERR_DELTA);
       }
 
       delete f1;
index f705d95dcaa1660bba97c4503597f401c981b7de..32e996eef9db00d12e75f9ac2884643a2c03d6ad 100644 (file)
@@ -38,7 +38,7 @@ inline bool is_complex (short x) { return false;}
 
 // this doesn't really belong here, but there are worse places for it...
 
-#define ASSERT_COMPLEXES_EQUAL(expected,actual,delta)                  \
+#define CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected,actual,delta)                  \
   CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.real(), actual.real(), delta);        \
   CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.imag(), actual.imag(), delta);