smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 18:16:35 +01:00
Code Issues Projects Releases Wiki Activity

Make tests of Evoral::Range functions include both endpoints in Range

Browse source 
Some of the tests for Evoral::RangeList::subtract() assume that ranges
don't contain their end (->to) point. This appears inconsistent with how
they are used elsewhere.

Add some ASCII art comments to the tests to try to clarify what they're
really testing for, and amend subtractTest1, subtractTest4, & subtractTest5
to incorporate the assumption that ranges include their end points.
This commit is contained in:
Colin Fletcher 2014-11-30 11:17:58 +00:00
parent 0c7dd82239
commit 47d329ca40
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libs/evoral/test/RangeTest.cpp
View file

@ -29,6 +29,13 @@ RangeTest::coalesceTest ()
void void
RangeTest::subtractTest1 () RangeTest::subtractTest1 ()
{ {
/* 01234567890
* fred: |---------|
* jim: |-| ||
* sheila: || || ||
*/
Range<int> fred (0, 10); Range<int> fred (0, 10);
RangeList<int> jim; RangeList<int> jim;
@ -45,11 +52,11 @@ RangeTest::subtractTest1 ()
CPPUNIT_ASSERT_EQUAL (1, i->to); CPPUNIT_ASSERT_EQUAL (1, i->to);
++i; ++i;
CPPUNIT_ASSERT_EQUAL (4, i->from); CPPUNIT_ASSERT_EQUAL (5, i->from);
CPPUNIT_ASSERT_EQUAL (6, i->to); CPPUNIT_ASSERT_EQUAL (6, i->to);
++i; ++i;
CPPUNIT_ASSERT_EQUAL (8, i->from); CPPUNIT_ASSERT_EQUAL (9, i->from);
CPPUNIT_ASSERT_EQUAL (10, i->to); CPPUNIT_ASSERT_EQUAL (10, i->to);
} }
@ -93,6 +100,13 @@ RangeTest::subtractTest3 ()
void void
RangeTest::subtractTest4 () RangeTest::subtractTest4 ()
{ {
/* 01234567890
* fred: |---------|
* jim: |-| ||
* ||
* sheila: || || |
*/
Range<int> fred (0, 10); Range<int> fred (0, 10);
RangeList<int> jim; RangeList<int> jim;
@ -110,11 +124,11 @@ RangeTest::subtractTest4 ()
CPPUNIT_ASSERT_EQUAL (1, i->to); CPPUNIT_ASSERT_EQUAL (1, i->to);
++i; ++i;
CPPUNIT_ASSERT_EQUAL (4, i->from); CPPUNIT_ASSERT_EQUAL (5, i->from);
CPPUNIT_ASSERT_EQUAL (6, i->to); CPPUNIT_ASSERT_EQUAL (6, i->to);
++i; ++i;
CPPUNIT_ASSERT_EQUAL (9, i->from); CPPUNIT_ASSERT_EQUAL (10, i->from);
CPPUNIT_ASSERT_EQUAL (10, i->to); CPPUNIT_ASSERT_EQUAL (10, i->to);
} }
@ -125,6 +139,12 @@ RangeTest::subtractTest4 ()
void void
RangeTest::subtractTest5 () RangeTest::subtractTest5 ()
{ {
/* 01234567890123
* fred: |----------|
* jim: |---| || |------...
* sheila:i | |
*/
Range<int> fred (1, 12); Range<int> fred (1, 12);
RangeList<int> jim; RangeList<int> jim;
@ -138,11 +158,11 @@ RangeTest::subtractTest5 ()
CPPUNIT_ASSERT_EQUAL (size_t (2), s.size ()); CPPUNIT_ASSERT_EQUAL (size_t (2), s.size ());
RangeList<int>::List::iterator i = s.begin (); RangeList<int>::List::iterator i = s.begin ();
CPPUNIT_ASSERT_EQUAL (4, i->from); CPPUNIT_ASSERT_EQUAL (5, i->from);
CPPUNIT_ASSERT_EQUAL (5, i->to); CPPUNIT_ASSERT_EQUAL (5, i->to);
++i; ++i;
CPPUNIT_ASSERT_EQUAL (7, i->from); CPPUNIT_ASSERT_EQUAL (8, i->from);
CPPUNIT_ASSERT_EQUAL (8, i->to); CPPUNIT_ASSERT_EQUAL (8, i->to);
} }