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

Fix insane formatting/whitespace in evoral test stuff. C'mon Hans ;)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5799 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-19 15:26:56 +00:00
parent cb8407d26f
commit a2c434d5cd
5 changed files with 92 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libs/evoral/test/SMFTest.hpp
View file

@ -49,31 +49,31 @@ private:
class SMFTest : public CppUnit::TestFixture class SMFTest : public CppUnit::TestFixture
{ {
CPPUNIT_TEST_SUITE(SMFTest); CPPUNIT_TEST_SUITE(SMFTest);
CPPUNIT_TEST(createNewFileTest); CPPUNIT_TEST(createNewFileTest);
CPPUNIT_TEST(takeFiveTest); CPPUNIT_TEST(takeFiveTest);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
typedef double Time; typedef double Time;
void setUp() { void setUp() {
type_map = new DummyTypeMap(); type_map = new DummyTypeMap();
assert(type_map); assert(type_map);
seq = new MySequence<Time>(*type_map); seq = new MySequence<Time>(*type_map);
assert(seq); assert(seq);
} }
void tearDown() { void tearDown() {
delete seq; delete seq;
delete type_map; delete type_map;
} }
void createNewFileTest(); void createNewFileTest();
void takeFiveTest(); void takeFiveTest();
private: private:
DummyTypeMap* type_map; DummyTypeMap* type_map;
MySequence<Time>* seq; MySequence<Time>* seq;
}; };

63
libs/evoral/test/SequenceTest.hpp
View file

@ -80,11 +80,11 @@ public:
return result; return result;
} }
uint32_t assertLastEventTimeEarlier( uint32_t assertLastEventTimeEarlier(
Time time, EventType /*type*/, uint32_t /*size*/, const uint8_t* /*buf*/) { Time time, EventType /*type*/, uint32_t /*size*/, const uint8_t* /*buf*/) {
CPPUNIT_ASSERT(_last_event_time <= time); CPPUNIT_ASSERT(_last_event_time <= time);
return 0; return 0;
} }
Time last_event_time() const { return _last_event_time; } Time last_event_time() const { return _last_event_time; }
@ -94,40 +94,39 @@ private:
class SequenceTest : public CppUnit::TestFixture class SequenceTest : public CppUnit::TestFixture
{ {
CPPUNIT_TEST_SUITE (SequenceTest); CPPUNIT_TEST_SUITE (SequenceTest);
CPPUNIT_TEST (createTest); CPPUNIT_TEST (createTest);
CPPUNIT_TEST (preserveEventOrderingTest); CPPUNIT_TEST (preserveEventOrderingTest);
CPPUNIT_TEST_SUITE_END (); CPPUNIT_TEST_SUITE_END ();
public: public:
typedef double Time;
typedef std::vector<boost::shared_ptr<Note<Time> > > Notes;
typedef double Time; void setUp (void) {
typedef std::vector<boost::shared_ptr<Note<Time> > > Notes; type_map = new DummyTypeMap();
assert(type_map);
seq = new MySequence<Time>(*type_map);
assert(seq);
void setUp (void) { for (int i = 0; i < 12; i++) {
type_map = new DummyTypeMap(); test_notes.push_back(boost::shared_ptr<Note<Time> >
assert(type_map);
seq = new MySequence<Time>(*type_map);
assert(seq);
for(int i = 0; i < 12; i++) {
test_notes.push_back(boost::shared_ptr<Note<Time> >
(new Note<Time>(0, i * 100, 100, 64 + i, 64))); (new Note<Time>(0, i * 100, 100, 64 + i, 64)));
} }
} }
void tearDown (void) { void tearDown (void) {
test_notes.clear(); test_notes.clear();
delete seq; delete seq;
delete type_map; delete type_map;
} }
void createTest (void); void createTest (void);
void preserveEventOrderingTest (void); void preserveEventOrderingTest (void);
private: private:
DummyTypeMap* type_map; DummyTypeMap* type_map;
MySequence<Time>* seq; MySequence<Time>* seq;
Notes test_notes; Notes test_notes;
}; };