1 files changed, 24 insertions, 26 deletions

diff --git a/test/audiocacheidmanagertest.cc b/test/audiocacheidmanagertest.cc
index 74aaaf6..75a7c51 100644
--- a/test/audiocacheidmanagertest.cc
+++ b/test/audiocacheidmanagertest.cc
@@ -24,7 +24,7 @@
  *  along with DrumGizmo; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include <cppunit/extensions/HelperMacros.h>
+#include "dgunit.h"
 
 #include <audiocacheidmanager.h>
 
@@ -39,15 +39,13 @@ public:
 };
 
 class AudioCacheIDManagerTest
-	: public CppUnit::TestFixture
+	: public DGUnit
 {
-	CPPUNIT_TEST_SUITE(AudioCacheIDManagerTest);
-	CPPUNIT_TEST(registerReleaseTest);
-	CPPUNIT_TEST_SUITE_END();
-
 public:
-	void setUp() {}
-	void tearDown() {}
+	AudioCacheIDManagerTest()
+	{
+		DGUNIT_TEST(AudioCacheIDManagerTest::registerReleaseTest);
+	}
 
 	void registerReleaseTest()
 	{
@@ -56,46 +54,46 @@ public:
 
 		cache_t c1; c1.afile = (AudioCacheFile*)1;
 		auto id1 = manager.registerID(c1);
-		CPPUNIT_ASSERT(id1 != CACHE_DUMMYID);
-		CPPUNIT_ASSERT(id1 != CACHE_NOID);
-		CPPUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
+		DGUNIT_ASSERT(id1 != CACHE_DUMMYID);
+		DGUNIT_ASSERT(id1 != CACHE_NOID);
+		DGUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
 
 		cache_t c2; c2.afile = (AudioCacheFile*)2;
 		auto id2 = manager.registerID(c2);
-		CPPUNIT_ASSERT(id2 != CACHE_DUMMYID);
-		CPPUNIT_ASSERT(id2 != CACHE_NOID);
-		CPPUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
+		DGUNIT_ASSERT(id2 != CACHE_DUMMYID);
+		DGUNIT_ASSERT(id2 != CACHE_NOID);
+		DGUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
 
 		cache_t c3; c3.afile = (AudioCacheFile*)3;
 		auto id3 = manager.registerID(c3);
-		CPPUNIT_ASSERT(id3 == CACHE_DUMMYID);
-		CPPUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
+		DGUNIT_ASSERT(id3 == CACHE_DUMMYID);
+		DGUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
 
 		cache_t& tc1 = manager.getCache(id1);
-		CPPUNIT_ASSERT_EQUAL(c1.afile, tc1.afile);
+		DGUNIT_ASSERT_EQUAL(c1.afile, tc1.afile);
 
 		cache_t& tc2 = manager.getCache(id2);
-		CPPUNIT_ASSERT_EQUAL(c2.afile, tc2.afile);
+		DGUNIT_ASSERT_EQUAL(c2.afile, tc2.afile);
 
 		manager.releaseID(id1);
-		CPPUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
+		DGUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
 
 		cache_t c4; c4.afile = (AudioCacheFile*)4;
 		auto id4 = manager.registerID(c4);
-		CPPUNIT_ASSERT(id4 != CACHE_DUMMYID);
-		CPPUNIT_ASSERT(id4 != CACHE_NOID);
-		CPPUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
+		DGUNIT_ASSERT(id4 != CACHE_DUMMYID);
+		DGUNIT_ASSERT(id4 != CACHE_NOID);
+		DGUNIT_ASSERT_EQUAL(0, manager.getAvailableIDs());
 
 		cache_t& tc4 = manager.getCache(id4);
-		CPPUNIT_ASSERT_EQUAL(c4.afile, tc4.afile);
+		DGUNIT_ASSERT_EQUAL(c4.afile, tc4.afile);
 
 		manager.releaseID(id2);
-		CPPUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
+		DGUNIT_ASSERT_EQUAL(1, manager.getAvailableIDs());
 
 		manager.releaseID(id4);
-		CPPUNIT_ASSERT_EQUAL(2, manager.getAvailableIDs());
+		DGUNIT_ASSERT_EQUAL(2, manager.getAvailableIDs());
 	}
 };
 
 // Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION(AudioCacheIDManagerTest);
+static AudioCacheIDManagerTest test;