Changeset 1153 for branches/transport_redesign_2/test/t_SimpleTransportMaster.cpp

Timestamp:

05/15/09 18:17:07 (4 years ago)

Author:

gabriel@…

Message:

Refactor some of the macros for tests and collect them into test_utils.h.

Files:

• branches/transport_redesign_2/test/t_SimpleTransportMaster.cpp (modified) (5 diffs)

branches/transport_redesign_2/test/t_SimpleTransportMaster.cpp

@@ -31 +31 @@
 #define THIS_NAMESPACE t_SimpleTransportMaster
 #include "test_macros.h"
+#include "test_utils.h"
 
 using namespace H2Core;
@@ -52 +53 @@
     };
 
-#define VALID_POS(p, s) {                                                       \
-    BOOST_REQUIRE( typeid(p) == typeid(H2Core::TransportPosition) );    \
-    BOOST_REQUIRE( typeid(s) == typeid(H2Core::Song*) );                \
-    CK( (p).bar > 0 );                                                  \
-    CK( (p).bar <= song_bar_count(s) );                                 \
-    CK( (p).ticks_per_beat == 48 );                                     \
-    CK( (p).beats_per_bar == (ticks_in_bar((s),(p).bar)/48) );          \
-    CK( (p).beat_type == 4 );                                           \
-    CK( (p).beat > 0 );                                                 \
-    CK( (p).beat <= (p).beats_per_bar );                                \
-    CK( (p).tick < ticks_in_bar((s), (p).bar) );                        \
-    CK( (p).bbt_offset < (p).frames_per_tick() );                       \
-    CK( (p).bar_start_tick < song_tick_count(s) );                      \
-    CK( (p).bar_start_tick == bar_start_tick((s), (p).bar) );           \
-    CK( ((p).bar_start_tick + (p).tick) < song_tick_count(s) );         \
-}
 
 
@@ -81 +66 @@
     CK( 0 == x.get_current_frame() );
     x.get_position(&pos);
-    VALID_POS(pos, s);
+    H2TEST_VALID_POS(pos, s);
     CK( pos.bar == 1 );
     CK( pos.beat == 1 );
@@ -107 +92 @@
     TransportPosition pos, posb;
     x.get_position(&pos);
-    VALID_POS(pos, s);
+    H2TEST_VALID_POS(pos, s);
     x.processed_frames(1024);
     x.get_position(&posb);
-    VALID_POS(posb, s);
+    H2TEST_VALID_POS(posb, s);
     CK( pos.frame == 0 );
     CK( pos.bbt_offset == 0 );
@@ -130 +115 @@
     for( frame = 0 ; frame <= tot_frames ; frame += delta ) {
         x.get_position(&pos);
-        VALID_POS(pos, s);
+        H2TEST_VALID_POS(pos, s);
 
         CK( pos.beats_per_minute == 100.0 );