ardour/livetrax
13
0
Fork 0
Code

Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

Browse Source 
messages read the right way round.


git-svn-id: svn://localhost/ardour2/branches/3.0@11133 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-01-03 14:31:55 +00:00
parent 8be724db1b
commit c252d65f56
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/test/framewalk_to_beats_test.cc
View File

@ -25,19 +25,19 @@ FramewalkToBeatsTest::singleTempoTest ()
/* Walk 1 beats-worth of frames from beat 3 */ /* Walk 1 beats-worth of frames from beat 3 */
double r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1); double r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1);
CPPUNIT_ASSERT_EQUAL (r, 1.0); CPPUNIT_ASSERT_EQUAL (1.0, r);
/* Walk 6 beats-worth of frames from beat 4 */ /* Walk 6 beats-worth of frames from beat 4 */
r = map.framewalk_to_beats (frames_per_beat * 3, frames_per_beat * 6); r = map.framewalk_to_beats (frames_per_beat * 3, frames_per_beat * 6);
CPPUNIT_ASSERT_EQUAL (r, 6.0); CPPUNIT_ASSERT_EQUAL (6.0, r);
/* Walk 1.5 beats-worth of frames from beat 3 */ /* Walk 1.5 beats-worth of frames from beat 3 */
r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1.5); r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1.5);
CPPUNIT_ASSERT_EQUAL (r, 1.5); CPPUNIT_ASSERT_EQUAL (1.5, r);
/* Walk 1.5 beats-worth of frames from beat 2.5 */ /* Walk 1.5 beats-worth of frames from beat 2.5 */
r = map.framewalk_to_beats (frames_per_beat * 2.5, frames_per_beat * 1.5); r = map.framewalk_to_beats (frames_per_beat * 2.5, frames_per_beat * 1.5);
CPPUNIT_ASSERT_EQUAL (r, 1.5); CPPUNIT_ASSERT_EQUAL (1.5, r);
} }
void void
@ -76,23 +76,23 @@ FramewalkToBeatsTest::doubleTempoTest ()
/* Walk 1 beat from 1|2 */ /* Walk 1 beat from 1|2 */
double r = map.framewalk_to_beats (24e3, 24e3); double r = map.framewalk_to_beats (24e3, 24e3);
CPPUNIT_ASSERT_EQUAL (r, 1.0); CPPUNIT_ASSERT_EQUAL (1.0, r);
/* Walk 2 beats from 3|3 to 4|1 (over the tempo change) */ /* Walk 2 beats from 3|3 to 4|1 (over the tempo change) */
r = map.framewalk_to_beats (264e3, (24e3 + 12e3)); r = map.framewalk_to_beats (264e3, (24e3 + 12e3));
CPPUNIT_ASSERT_EQUAL (r, 2.0); CPPUNIT_ASSERT_EQUAL (2.0, r);
/* Walk 2.5 beats from 3|3.5 to 4.2 (over the tempo change) */ /* Walk 2.5 beats from 3|3.5 to 4.2 (over the tempo change) */
r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3)); r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3));
CPPUNIT_ASSERT_EQUAL (r, 2.5); CPPUNIT_ASSERT_EQUAL (2.5, r);
/* Walk 3 beats from 3|4.5 to 4|3.5 (over the tempo change) */ /* Walk 3 beats from 3|4.5 to 4|3.5 (over the tempo change) */
r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 6e3)); r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 6e3));
CPPUNIT_ASSERT_EQUAL (r, 3.0); CPPUNIT_ASSERT_EQUAL (3.0, r);
/* Walk 3.5 beats from 3|4.5 to 4.4 (over the tempo change) */ /* Walk 3.5 beats from 3|4.5 to 4.4 (over the tempo change) */
r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 12e3)); r = map.framewalk_to_beats (264e3 - 12e3, (24e3 + 12e3 + 12e3 + 12e3));
CPPUNIT_ASSERT_EQUAL (r, 3.5); CPPUNIT_ASSERT_EQUAL (3.5, r);
} }
void void