[Commit-gnuradio] r6574 - in gnuradio/trunk/gnuradio-core/src/lib: filter runtime

[eb]

Author: eb
Date: 2007-10-02 13:30:33 -0600 (Tue, 02 Oct 2007)
New Revision: 6574

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
   gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
   gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
   gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_complex.h
Log:
renamed test macro for consistency

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc        
2007-10-02 15:11:15 UTC (rev 6573)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc        
2007-10-02 19:30:33 UTC (rev 6574)
@@ -148,9 +148,9 @@
       // 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;

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc        
2007-10-02 15:11:15 UTC (rev 6573)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc        
2007-10-02 19:30:33 UTC (rev 6574)
@@ -147,8 +147,8 @@
       // 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;

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc        
2007-10-02 15:11:15 UTC (rev 6573)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc        
2007-10-02 19:30:33 UTC (rev 6574)
@@ -146,9 +146,9 @@
       // 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;

Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc        
2007-10-02 15:11:15 UTC (rev 6573)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc        
2007-10-02 19:30:33 UTC (rev 6574)
@@ -145,9 +145,9 @@
       // 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;

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_complex.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_complex.h   2007-10-02 
15:11:15 UTC (rev 6573)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_complex.h   2007-10-02 
19:30:33 UTC (rev 6574)
@@ -38,7 +38,7 @@
 
 // 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);