From 2abc107b24f73b8c4664189c34196d9a27a3e339 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 16 Jun 2018 18:05:00 +0200 Subject: Port the rest of the unittests to DGUnit and remove the CppUnit dependency. --- test/resource_test.cc | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'test/resource_test.cc') diff --git a/test/resource_test.cc b/test/resource_test.cc index 93dae8b..2e88c45 100644 --- a/test/resource_test.cc +++ b/test/resource_test.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 +#include "dgunit.h" #include "../plugingui/resource.h" @@ -42,37 +42,35 @@ public: } }; -class ResourceTest : public CppUnit::TestFixture +class ResourceTest : public DGUnit { - CPPUNIT_TEST_SUITE(ResourceTest); - CPPUNIT_TEST(externalReadTest); - CPPUNIT_TEST(internalReadTest); - CPPUNIT_TEST_SUITE_END(); +public: + ResourceTest() + { + DGUNIT_TEST(ResourceTest::externalReadTest); + DGUNIT_TEST(ResourceTest::internalReadTest); + } DrumkitCreator drumkit_creator; -public: - void setUp() {} - void tearDown() {} - void externalReadTest() { auto filename = drumkit_creator.create0000Wav("0000.wav"); ResourceTester rc(filename); - CPPUNIT_ASSERT(!rc.probeIsInternal()); - CPPUNIT_ASSERT(rc.valid()); - CPPUNIT_ASSERT_EQUAL((size_t)46, rc.size()); + DGUNIT_ASSERT(!rc.probeIsInternal()); + DGUNIT_ASSERT(rc.valid()); + DGUNIT_ASSERT_EQUAL((size_t)46, rc.size()); } void internalReadTest() { ResourceTester rc(":resources/bg.png"); - CPPUNIT_ASSERT(rc.probeIsInternal()); - CPPUNIT_ASSERT(rc.valid()); - CPPUNIT_ASSERT_EQUAL((size_t)1123, rc.size()); + DGUNIT_ASSERT(rc.probeIsInternal()); + DGUNIT_ASSERT(rc.valid()); + DGUNIT_ASSERT_EQUAL((size_t)1123, rc.size()); } }; // Registers the fixture into the 'registry' -CPPUNIT_TEST_SUITE_REGISTRATION(ResourceTest); +static ResourceTest test; -- cgit v1.2.3