diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-01-03 14:32:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-01-03 14:32:17 +0000 |
| commit | d345d446883c0425f8312149d04abc62076e36fc (patch) | |
| tree | c776f0ee1a9a774c9c0916ad6e1fd6f6613deab0 /libs | |
| parent | e11c96019aa00569c403de694d0c5ece928c4635 (diff) | |
Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
messages read the right way round.
git-svn-id: svn://localhost/ardour2/branches/3.0@11137 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/test/framepos_plus_beats_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index 882b6b5721..c95c2a7a66 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -26,11 +26,11 @@ FrameposPlusBeatsTest::singleTempoTest () /* Add 1 beat to beat 3 of the first bar */ framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, 1); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r); /* Add 4 beats to a -ve frame of 1 beat before zero */ r = map.framepos_plus_beats (-frames_per_beat * 1, 4); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r); } /* Test adding things that overlap a tempo change */ @@ -70,15 +70,15 @@ FrameposPlusBeatsTest::doubleTempoTest () /* Add 1 beat to 1|2 */ framepos_t r = map.framepos_plus_beats (24e3, 1); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (48e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r); /* Add 2 beats to 3|4 (over the tempo change) */ r = map.framepos_plus_beats (264e3, 2); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r); /* Add 2.5 beats to 3|3|960 (over the tempo change) */ r = map.framepos_plus_beats (264e3 - 12e3, 2.5); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r); } /* Same as doubleTempoTest () except put a meter change at the same time as the @@ -124,15 +124,15 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () /* Add 1 beat to 1|2 */ framepos_t r = map.framepos_plus_beats (24e3, 1); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (48e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r); /* Add 2 beats to 3|4 (over the tempo change) */ r = map.framepos_plus_beats (264e3, 2); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r); /* Add 2.5 beats to 3|3|960 (over the tempo change) */ r = map.framepos_plus_beats (264e3 - 12e3, 2.5); - CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3)); + CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r); } |