Fix/Update tests

musescore · Nov 29, 2024 · 006e7f5 · 006e7f5
1 parent 0fa1c97
commit 006e7f5
Show file tree

Hide file tree

Showing 78 changed files with 678 additions and 810 deletions.
diff --git a/src/engraving/tests/all_elements_data/random_elements.mscx b/src/engraving/tests/all_elements_data/random_elements.mscx
diff --git a/src/engraving/tests/chordsymbol_data/add-part-ref.mscx b/src/engraving/tests/chordsymbol_data/add-part-ref.mscx
@@ -104,7 +104,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>68719476740</eid>
       <name>Classical Guitar</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/chordsymbol_data/no-system-ref.mscx b/src/engraving/tests/chordsymbol_data/no-system-ref.mscx
@@ -203,7 +203,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>261993005060</eid>
       <name>Flute</name>
       <Division>480</Division>
       <Style>
@@ -314,7 +313,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>438086664196</eid>
       <name>Alto Saxophone</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx b/src/engraving/tests/chordsymbol_data/transpose-part-ref.mscx
@@ -125,7 +125,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>94489280516</eid>
       <name>Flute</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/compat206_data/articulations-double-ref.mscx b/src/engraving/tests/compat206_data/articulations-double-ref.mscx
@@ -1808,7 +1808,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>3929895075844</eid>
       <name>Piano</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/compat206_data/hairpin-ref.mscx b/src/engraving/tests/compat206_data/hairpin-ref.mscx
@@ -594,7 +594,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1065151889412</eid>
       <name>Piano</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/compat206_data/lidemptytext-ref.mscx b/src/engraving/tests/compat206_data/lidemptytext-ref.mscx
@@ -227,7 +227,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>227633266692</eid>
       <name>Bass</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/compat206_data/userstylesparts-ref.mscx b/src/engraving/tests/compat206_data/userstylesparts-ref.mscx
@@ -379,7 +379,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>219043332100</eid>
       <name>Piano</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -616,7 +615,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>373662154756</eid>
       <name>Flute 1</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>
@@ -876,7 +874,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>536870912004</eid>
       <name>Flute 2</name>
       <initialPartId>3</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/copypaste_data/copypaste_parts-ref.mscx b/src/engraving/tests/copypaste_data/copypaste_parts-ref.mscx
@@ -837,7 +837,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>867583393796</eid>
       <name>Flute</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/eid_tests.cpp b/src/engraving/tests/eid_tests.cpp
@@ -37,7 +37,7 @@ class Engraving_EIDTests : public ::testing::Test
 {
 };
 
-static void itemShouldBeRegistered(void*, EngravingItem* item)
+static void checkRegister(void*, EngravingItem* item)
 {
     EID eid = item->eid();
     if (eid.isValid()) {
@@ -55,9 +55,9 @@ TEST_F(Engraving_EIDTests, testRegisteredItems)
     MasterScore* score = ScoreRW::readScore(DATA_DIR + u"random_elements.mscx");
     EXPECT_TRUE(score);
 
-    score->scanElements(nullptr, itemShouldBeRegistered, true);
+    score->scanElements(nullptr, checkRegister, true);
     for (MeasureBase* mb = score->first(); mb; mb = mb->next()) {
-        itemShouldBeRegistered(nullptr, mb);
+        checkRegister(nullptr, mb);
     }
 
     delete score;

diff --git a/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx b/src/engraving/tests/exchangevoices_data/undoChangeVoice01-ref.mscx
@@ -557,7 +557,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>798863917060</eid>
       <name>Piano</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx b/src/engraving/tests/exchangevoices_data/undoChangeVoice02-ref.mscx
@@ -541,7 +541,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>798863917060</eid>
       <name>Piano</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/measure_data/measureSplit-ref.mscx b/src/engraving/tests/measure_data/measureSplit-ref.mscx
@@ -1289,7 +1289,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>3062311682052</eid>
       <name>Flute</name>
       <Division>480</Division>
       <Style>
@@ -1993,7 +1992,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>4831838208004</eid>
       <name>Oboe</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/linked-ties-parts.mscx b/src/engraving/tests/parts_data/linked-ties-parts.mscx
@@ -396,7 +396,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>558345748484</eid>
       <name>Flute</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-54346-parts.mscx b/src/engraving/tests/parts_data/part-54346-parts.mscx
@@ -273,7 +273,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>399431958532</eid>
       <name>B♭ Trumpet</name>
       <Division>480</Division>
       <Style>
@@ -452,7 +451,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>670014898180</eid>
       <name>C Trumpet</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-all-appendmeasures.mscx b/src/engraving/tests/parts_data/part-all-appendmeasures.mscx
@@ -1079,7 +1079,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>2332167241732</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1795,7 +1794,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>3921305141252</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-all-insertmeasures.mscx b/src/engraving/tests/parts_data/part-all-insertmeasures.mscx
@@ -1075,7 +1075,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>2332167241732</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1790,7 +1789,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>3921305141252</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-all-parts.mscx b/src/engraving/tests/parts_data/part-all-parts.mscx
@@ -1061,7 +1061,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>2332167241732</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1767,7 +1766,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>3921305141252</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx b/src/engraving/tests/parts_data/part-all-uappendmeasures.mscx
@@ -1061,7 +1061,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>2332167241732</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1767,7 +1766,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>3921305141252</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx b/src/engraving/tests/parts_data/part-all-uinsertmeasures.mscx
@@ -1061,7 +1061,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>2332167241732</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1767,7 +1766,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>3921305141252</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-breath-add.mscx b/src/engraving/tests/parts_data/part-breath-add.mscx
@@ -773,7 +773,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1013612281860</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1220,7 +1219,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1675037245444</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-breath-del.mscx b/src/engraving/tests/parts_data/part-breath-del.mscx
@@ -769,7 +769,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1022202216452</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1211,7 +1210,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1692217114628</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-breath-parts.mscx b/src/engraving/tests/parts_data/part-breath-parts.mscx
@@ -782,7 +782,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1640677507076</eid>
       <name>Alto</name>
       <Division>480</Division>
       <Style>
@@ -1233,7 +1232,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>2710124363780</eid>
       <name>Tenor</name>
       <Division>480</Division>
       <Style>

diff --git a/src/engraving/tests/parts_data/part-breath-uadd.mscx b/src/engraving/tests/parts_data/part-breath-uadd.mscx
@@ -769,7 +769,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1013612281860</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1211,7 +1210,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1675037245444</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-breath-udel.mscx b/src/engraving/tests/parts_data/part-breath-udel.mscx
@@ -773,7 +773,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1022202216452</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1220,7 +1219,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1692217114628</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-breath-uradd.mscx b/src/engraving/tests/parts_data/part-breath-uradd.mscx
@@ -773,7 +773,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1013612281860</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1220,7 +1219,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1675037245444</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-breath-urdel.mscx b/src/engraving/tests/parts_data/part-breath-urdel.mscx
@@ -769,7 +769,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1022202216452</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1211,7 +1210,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1692217114628</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-chordline-add.mscx b/src/engraving/tests/parts_data/part-chordline-add.mscx
@@ -773,7 +773,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1013612281860</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1220,7 +1219,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1675037245444</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>

diff --git a/src/engraving/tests/parts_data/part-chordline-del.mscx b/src/engraving/tests/parts_data/part-chordline-del.mscx
@@ -764,7 +764,6 @@
         </Measure>
       </Staff>
     <Score>
-      <eid>1013612281860</eid>
       <name>Alto</name>
       <initialPartId>1</initialPartId>
       <Division>480</Division>
@@ -1200,7 +1199,6 @@
         </Staff>
       </Score>
     <Score>
-      <eid>1675037245444</eid>
       <name>Tenor</name>
       <initialPartId>2</initialPartId>
       <Division>480</Division>