Add/update tests for MMRests and MeasureRepeats

MMRests: - Add vtests for old-style (all fonts), h-bar thickness and margin (Bravura) MeasureRepeats: - Add script tests for adding, cutting/copying with partial group selected, pasting into group, repeating selection from before group, executing split/join/insert/delete measure commands, adding repeat barlines, and adding time signature - Add mtests for parts, MIDI, and MusicXML import/export - Add vtests - Update ref files
musescore · Aug 28, 2020 · 357a177 · 357a177
1 parent 5745274
commit 357a177
Show file tree

Hide file tree

Showing 65 changed files with 26,010 additions and 797 deletions.
diff --git a/mtest/guitarpro/repeated-bars.gp-ref.mscx b/mtest/guitarpro/repeated-bars.gp-ref.mscx
@@ -127,12 +127,15 @@
           </voice>
         </Measure>
       <Measure>
+        <measureRepeatCount>1</measureRepeatCount>
         <voice>
-          <RepeatMeasure>
+          <MeasureRepeat>
+            <subtype>1</subtype>
+            <autoplace>0</autoplace>
             <linkedMain/>
             <durationType>measure</durationType>
             <duration>4/4</duration>
-            </RepeatMeasure>
+            </MeasureRepeat>
           </voice>
         </Measure>
       </Staff>
@@ -296,13 +299,16 @@
             </voice>
           </Measure>
         <Measure>
+          <measureRepeatCount>1</measureRepeatCount>
           <voice>
-            <RepeatMeasure>
+            <MeasureRepeat>
+              <subtype>1</subtype>
+              <autoplace>0</autoplace>
               <linked>
                 </linked>
               <durationType>measure</durationType>
               <duration>4/4</duration>
-              </RepeatMeasure>
+              </MeasureRepeat>
             </voice>
           </Measure>
         </Staff>
@@ -372,13 +378,16 @@
             </voice>
           </Measure>
         <Measure>
+          <measureRepeatCount>1</measureRepeatCount>
           <voice>
-            <RepeatMeasure>
+            <MeasureRepeat>
+              <subtype>1</subtype>
+              <autoplace>0</autoplace>
               <linked>
                 </linked>
               <durationType>measure</durationType>
               <duration>4/4</duration>
-              </RepeatMeasure>
+              </MeasureRepeat>
             </voice>
           </Measure>
         </Staff>

diff --git a/mtest/guitarpro/repeated-bars.gpx-ref.mscx b/mtest/guitarpro/repeated-bars.gpx-ref.mscx
@@ -176,12 +176,15 @@
           </voice>
         </Measure>
       <Measure>
+        <measureRepeatCount>1</measureRepeatCount>
         <voice>
-          <RepeatMeasure>
+          <MeasureRepeat>
+            <subtype>1</subtype>
+            <autoplace>0</autoplace>
             <linkedMain/>
             <durationType>measure</durationType>
             <duration>4/4</duration>
-            </RepeatMeasure>
+            </MeasureRepeat>
           </voice>
         </Measure>
       </Staff>
@@ -394,13 +397,16 @@
             </voice>
           </Measure>
         <Measure>
+          <measureRepeatCount>1</measureRepeatCount>
           <voice>
-            <RepeatMeasure>
+            <MeasureRepeat>
+              <subtype>1</subtype>
+              <autoplace>0</autoplace>
               <linked>
                 </linked>
               <durationType>measure</durationType>
               <duration>4/4</duration>
-              </RepeatMeasure>
+              </MeasureRepeat>
             </voice>
           </Measure>
         </Staff>
@@ -470,13 +476,16 @@
             </voice>
           </Measure>
         <Measure>
+          <measureRepeatCount>1</measureRepeatCount>
           <voice>
-            <RepeatMeasure>
+            <MeasureRepeat>
+              <subtype>1</subtype>
+              <autoplace>0</autoplace>
               <linked>
                 </linked>
               <durationType>measure</durationType>
               <duration>4/4</duration>
-              </RepeatMeasure>
+              </MeasureRepeat>
             </voice>
           </Measure>
         </Staff>

diff --git a/mtest/libmscore/all_elements/tst_layout_elements.cpp b/mtest/libmscore/all_elements/tst_layout_elements.cpp
@@ -14,6 +14,7 @@
 #include "mtest/testutils.h"
 #include "libmscore/measure.h"
 #include "libmscore/page.h"
+#include "libmscore/rest.h"
 #include "libmscore/score.h"
 #include "libmscore/staff.h"
 #include "libmscore/system.h"
@@ -81,6 +82,10 @@ static void isLayoutDone(void* data, Element* e)
             return;
         }
     }
+    if (e->isRest() && toRest(e)->shouldNotBeDrawn()) {
+        // another valid exception
+        return;
+    }
     // If layout of element is done it (usually?) has a valid
     // bounding box (bbox).
     if (e->visible() && !e->bbox().isValid()) {

diff --git a/mtest/libmscore/compat206/markers-ref.mscx b/mtest/libmscore/compat206/markers-ref.mscx
@@ -305,11 +305,14 @@
           </voice>
         </Measure>
       <Measure>
+        <measureRepeatCount>1</measureRepeatCount>
         <voice>
-          <RepeatMeasure>
+          <MeasureRepeat>
+            <subtype>1</subtype>
+            <autoplace>0</autoplace>
             <durationType>measure</durationType>
             <duration>4/4</duration>
-            </RepeatMeasure>
+            </MeasureRepeat>
           <BarLine>
             <subtype>end</subtype>
             </BarLine>

diff --git a/mtest/libmscore/element/tst_element.cpp b/mtest/libmscore/element/tst_element.cpp
@@ -67,7 +67,7 @@ void TestElement::testIds()
         ElementType::LAYOUT_BREAK,
         ElementType::MARKER,
         ElementType::JUMP,
-        ElementType::REPEAT_MEASURE,
+        ElementType::MEASURE_REPEAT,
         ElementType::ICON,
         ElementType::NOTE,
         ElementType::SYMBOL,

diff --git a/mtest/libmscore/midi/testMeasureRepeats-ref.mid b/mtest/libmscore/midi/testMeasureRepeats-ref.mid