From 469d3b8fd7f3554d1b605b420a17d8c74d35e688 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 3 Jan 2012 21:12:53 +0000 Subject: [PATCH] Add TestNeedingPlaylistAndRegions git-svn-id: svn://localhost/ardour2/branches/3.0@11149 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/test/playlist_layering_test.cc | 45 +------------------ libs/ardour/test/playlist_layering_test.h | 19 +------- .../test/test_needing_playlist_and_regions.cc | 40 +++++++++++++++++ .../test/test_needing_playlist_and_regions.h | 20 +++++++++ libs/ardour/test/test_needing_session.h | 4 ++ libs/ardour/wscript | 1 + 6 files changed, 68 insertions(+), 61 deletions(-) create mode 100644 libs/ardour/test/test_needing_playlist_and_regions.cc create mode 100644 libs/ardour/test/test_needing_playlist_and_regions.h diff --git a/libs/ardour/test/playlist_layering_test.cc b/libs/ardour/test/playlist_layering_test.cc index 1753635584..e17e157619 100644 --- a/libs/ardour/test/playlist_layering_test.cc +++ b/libs/ardour/test/playlist_layering_test.cc @@ -1,58 +1,15 @@ -#include "midi++/manager.h" -#include "pbd/textreceiver.h" -#include "pbd/compose.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" -#include "ardour/playlist_factory.h" -#include "ardour/source_factory.h" +#include "ardour/playlist.h" #include "ardour/region.h" -#include "ardour/region_factory.h" #include "playlist_layering_test.h" CPPUNIT_TEST_SUITE_REGISTRATION (PlaylistLayeringTest); using namespace std; using namespace ARDOUR; -using namespace PBD; - -void -PlaylistLayeringTest::setUp () -{ - TestNeedingSession::setUp (); - - string const test_wav_path = "libs/ardour/test/playlist_layering_test/playlist_layering_test.wav"; - _playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test"); - _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path, "", false, 44100); -} - -void -PlaylistLayeringTest::tearDown () -{ - _playlist.reset (); - _source.reset (); - for (int i = 0; i < 16; ++i) { - _region[i].reset (); - } - - TestNeedingSession::tearDown (); -} - -void -PlaylistLayeringTest::create_three_short_regions () -{ - PropertyList plist; - plist.add (Properties::start, 0); - plist.add (Properties::length, 100); - for (int i = 0; i < 3; ++i) { - _region[i] = RegionFactory::create (_source, plist); - } -} void PlaylistLayeringTest::basicsTest () { - create_three_short_regions (); - _playlist->add_region (_region[0], 0); _playlist->add_region (_region[1], 10); _playlist->add_region (_region[2], 20); diff --git a/libs/ardour/test/playlist_layering_test.h b/libs/ardour/test/playlist_layering_test.h index 2200fa8f9f..20b0f49086 100644 --- a/libs/ardour/test/playlist_layering_test.h +++ b/libs/ardour/test/playlist_layering_test.h @@ -1,26 +1,11 @@ -#include "test_needing_session.h" +#include "test_needing_playlist_and_regions.h" -namespace ARDOUR { - class Playlist; - class Source; -} - -class PlaylistLayeringTest : public TestNeedingSession +class PlaylistLayeringTest : public TestNeedingPlaylistAndRegions { CPPUNIT_TEST_SUITE (PlaylistLayeringTest); CPPUNIT_TEST (basicsTest); CPPUNIT_TEST_SUITE_END (); public: - void setUp (); - void tearDown (); - void basicsTest (); - -private: - void create_three_short_regions (); - - boost::shared_ptr _playlist; - boost::shared_ptr _source; - boost::shared_ptr _region[16]; }; diff --git a/libs/ardour/test/test_needing_playlist_and_regions.cc b/libs/ardour/test/test_needing_playlist_and_regions.cc new file mode 100644 index 0000000000..7dc7bd9440 --- /dev/null +++ b/libs/ardour/test/test_needing_playlist_and_regions.cc @@ -0,0 +1,40 @@ +#include "ardour/playlist_factory.h" +#include "ardour/source_factory.h" +#include "ardour/region.h" +#include "ardour/region_factory.h" +#include "test_needing_playlist_and_regions.h" + +using namespace std; +using namespace PBD; +using namespace ARDOUR; + +void +TestNeedingPlaylistAndRegions::setUp () +{ + TestNeedingSession::setUp (); + + string const test_wav_path = "libs/ardour/test/playlist_layering_test/playlist_layering_test.wav"; + _playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test"); + _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path, "", false, 44100); + + PropertyList plist; + plist.add (Properties::start, 0); + plist.add (Properties::length, 100); + for (int i = 0; i < 16; ++i) { + _region[i] = RegionFactory::create (_source, plist); + } +} + +void +TestNeedingPlaylistAndRegions::tearDown () +{ + _playlist.reset (); + _source.reset (); + for (int i = 0; i < 16; ++i) { + _region[i].reset (); + } + + TestNeedingSession::tearDown (); +} + + diff --git a/libs/ardour/test/test_needing_playlist_and_regions.h b/libs/ardour/test/test_needing_playlist_and_regions.h new file mode 100644 index 0000000000..d8e890b968 --- /dev/null +++ b/libs/ardour/test/test_needing_playlist_and_regions.h @@ -0,0 +1,20 @@ +#include +#include "test_needing_session.h" + +namespace ARDOUR { + class Playlist; + class Source; + class Region; +} + +class TestNeedingPlaylistAndRegions : public TestNeedingSession +{ +public: + virtual void setUp (); + virtual void tearDown (); + +protected: + boost::shared_ptr _playlist; + boost::shared_ptr _source; + boost::shared_ptr _region[16]; +}; diff --git a/libs/ardour/test/test_needing_session.h b/libs/ardour/test/test_needing_session.h index 57acd9287c..c858f035ab 100644 --- a/libs/ardour/test/test_needing_session.h +++ b/libs/ardour/test/test_needing_session.h @@ -1,6 +1,10 @@ #include #include +namespace ARDOUR { + class Session; +} + class TestNeedingSession : public CppUnit::TestFixture { public: diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 43ce7cdb71..782a5b230c 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -424,6 +424,7 @@ def build(bld): testobj.source = ''' test/dummy_lxvst.cc test/test_needing_session.cc + test/test_needing_playlist_and_regions.cc test/bbt_test.cc test/tempo_test.cc test/interpolation_test.cc -- 2.30.2