summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2018-07-25 21:24:38 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2018-08-12 11:13:57 +0200
commitf2fa9543a11fd5551aa619160d5a02b886fb1bbb (patch)
tree6c6adcd10be04aca81b283f82920dbd0b880467e /test
parent7543b64a995c1a2d3eb598c049919729016ba252 (diff)
Rewrite MidiMapParser to use pugixml.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am6
-rw-r--r--test/midimapparsertest.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index a58fba2..7dcfd52 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -230,12 +230,12 @@ configparsertest_SOURCES = \
midimapparsertest_CXXFLAGS = -DOUTPUT=\"midimapparsertest\" \
-I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \
- -I$(top_srcdir)/pugixml/src $(EXPAT_CFLAGS)
-midimapparsertest_LDFLAGS = $(EXPAT_LIBS)
+ -I$(top_srcdir)/pugixml/src
+midimapparsertest_LDFLAGS =
midimapparsertest_SOURCES = \
$(top_srcdir)/hugin/hugin.c \
$(top_srcdir)/src/midimapparser.cc \
- $(top_srcdir)/src/saxparser.cc \
+ $(top_srcdir)/pugixml/src/pugixml.cpp \
scopedfile.cc \
midimapparsertest.cc \
dgtest.cc
diff --git a/test/midimapparsertest.cc b/test/midimapparsertest.cc
index 9af415c..006944c 100644
--- a/test/midimapparsertest.cc
+++ b/test/midimapparsertest.cc
@@ -53,7 +53,7 @@ public:
"</midimap>");
MidiMapParser parser;
- DGUNIT_ASSERT(!parser.parseFile(scoped_file.filename()));
+ DGUNIT_ASSERT(parser.parseFile(scoped_file.filename()));
DGUNIT_ASSERT(parser.midimap.find(54) != parser.midimap.end());
DGUNIT_ASSERT(parser.midimap.find(60) != parser.midimap.end());
@@ -81,7 +81,7 @@ public:
"</midimap>");
MidiMapParser parser;
- DGUNIT_ASSERT(parser.parseFile(scoped_file.filename()));
+ DGUNIT_ASSERT(!parser.parseFile(scoped_file.filename()));
}
};