From 42b477bf24c9edec05489f92f800e7c847884420 Mon Sep 17 00:00:00 2001
From: Leon Vinken <leon.vinken@gmail.com>
Date: Sun, 31 Jan 2016 17:01:36 +0100
Subject: [PATCH] fix mtest/musicxml/io/testUninitializedDivisions and enable
 testWedge2

---
 mtest/musicxml/io/testUninitializedDivisions.xml     | 4 ++--
 mtest/musicxml/io/testUninitializedDivisions_ref.xml | 3 ++-
 mtest/musicxml/io/tst_mxml_io.cpp                    | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mtest/musicxml/io/testUninitializedDivisions.xml b/mtest/musicxml/io/testUninitializedDivisions.xml
index 791f234b01..367f3b562b 100644
--- a/mtest/musicxml/io/testUninitializedDivisions.xml
+++ b/mtest/musicxml/io/testUninitializedDivisions.xml
@@ -20,8 +20,8 @@
       <miscellaneous-field name="description">
         Test a file where divisions is initialized too late: in measure 2.
         Neuratron PhotoScore generates this, making it impossible to calculate
-        the duration of the rest in the first measure. This rest will be ignored
-        on initial import, leading to a measure containing only a hidden rest.
+        the duration of the rest in the first measure (based on divisions).
+        The note type and dots will be used to calculate the duration.
         Attributes divisions, key and clef will be moved to measure 1.
         </miscellaneous-field>
       </miscellaneous>
diff --git a/mtest/musicxml/io/testUninitializedDivisions_ref.xml b/mtest/musicxml/io/testUninitializedDivisions_ref.xml
index 1456046ffc..6d4d88fffb 100644
--- a/mtest/musicxml/io/testUninitializedDivisions_ref.xml
+++ b/mtest/musicxml/io/testUninitializedDivisions_ref.xml
@@ -45,10 +45,11 @@
           <line>2</line>
           </clef>
         </attributes>
-      <note print-object="no">
+      <note>
         <rest/>
         <duration>4</duration>
         <voice>1</voice>
+        <type>whole</type>
         </note>
       </measure>
     <measure number="2">
diff --git a/mtest/musicxml/io/tst_mxml_io.cpp b/mtest/musicxml/io/tst_mxml_io.cpp
index 905c83f735..9f6081b90a 100644
--- a/mtest/musicxml/io/tst_mxml_io.cpp
+++ b/mtest/musicxml/io/tst_mxml_io.cpp
@@ -151,7 +151,7 @@ private slots:
       void tuplets2() { mxmlIoTestRef("testTuplets2"); }
       void tuplets3() { mxmlIoTestRef("testTuplets3"); }
       void tuplets4() { mxmlIoTest("testTuplets4"); }
-      //void uninitializedDivisions() { mxmlIoTestRef("testUninitializedDivisions"); } correct behaviour to be checked
+      void uninitializedDivisions() { mxmlIoTestRef("testUninitializedDivisions"); }
       void unusualDurations() { mxmlIoTestRef("testUnusualDurations"); }
       void virtualInstruments() { mxmlIoTestRef("testVirtualInstruments"); }
       void voiceMapper1() { mxmlIoTestRef("testVoiceMapper1"); }
@@ -160,8 +160,7 @@ private slots:
       void voicePiano1() { mxmlIoTest("testVoicePiano1"); }
       void volta1() { mxmlIoTest("testVolta1"); }
       void wedge1() { mxmlIoTest("testWedge1"); }
-// wedge2 fails: a spanner changes ticks length
-//      void wedge2() { mxmlIoTest("testWedge2"); }
+      void wedge2() { mxmlIoTest("testWedge2"); }
       void words1() { mxmlIoTest("testWords1"); }
       void words2() { mxmlIoTest("testWords2"); }
       };