Fix Sequence test

2 files changed, 17 insertions, 16 deletions

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 16e93b37d2..d360af8b91 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -95,10 +95,6 @@ SequenceTest::controlInterpolationTest ()
 {
 	seq->clear();
 
-	for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
-		seq->notes().insert(*i);
-	}
-
 	static const uint64_t delay   = 1000;
 	static const uint32_t cc_type = 1;
 
@@ -120,22 +116,22 @@ SequenceTest::controlInterpolationTest ()
 	for (MySequence<Time>::const_iterator i = seq->begin(); i != seq->end(); ++i) {
 		sink.write(i->time(), i->event_type(), i->size(), i->buffer());
 	}
-	CPPUNIT_ASSERT(sink.events.size() == 3);
-	CPPUNIT_ASSERT(sink.events[0].first == 0);
-	CPPUNIT_ASSERT(sink.events[0].second == 0);
-	CPPUNIT_ASSERT(sink.events[1].first == 1000);
-	CPPUNIT_ASSERT(sink.events[1].second == 127);
-	CPPUNIT_ASSERT(sink.events[2].first == 2000);
-	CPPUNIT_ASSERT(sink.events[2].second == 0);
+	CPPUNIT_ASSERT_EQUAL((size_t)3, sink.events.size());
+	CPPUNIT_ASSERT_EQUAL(Evoral::Beats(0), sink.events[0].first);
+	CPPUNIT_ASSERT_EQUAL((uint8_t)0, sink.events[0].second);
+	CPPUNIT_ASSERT_EQUAL(Evoral::Beats(1000), sink.events[1].first);
+	CPPUNIT_ASSERT_EQUAL((uint8_t)127, sink.events[1].second);
+	CPPUNIT_ASSERT_EQUAL(Evoral::Beats(2000), sink.events[2].first);
+	CPPUNIT_ASSERT_EQUAL((uint8_t)0, sink.events[2].second);
 	sink.events.clear();
-	CPPUNIT_ASSERT(sink.events.size() == 0);
+	CPPUNIT_ASSERT_EQUAL((size_t)0, sink.events.size());
 
 	// Test linear interpolation
 	c->list()->set_interpolation(ControlList::Linear);
 	for (MySequence<Time>::const_iterator i = seq->begin(); i != seq->end(); ++i) {
 		sink.write(i->time(), i->event_type(), i->size(), i->buffer());
 	}
-	CPPUNIT_ASSERT(sink.events.size() == 128 * 2 - 1);
+	CPPUNIT_ASSERT_EQUAL((size_t)(128 * 2 - 1), sink.events.size());
 	Time    last_time(0);
 	int16_t last_value = -1;
 	bool    ascending  = true;
@@ -146,11 +142,16 @@ SequenceTest::controlInterpolationTest ()
 			ascending = false;
 		}
 		if (ascending) {
-			CPPUNIT_ASSERT(i->second == last_value + 1);
+			CPPUNIT_ASSERT_EQUAL((int)i->second, last_value + 1);
 		} else {
-			CPPUNIT_ASSERT(i->second == last_value - 1);
+			CPPUNIT_ASSERT_EQUAL((int)i->second, last_value - 1);
 		}
 		last_time = i->first;
 		last_value = i->second;
 	}
+
+	// Add some notes
+	for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
+		seq->notes().insert(*i);
+	}
 }
diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp
index 48dff308b6..59ab392291 100644
--- a/libs/evoral/test/SequenceTest.hpp
+++ b/libs/evoral/test/SequenceTest.hpp
@@ -96,7 +96,7 @@ public:
 
 	virtual uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
 		if (type == cc_type) {
-			CPPUNIT_ASSERT(size == 3);
+			CPPUNIT_ASSERT_EQUAL((uint32_t)3, size);
 			events.push_back(std::make_pair(time, buf[2]));
 		}
 		return size;