fix audioengine use in unit-tests.

3 files changed, 6 insertions, 4 deletions

diff --git a/libs/ardour/test/audio_engine_test.cc b/libs/ardour/test/audio_engine_test.cc
index 647f87c345..7fbb62c41d 100644
--- a/libs/ardour/test/audio_engine_test.cc
+++ b/libs/ardour/test/audio_engine_test.cc
@@ -47,7 +47,7 @@ AudioEngineTest::test_start ()
 
 	CPPUNIT_ASSERT (AudioEngine::instance ());
 
-	boost::shared_ptr<AudioBackend> backend = engine->set_default_backend ();
+	boost::shared_ptr<AudioBackend> backend = engine->set_backend ("Dummy", "", "");
 
 	CPPUNIT_ASSERT (backend);
 
diff --git a/libs/ardour/test/session_test.cc b/libs/ardour/test/session_test.cc
index fced09b7ac..d50da2ad3b 100644
--- a/libs/ardour/test/session_test.cc
+++ b/libs/ardour/test/session_test.cc
@@ -50,8 +50,8 @@ void
 SessionTest::tearDown ()
 {
 	// this is needed or there is a crash in MIDI::Manager::destroy
+	AudioEngine::instance()->remove_session ();
 	AudioEngine::instance()->stop ();
-
 	AudioEngine::destroy ();
 }
 
@@ -64,6 +64,7 @@ SessionTest::new_session ()
 	CPPUNIT_ASSERT (!Glib::file_test (new_session_dir, Glib::FILE_TEST_EXISTS));
 
 	Session* new_session = 0;
+	AudioEngine::create ();
 
 	new_session = new Session (*AudioEngine::instance (), new_session_dir, session_name);
 
@@ -95,6 +96,7 @@ SessionTest::new_session_from_template ()
 
 	Session* new_session = 0;
 	BusProfile* bus_profile = 0;
+	AudioEngine::create ();
 
 	// create a new session based on session template
 	new_session = new Session (*AudioEngine::instance (), new_session_dir, session_name,
diff --git a/libs/ardour/test/test_needing_session.cc b/libs/ardour/test/test_needing_session.cc
index ac47d1ccf4..114ffeb485 100644
--- a/libs/ardour/test/test_needing_session.cc
+++ b/libs/ardour/test/test_needing_session.cc
@@ -22,9 +22,9 @@ TestNeedingSession::setUp ()
 void
 TestNeedingSession::tearDown ()
 {
-	AudioEngine::instance()->remove_session ();
 	delete _session;
+	AudioEngine::instance()->remove_session ();
 	AudioEngine::instance()->stop ();
-	
 	AudioEngine::destroy ();
+	_session = 0;
 }