utest fixes

musescore · Apr 14, 2022 · ffae882 · ffae882
1 parent 9393454
commit ffae882
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 76 deletions.
diff --git a/src/engraving/utests/CMakeLists.txt b/src/engraving/utests/CMakeLists.txt
@@ -57,7 +57,6 @@ set(MODULE_TEST_SRC
     ${CMAKE_CURRENT_LIST_DIR}/scantree_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/selectionfilter_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/selectionrangedelete_tests.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/shapes_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/spanners_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/split_tests.cpp
     ${CMAKE_CURRENT_LIST_DIR}/splitstaff_tests.cpp

diff --git a/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx b/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-articulation-ref.mscx
@@ -181,7 +181,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>
@@ -287,7 +287,7 @@
       <Measure>
         <voice>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx b/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-chordnames-ref.mscx
@@ -166,7 +166,7 @@
             <root>15</root>
             </Harmony>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>
@@ -254,7 +254,7 @@
             <root>16</root>
             </Harmony>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx b/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-stafftext-ref.mscx
@@ -186,7 +186,7 @@
             <text>11</text>
             </StaffText>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>
@@ -292,7 +292,7 @@
             <text>5</text>
             </StaffText>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx b/src/engraving/utests/copypastesymbollist_data/copypastesymbollist-sticking-ref.mscx
@@ -186,7 +186,7 @@
             <text>11</text>
             </Sticking>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>
@@ -292,7 +292,7 @@
             <text>5</text>
             </Sticking>
           <Beam>
-            <l1>30</l1>
+            <l1>24</l1>
             <l2>32</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/implode_explode_data/implode1-ref.mscx b/src/engraving/utests/implode_explode_data/implode1-ref.mscx
@@ -483,7 +483,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>102</l1>
+            <l1>100</l1>
             <l2>104</l2>
             </Beam>
           <Chord>
@@ -525,7 +525,7 @@
             </Chord>
           <Beam>
             <l1>100</l1>
-            <l2>98</l2>
+            <l2>96</l2>
             </Beam>
           <Chord>
             <durationType>eighth</durationType>
@@ -1154,7 +1154,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-8</l1>
+            <l1>-6</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/implode_explode_data/implode1.mscx b/src/engraving/utests/implode_explode_data/implode1.mscx
@@ -739,7 +739,7 @@
               </Note>
             </Chord>
           <Beam>
-            <l1>-8</l1>
+            <l1>-6</l1>
             <l2>-10</l2>
             </Beam>
           <Chord>

diff --git a/src/engraving/utests/measure_data/measure-10.mscx b/src/engraving/utests/measure_data/measure-10.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-3.mscx b/src/engraving/utests/measure_data/measure-3.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-4.mscx b/src/engraving/utests/measure_data/measure-4.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-6.mscx b/src/engraving/utests/measure_data/measure-6.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-7.mscx b/src/engraving/utests/measure_data/measure-7.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-8.mscx b/src/engraving/utests/measure_data/measure-8.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/measure_data/measure-9.mscx b/src/engraving/utests/measure_data/measure-9.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/shapes_tests.cpp b/src/engraving/utests/shapes_tests.cpp
diff --git a/src/engraving/utests/transpose_data/undoTranspose.mscx b/src/engraving/utests/transpose_data/undoTranspose.mscx
@@ -10,7 +10,6 @@
       <endBarDistance>0.3</endBarDistance>
       <bracketWidth>0.35</bracketWidth>
       <bracketDistance>0.25</bracketDistance>
-      <minNoteDistance>0.4</minNoteDistance>
       <barNoteDistance>0.6</barNoteDistance>
       <beamWidth>0.48</beamWidth>
       <beamMinLen>1.25</beamMinLen>

diff --git a/src/engraving/utests/tuplet_data/save-load.mscx b/src/engraving/utests/tuplet_data/save-load.mscx
@@ -101,7 +101,6 @@
               <style>tuplet</style>
               <text>3</text>
               </Number>
-            <size>4</size>
             </Tuplet>
           <Beam>
             <l1>38</l1>
@@ -137,9 +136,6 @@
               <style>tuplet</style>
               <text>3</text>
               </Number>
-            <size>12</size>
-            <italic>0</italic>
-            <underline>1</underline>
             </Tuplet>
           <Beam>
             <l1>38</l1>
@@ -177,7 +173,6 @@
               </Number>
             <bracketType>1</bracketType>
             <lineWidth>0.6</lineWidth>
-            <size>11</size>
             </Tuplet>
           <Beam>
             <l1>38</l1>
@@ -215,7 +210,6 @@
               </Number>
             <numberType>1</numberType>
             <bracketType>1</bracketType>
-            <size>15</size>
             </Tuplet>
           <Beam>
             <l1>38</l1>