summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2016-03-29 22:34:26 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2016-03-29 22:34:26 +0200
commit8ea809500768841ebb9ff225ba7d6927c5252f0e (patch)
tree742336975cbf974e31c7b731638a76f5e1856b37
parent5e6e9d83bc0c04e3721f2674f9a33e172e524b2d (diff)
Adapt memchecker test to the refactored parser classes.
-rw-r--r--test/memcheckertest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/memcheckertest.cc b/test/memcheckertest.cc
index 3a02372..90bd254 100644
--- a/test/memcheckertest.cc
+++ b/test/memcheckertest.cc
@@ -70,8 +70,8 @@ public:
void small_drumkit()
{
// load the small kit
- DrumKitParser parser(small_kit_path, kit);
- CPPUNIT_ASSERT(!parser.parse());
+ DrumKitParser parser(kit);
+ CPPUNIT_ASSERT(!parser.parseFile(small_kit_path));
// check if the memchecker thinks it fits into memory
CPPUNIT_ASSERT(enoughFreeMemory(kit));
@@ -80,8 +80,8 @@ public:
void huge_drumkit()
{
// load the huge kit
- DrumKitParser parser(huge_kit_path, kit);
- CPPUNIT_ASSERT(!parser.parse());
+ DrumKitParser parser(kit);
+ CPPUNIT_ASSERT(!parser.parseFile(huge_kit_path));
// check if the memchecker thinks it doesn't fit into memory
CPPUNIT_ASSERT(!enoughFreeMemory(kit));
@@ -94,8 +94,8 @@ public:
CPPUNIT_ASSERT_EQUAL(bytes_per_channel, calcBytesPerChannel(audiofile));
// load the huge kit
- DrumKitParser parser(huge_kit_path, kit);
- CPPUNIT_ASSERT(!parser.parse());
+ DrumKitParser parser(kit);
+ CPPUNIT_ASSERT(!parser.parseFile(huge_kit_path));
// check if the protected method of the memchecker reports the correct size
uint64_t needed_memory = 71478290000;