From bd0e48a876f25751ae7e0d025178b19d773ca00e Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sun, 17 Jun 2018 15:26:07 +0200
Subject: Finished DOMLoader and fixed the broken unit-tests.

---
 test/dgxmlparsertest.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test/dgxmlparsertest.cc')

diff --git a/test/dgxmlparsertest.cc b/test/dgxmlparsertest.cc
index 16bcbd2..30bcfa7 100644
--- a/test/dgxmlparsertest.cc
+++ b/test/dgxmlparsertest.cc
@@ -43,7 +43,7 @@ public:
 	{
 		ScopedFile scoped_file(
 			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<instrument version=\"2.0\" name=\"Snare\">\n" \
+			"<instrument version=\"2.0\" name=\"Snare\" description=\"A nice snare\">\n" \
 			" <channels>\n" \
 			"  <channel name=\"AmbLeft\" main=\"true\"/>\n" \
 			"  <channel name=\"AmbRight\" main=\"false\"/>\n" \
@@ -70,6 +70,8 @@ public:
 		DGUNIT_ASSERT(parseInstrumentFile(scoped_file.filename(), dom));
 
 		DGUNIT_ASSERT_EQUAL(std::string("Snare"), dom.name);
+		DGUNIT_ASSERT_EQUAL(std::string("2.0"), dom.version);
+		DGUNIT_ASSERT_EQUAL(std::string("A nice snare"), dom.description);
 		DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.samples.size());
 
 		{
@@ -130,7 +132,7 @@ public:
 	{
 		ScopedFile scoped_file(
 			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<drumkit name=\"CrocellKit\" description=\"my description\" samplerate=\"48000\" version=\"2.0.0\">\n" \
+			"<drumkit name=\"CrocellKit\" description=\"my description\" samplerate=\"48000\" version=\"2.0\">\n" \
 			"  <channels>\n" \
 			"   <channel name=\"AmbLeft\"/>\n" \
 			"   <channel name=\"AmbRight\"/>\n" \
@@ -158,6 +160,7 @@ public:
 		DGUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), dom));
 
 		DGUNIT_ASSERT_EQUAL(std::string("CrocellKit"), dom.name);
+		DGUNIT_ASSERT_EQUAL(std::string("2.0"), dom.version);
 		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());
-- 
cgit v1.2.3