From 8dd1ea54a2d2198004c82fe75b45714917b440a1 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 17 Jun 2018 10:31:17 +0200 Subject: Port tests to DGUnit. --- test/dgxmlparsertest.cc | 205 +++++++++++++++++++++++------------------------- 1 file changed, 99 insertions(+), 106 deletions(-) (limited to 'test/dgxmlparsertest.cc') 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 +#include "dgunit.h" #include #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: ""); 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: ""); 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; -- cgit v1.2.3