diff options
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/dgxmlparsertest.cc | 205 | ||||
| -rw-r--r-- | test/domloadertest.cc | 139 |
3 files changed, 171 insertions, 185 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 47a740d..1e3980a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -214,26 +214,26 @@ drumkitparsertest_SOURCES = \ scopedfile.cc \ dgtest.cc -dgxmlparsertest_CXXFLAGS = -DOUTPUT=\"dgxmlparsertest\" $(CPPUNIT_CFLAGS) \ +dgxmlparsertest_CXXFLAGS = -DOUTPUT=\"dgxmlparsertest\" \ -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \ -I$(top_srcdir)/pugixml/src -dgxmlparsertest_LDFLAGS = $(CPPUNIT_LIBS) +dgxmlparsertest_LDFLAGS = dgxmlparsertest_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ $(top_srcdir)/src/dgxmlparser.cc \ $(top_srcdir)/pugixml/src/pugixml.cpp \ dgxmlparsertest.cc \ scopedfile.cc \ - test.cc + dgtest.cc -domloadertest_CXXFLAGS = -DOUTPUT=\"domloadertest\" $(CPPUNIT_CFLAGS) \ +domloadertest_CXXFLAGS = -DOUTPUT=\"domloadertest\" \ -I$(top_srcdir)/src -I$(top_srcdir)/include -domloadertest_LDFLAGS = $(CPPUNIT_LIBS) \ +domloadertest_LDFLAGS = \ $(top_srcdir)/src/libdg.la domloadertest_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ domloadertest.cc \ scopedfile.cc \ - test.cc + dgtest.cc endif diff --git a/test/dgxmlparsertest.cc b/test/dgxmlparsertest.cc index cee034b..16bcbd2 100644 --- a/test/dgxmlparsertest.cc +++ b/test/dgxmlparsertest.cc @@ -24,26 +24,19 @@ * 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 <dgxmlparser.h> #include "scopedfile.h" class DGXmlParserTest - : public CppUnit::TestFixture + : public DGUnit { - CPPUNIT_TEST_SUITE(DGXmlParserTest); - CPPUNIT_TEST(instrumentParserTest); - CPPUNIT_TEST(drumkitParserTest); - CPPUNIT_TEST_SUITE_END(); - public: - void setUp() - { - } - - void tearDown() + DGXmlParserTest() { + DGUNIT_TEST(DGXmlParserTest::instrumentParserTest); + DGUNIT_TEST(DGXmlParserTest::drumkitParserTest); } void instrumentParserTest() @@ -73,64 +66,64 @@ public: "</instrument>"); InstrumentDOM dom; - CPPUNIT_ASSERT(probeInstrumentFile(scoped_file.filename())); - CPPUNIT_ASSERT(parseInstrumentFile(scoped_file.filename(), dom)); + DGUNIT_ASSERT(probeInstrumentFile(scoped_file.filename())); + DGUNIT_ASSERT(parseInstrumentFile(scoped_file.filename(), dom)); - CPPUNIT_ASSERT_EQUAL(std::string("Snare"), dom.name); - CPPUNIT_ASSERT_EQUAL(std::size_t(2), dom.samples.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare"), dom.name); + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.samples.size()); { const auto& s = dom.samples[0]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-1"), s.name); - CPPUNIT_ASSERT_EQUAL(0.00985718, s.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), s.name); + DGUNIT_ASSERT_EQUAL(0.00985718, s.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[0].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[0].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[1].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(2), s.audiofiles[1].filechannel); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[1].file); + DGUNIT_ASSERT_EQUAL(std::size_t(2), s.audiofiles[1].filechannel); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[2].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(12), s.audiofiles[2].filechannel); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[2].file); + DGUNIT_ASSERT_EQUAL(std::size_t(12), s.audiofiles[2].filechannel); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[3].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(13), s.audiofiles[3].filechannel); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare.wav"), s.audiofiles[3].file); + DGUNIT_ASSERT_EQUAL(std::size_t(13), s.audiofiles[3].filechannel); } { const auto& s = dom.samples[1]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-2"), s.name); - CPPUNIT_ASSERT_EQUAL(0.0124808, s.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[0].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); - - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[1].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(2), s.audiofiles[1].filechannel); - - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[2].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(12), s.audiofiles[2].filechannel); - - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); - CPPUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[3].file); - CPPUNIT_ASSERT_EQUAL(std::size_t(13), s.audiofiles[3].filechannel); + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), s.name); + DGUNIT_ASSERT_EQUAL(0.0124808, s.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[0].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[1].file); + DGUNIT_ASSERT_EQUAL(std::size_t(2), s.audiofiles[1].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[2].file); + DGUNIT_ASSERT_EQUAL(std::size_t(12), s.audiofiles[2].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare.wav"), s.audiofiles[3].file); + DGUNIT_ASSERT_EQUAL(std::size_t(13), s.audiofiles[3].filechannel); } - CPPUNIT_ASSERT_EQUAL(std::size_t(3), dom.instrument_channels.size()); - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), dom.instrument_channels[0].name); - CPPUNIT_ASSERT(main_state_t::is_main == dom.instrument_channels[0].main); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), dom.instrument_channels[1].name); - CPPUNIT_ASSERT(main_state_t::is_not_main == dom.instrument_channels[1].main); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), dom.instrument_channels[2].name); - CPPUNIT_ASSERT(main_state_t::unset == dom.instrument_channels[2].main); + DGUNIT_ASSERT_EQUAL(std::size_t(3), dom.instrument_channels.size()); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), dom.instrument_channels[0].name); + DGUNIT_ASSERT(main_state_t::is_main == dom.instrument_channels[0].main); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), dom.instrument_channels[1].name); + DGUNIT_ASSERT(main_state_t::is_not_main == dom.instrument_channels[1].main); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), dom.instrument_channels[2].name); + DGUNIT_ASSERT(main_state_t::unset == dom.instrument_channels[2].main); } void drumkitParserTest() @@ -161,65 +154,65 @@ public: "</drumkit>"); DrumkitDOM dom; - CPPUNIT_ASSERT(probeDrumkitFile(scoped_file.filename())); - CPPUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), dom)); + DGUNIT_ASSERT(probeDrumkitFile(scoped_file.filename())); + DGUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), dom)); - CPPUNIT_ASSERT_EQUAL(std::string("CrocellKit"), dom.name); - CPPUNIT_ASSERT_EQUAL(std::string("my description"), dom.description); - CPPUNIT_ASSERT_EQUAL(48000.0, dom.samplerate); - CPPUNIT_ASSERT_EQUAL(std::size_t(2), dom.instruments.size()); + DGUNIT_ASSERT_EQUAL(std::string("CrocellKit"), dom.name); + DGUNIT_ASSERT_EQUAL(std::string("my description"), dom.description); + DGUNIT_ASSERT_EQUAL(48000.0, dom.samplerate); + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.instruments.size()); { const auto& instr = dom.instruments[0]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare1"), instr.name); - CPPUNIT_ASSERT_EQUAL(std::string("foo.wav"), instr.file); - CPPUNIT_ASSERT_EQUAL(std::string("somegroup"), instr.group); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), instr.channel_map.size()); - - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft-in"), instr.channel_map[0].in); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight-in"), instr.channel_map[1].in); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop-in"), instr.channel_map[2].in); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom-in"), instr.channel_map[3].in); - - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), instr.channel_map[0].out); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), instr.channel_map[1].out); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), instr.channel_map[2].out); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), instr.channel_map[3].out); - - CPPUNIT_ASSERT(main_state_t::is_main == instr.channel_map[0].main); - CPPUNIT_ASSERT(main_state_t::is_main == instr.channel_map[1].main); - CPPUNIT_ASSERT(main_state_t::unset == instr.channel_map[2].main); - CPPUNIT_ASSERT(main_state_t::unset == instr.channel_map[3].main); + DGUNIT_ASSERT_EQUAL(std::string("Snare1"), instr.name); + DGUNIT_ASSERT_EQUAL(std::string("foo.wav"), instr.file); + DGUNIT_ASSERT_EQUAL(std::string("somegroup"), instr.group); + DGUNIT_ASSERT_EQUAL(std::size_t(4), instr.channel_map.size()); + + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft-in"), instr.channel_map[0].in); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight-in"), instr.channel_map[1].in); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop-in"), instr.channel_map[2].in); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom-in"), instr.channel_map[3].in); + + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), instr.channel_map[0].out); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), instr.channel_map[1].out); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), instr.channel_map[2].out); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), instr.channel_map[3].out); + + DGUNIT_ASSERT(main_state_t::is_main == instr.channel_map[0].main); + DGUNIT_ASSERT(main_state_t::is_main == instr.channel_map[1].main); + DGUNIT_ASSERT(main_state_t::unset == instr.channel_map[2].main); + DGUNIT_ASSERT(main_state_t::unset == instr.channel_map[3].main); } { const auto& instr = dom.instruments[1]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare2"), instr.name); - CPPUNIT_ASSERT_EQUAL(std::string("bar.wav"), instr.file); - CPPUNIT_ASSERT_EQUAL(std::string(""), instr.group); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), instr.channel_map.size()); - - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft2-in"), instr.channel_map[0].in); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight2-in"), instr.channel_map[1].in); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop2-in"), instr.channel_map[2].in); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom2-in"), instr.channel_map[3].in); - - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), instr.channel_map[0].out); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), instr.channel_map[1].out); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), instr.channel_map[2].out); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), instr.channel_map[3].out); - - CPPUNIT_ASSERT(main_state_t::is_not_main == instr.channel_map[0].main); - CPPUNIT_ASSERT(main_state_t::is_not_main == instr.channel_map[1].main); - CPPUNIT_ASSERT(main_state_t::unset == instr.channel_map[2].main); - CPPUNIT_ASSERT(main_state_t::unset == instr.channel_map[3].main); + DGUNIT_ASSERT_EQUAL(std::string("Snare2"), instr.name); + DGUNIT_ASSERT_EQUAL(std::string("bar.wav"), instr.file); + DGUNIT_ASSERT_EQUAL(std::string(""), instr.group); + DGUNIT_ASSERT_EQUAL(std::size_t(4), instr.channel_map.size()); + + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft2-in"), instr.channel_map[0].in); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight2-in"), instr.channel_map[1].in); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop2-in"), instr.channel_map[2].in); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom2-in"), instr.channel_map[3].in); + + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), instr.channel_map[0].out); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), instr.channel_map[1].out); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), instr.channel_map[2].out); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), instr.channel_map[3].out); + + DGUNIT_ASSERT(main_state_t::is_not_main == instr.channel_map[0].main); + DGUNIT_ASSERT(main_state_t::is_not_main == instr.channel_map[1].main); + DGUNIT_ASSERT(main_state_t::unset == instr.channel_map[2].main); + DGUNIT_ASSERT(main_state_t::unset == instr.channel_map[3].main); } - CPPUNIT_ASSERT_EQUAL(std::size_t(4), dom.channels.size()); - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), dom.channels[0].name); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), dom.channels[1].name); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), dom.channels[2].name); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), dom.channels[3].name); + DGUNIT_ASSERT_EQUAL(std::size_t(4), dom.channels.size()); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), dom.channels[0].name); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), dom.channels[1].name); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), dom.channels[2].name); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), dom.channels[3].name); } }; // Registers the fixture into the 'registry' -CPPUNIT_TEST_SUITE_REGISTRATION(DGXmlParserTest); +static DGXmlParserTest test; diff --git a/test/domloadertest.cc b/test/domloadertest.cc index bb8bb06..2c9c5eb 100644 --- a/test/domloadertest.cc +++ b/test/domloadertest.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 <DGDOM.h> #include <domloader.h> @@ -36,23 +36,16 @@ #include "scopedfile.h" class DOMLoaderTest - : public CppUnit::TestFixture + : public DGUnit { - CPPUNIT_TEST_SUITE(DOMLoaderTest); - CPPUNIT_TEST(testTest); - CPPUNIT_TEST_SUITE_END(); - - Settings settings; - Random random; - public: - void setUp() + DOMLoaderTest() { + DGUNIT_TEST(DOMLoaderTest::testTest); } - void tearDown() - { - } + Settings settings; + Random random; //! This just creates some drumkit. void testTest() @@ -125,76 +118,76 @@ public: DrumkitDOM drumkitdom; std::vector<InstrumentDOM> instrumentdoms; - CPPUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), drumkitdom)); + DGUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), drumkitdom)); for(const auto& ref: drumkitdom.instruments) { instrumentdoms.emplace_back(); - CPPUNIT_ASSERT(parseInstrumentFile(ref.file, instrumentdoms.back())); + DGUNIT_ASSERT(parseInstrumentFile(ref.file, instrumentdoms.back())); } DOMLoader domloader(settings, random); - CPPUNIT_ASSERT(domloader.loadDom(drumkitdom, instrumentdoms, drumkit)); + DGUNIT_ASSERT(domloader.loadDom(drumkitdom, instrumentdoms, drumkit)); // // Drumkit: // - CPPUNIT_ASSERT_EQUAL(std::size_t(2), drumkit.instruments.size()); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), drumkit.channels.size()); + DGUNIT_ASSERT_EQUAL(std::size_t(2), drumkit.instruments.size()); + DGUNIT_ASSERT_EQUAL(std::size_t(4), drumkit.channels.size()); - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), drumkit.channels[0].name); - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), drumkit.channels[1].name); - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), drumkit.channels[2].name); - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), drumkit.channels[3].name); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), drumkit.channels[0].name); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), drumkit.channels[1].name); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), drumkit.channels[2].name); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), drumkit.channels[3].name); - CPPUNIT_ASSERT_EQUAL(std::string("CrocellKit"), drumkit._name); - CPPUNIT_ASSERT_EQUAL(std::string("my description"), drumkit._description); - CPPUNIT_ASSERT_EQUAL(std::size_t(48000), drumkit._samplerate); + DGUNIT_ASSERT_EQUAL(std::string("CrocellKit"), drumkit._name); + DGUNIT_ASSERT_EQUAL(std::string("my description"), drumkit._description); + DGUNIT_ASSERT_EQUAL(std::size_t(48000), drumkit._samplerate); - CPPUNIT_ASSERT(VersionStr("2.0.0") == drumkit._version); + DGUNIT_ASSERT(VersionStr("2.0.0") == drumkit._version); // // Instrument1 'Snare1': // { auto& instrument = *drumkit.instruments[0]; - CPPUNIT_ASSERT_EQUAL(std::string(""), instrument._group); - CPPUNIT_ASSERT_EQUAL(std::string("Snare"), instrument._name); - CPPUNIT_ASSERT_EQUAL(std::string(""), instrument._description); + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._group); + DGUNIT_ASSERT_EQUAL(std::string("Snare"), instrument._name); + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._description); - CPPUNIT_ASSERT(VersionStr("2.0.0") == instrument.version); + DGUNIT_ASSERT(VersionStr("2.0.0") == instrument.version); // NOTE: instrument.samples are the sample map belonging to version 1.0 - CPPUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); + DGUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); { const auto& sample = *instrument.samplelist[0]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); - CPPUNIT_ASSERT_EQUAL(0.00985718f, sample.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); + DGUNIT_ASSERT_EQUAL(0.00985718f, sample.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); for(const auto& audiofile : sample.audiofiles) { - CPPUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare.wav"), audiofile.second->filename); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare.wav"), audiofile.second->filename); switch(audiofile.second->filechannel) { // NOTE: Channel numbers are zero based - they are 1 based in the xml case 0: - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), audiofile.second->instrument_channel->name); break; case 1: - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), audiofile.second->instrument_channel->name); break; case 11: - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), audiofile.second->instrument_channel->name); break; case 12: - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), audiofile.second->instrument_channel->name); break; default: - CPPUNIT_ASSERT(false); + DGUNIT_ASSERT(false); break; } } @@ -202,33 +195,33 @@ public: { const auto& sample = *instrument.samplelist[1]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); - CPPUNIT_ASSERT_EQUAL(0.0124808f, sample.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); + DGUNIT_ASSERT_EQUAL(0.0124808f, sample.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); for(const auto& audiofile : sample.audiofiles) { - CPPUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare.wav"), audiofile.second->filename); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare.wav"), audiofile.second->filename); switch(audiofile.second->filechannel) { // NOTE: Channel numbers are zero based - they are 1 based in the xml case 0: - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), audiofile.second->instrument_channel->name); break; case 1: - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), audiofile.second->instrument_channel->name); break; case 11: - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), audiofile.second->instrument_channel->name); break; case 12: - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), audiofile.second->instrument_channel->name); break; default: - CPPUNIT_ASSERT(false); + DGUNIT_ASSERT(false); break; } } @@ -241,43 +234,43 @@ public: { auto& instrument = *drumkit.instruments[1]; - CPPUNIT_ASSERT_EQUAL(std::string(""), instrument._group); - CPPUNIT_ASSERT_EQUAL(std::string("Snare"), instrument._name); - CPPUNIT_ASSERT_EQUAL(std::string(""), instrument._description); + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._group); + DGUNIT_ASSERT_EQUAL(std::string("Snare"), instrument._name); + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._description); - CPPUNIT_ASSERT(VersionStr("2.0.0") == instrument.version); + DGUNIT_ASSERT(VersionStr("2.0.0") == instrument.version); // NOTE: instrument.samples are the sample map belonging to version 1.0 - CPPUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); + DGUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); { const auto& sample = *instrument.samplelist[0]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); - CPPUNIT_ASSERT_EQUAL(0.00985718f, sample.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); + DGUNIT_ASSERT_EQUAL(0.00985718f, sample.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); for(const auto& audiofile : sample.audiofiles) { - CPPUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare.wav"), audiofile.second->filename); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare.wav"), audiofile.second->filename); switch(audiofile.second->filechannel) { // NOTE: Channel numbers are zero based - they are 1 based in the xml case 0: - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), audiofile.second->instrument_channel->name); break; case 1: - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), audiofile.second->instrument_channel->name); break; case 11: - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), audiofile.second->instrument_channel->name); break; case 12: - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), audiofile.second->instrument_channel->name); break; default: - CPPUNIT_ASSERT(false); + DGUNIT_ASSERT(false); break; } } @@ -285,33 +278,33 @@ public: { const auto& sample = *instrument.samplelist[1]; - CPPUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); - CPPUNIT_ASSERT_EQUAL(0.0124808f, sample.power); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); + DGUNIT_ASSERT_EQUAL(0.0124808f, sample.power); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); for(const auto& audiofile : sample.audiofiles) { - CPPUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare.wav"), audiofile.second->filename); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare.wav"), audiofile.second->filename); switch(audiofile.second->filechannel) { // NOTE: Channel numbers are zero based - they are 1 based in the xml case 0: - CPPUNIT_ASSERT_EQUAL(std::string("AmbLeft"), + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), audiofile.second->instrument_channel->name); break; case 1: - CPPUNIT_ASSERT_EQUAL(std::string("AmbRight"), + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), audiofile.second->instrument_channel->name); break; case 11: - CPPUNIT_ASSERT_EQUAL(std::string("SnareBottom"), + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), audiofile.second->instrument_channel->name); break; case 12: - CPPUNIT_ASSERT_EQUAL(std::string("SnareTop"), + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), audiofile.second->instrument_channel->name); break; default: - CPPUNIT_ASSERT(false); + DGUNIT_ASSERT(false); break; } } @@ -321,4 +314,4 @@ public: }; // Registers the fixture into the 'registry' -CPPUNIT_TEST_SUITE_REGISTRATION(DOMLoaderTest); +static DOMLoaderTest test; |