Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / test / playlist_layering_test.h

diff --git a/libs/ardour/test/playlist_layering_test.h b/libs/ardour/test/playlist_layering_test.h
index 7757e017c4f3b72416741d0664f7529676a52dad..859fe6581b5a72e7a58060955203c047629f8a32 100644 (file)
--- a/libs/ardour/test/playlist_layering_test.h
+++ b/libs/ardour/test/playlist_layering_test.h
@@ -1,31 +1,29 @@
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
+/*
+    Copyright (C) 2012 Paul Davis
 
-namespace ARDOUR {
-       class Session;
-       class Playlist;
-       class Source;
-}
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-class PlaylistLayeringTest : public CppUnit::TestFixture
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "audio_region_test.h"
+
+class PlaylistLayeringTest : public AudioRegionTest
 {
        CPPUNIT_TEST_SUITE (PlaylistLayeringTest);
-       CPPUNIT_TEST (addHigherTest);
-       CPPUNIT_TEST (moveAddHigherTest);
+       CPPUNIT_TEST (basicsTest);
        CPPUNIT_TEST_SUITE_END ();
 
 public:
-       void setUp ();
-       void tearDown ();
-
-       void addHigherTest ();
-       void moveAddHigherTest ();
-
-private:
-       void create_three_short_regions ();
-       
-       ARDOUR::Session* _session;
-       boost::shared_ptr<ARDOUR::Playlist> _playlist;
-       boost::shared_ptr<ARDOUR::Source> _source;
-       boost::shared_ptr<ARDOUR::Region> _region[16];
+       void basicsTest ();
 };