allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

MIDIClock_SlaveTest: refactor as subclass of MIDIClock_Slave for testability

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6587 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier
2010-01-29 05:18:10 +00:00
parent 075a4d9450
commit d4251508a3
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/slave.h
View File

@@ -284,7 +284,7 @@ class MIDIClock_Slave : public Slave {
MIDIClock_Slave (Session&, MIDI::Port&, int ppqn = 24);
/// Constructor for unit tests
MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn = 24);
MIDIClock_Slave (ISlaveSessionProxy* session_proxy = 0, int ppqn = 24);
~MIDIClock_Slave ();
void rebind (MIDI::Port&);
@@ -300,7 +300,7 @@ class MIDIClock_Slave : public Slave {
void set_bandwidth (double a_bandwith) { bandwidth = a_bandwith; }
private:
protected:
ISlaveSessionProxy* session;
MIDI::Port* port;
PBD::ScopedConnectionList port_connections;

3
libs/ardour/midi_clock_slave.cc
View File

@@ -56,7 +56,6 @@ MIDIClock_Slave::MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn)
, ppqn (ppqn)
, bandwidth (30.0 / 60.0) // 1 BpM = 1 / 60 Hz
{
session = session_proxy;
reset ();
}
@@ -216,7 +215,7 @@ MIDIClock_Slave::reset ()
_starting = false;
_started = false;
session->request_locate(0, false);
if (session) session->request_locate(0, false);
}
void

3
libs/ardour/test/midi_clock_slave_test.cpp
View File

@@ -9,8 +9,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MIDIClock_SlaveTest );
void
MIDIClock_SlaveTest::testStepResponse ()
{
//CPPUNIT_ASSERT_EQUAL ((uint32_t)(NUM_SAMPLES * linear.speed()), result);
cerr << "Frozz";
}

11
libs/ardour/test/midi_clock_slave_test.h
View File

@@ -74,27 +74,22 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
void request_transport_speed (const double speed) { transport_speed = speed; }
};
class MIDIClock_SlaveTest : public CppUnit::TestFixture
class MIDIClock_SlaveTest : public CppUnit::TestFixture, ARDOUR::MIDIClock_Slave
{
CPPUNIT_TEST_SUITE(MIDIClock_SlaveTest);
CPPUNIT_TEST(testStepResponse);
CPPUNIT_TEST_SUITE_END();
ISlaveSessionProxy *session_proxy;
MIDIClock_Slave *slave;
public:
void setUp() {
session_proxy = new TestSlaveSessionProxy ();
slave = new MIDIClock_Slave (session_proxy);
session = new TestSlaveSessionProxy ();
}
void tearDown() {
}
void testStepResponse();
};
} // namespace ARDOUR