Skip to content

Commit

Permalink
fix master build
Browse files Browse the repository at this point in the history 
+ uncrustified changed tst*.cpp files
  • Loading branch information
@anatoly-os
anatoly-os committed Aug 25, 2020
1 parent 1d01cca commit cef8652
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 83 deletions.
4 changes: 2 additions & 2 deletions mtest/libmscore/copypastesymbollist/tst_copypastesymbollist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ private slots:
void copypasteChordNames1() { copypaste("chordnames-01", ElementType::HARMONY); }
void copypasteFiguredBass() {} // { copypaste("figuredbass", ElementType::FIGURED_BASS); }
void copypasteLyrics() { copypaste("lyrics", ElementType::LYRICS); }
void copypasteStaffText() { copypaste("stafftext", ElementType::STAFF_TEXT); }
void copypasteSticking() { copypaste("sticking", ElementType::STICKING); }
void copypasteStaffText() { copypaste("stafftext", ElementType::STAFF_TEXT); }
void copypasteSticking() { copypaste("sticking", ElementType::STICKING); }

void copypasteRange() { copypastepart("range", ElementType::ARTICULATION); }
void copypasteRange1() { copypastedifferentvoice("range-01", ElementType::ARTICULATION); }
Expand Down
165 changes: 84 additions & 81 deletions mtest/libmscore/repeat/tst_repeat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,87 +29,90 @@ class TestRepeat : public QObject, public MTest
Q_OBJECT
void repeat(const char* f1, const QString& ref);

private slots:
void initTestCase();
void repeat01() { repeat("repeat01.mscx", "1;2;3; 2;3;4;5;6"); } // repeat barline 2 measures ||: | :||
void repeat02() { repeat("repeat02.mscx", "1;2; 2;3;4;5;6"); } // repeat barline 1 measure ||: :||
void repeat03() { repeat("repeat03.mscx", "1;2; 1;2;3;4;5;6"); } // repeat barline end to start :||
void repeat04() { repeat("repeat04.mscx", "1;2;3; 2;3;4; 2;3;4;5;6"); } // repeat barline ||: | :|| :||
void repeat05() { repeat("repeat05.mscx", "1;2;3; 2;3; 2;3;4; 2;3;4;5;6"); } // repeat barline ||: | x2 :|| :||
void repeat06() { repeat("repeat06.mscx", "1;2;3; 2; 4;5;6"); } // simple volta
void repeat07() { repeat("repeat07.mscx", "1;2;3;4;5;6; 1;2;3"); } // DC al fine
void repeat08() { repeat("repeat08.mscx", "1;2;3;4;5;6; 2;3;4; 7;8;9;10;11"); } // DS al coda

void repeat09() { repeat("repeat09.mscx", "1;2;3; 2; 5;6"); } // 3 voltas, but twice a volta1
void repeat10() { repeat("repeat10.mscx", "1;2;3;4; 1;2; 5;6;7;8; 1;2; 9;10; 1;2; 11;12"); } // 3 voltas
void repeat11() { repeat("repeat11.mscx", "1;2;3;4; 2;3; 5;6;7;8; 2; 9;10"); } // volta after to coda
void repeat12() { repeat("repeat12.mscx", "1;2;3;4; 3; 5;6; 2;3; 5;6;7"); } // volta between segno & DS
void repeat13() { repeat("repeat13.mscx", "1;2;3;4;5; 1;2;3;4;5"); } // incomplete jump -> carry on as good as you can
void repeat14() { repeat("repeat14.mscx", "1;2;3;4;5;6;7;8;9;10; 2;3;4;5;6;7;8; 11;12; 2;3;4;5;6;7;8; 13;14;15;16;17;18; 16;17;18; 19;20;21;22;23; 5;6;7; 24;25;26"); } // complex roadmap DS al coda, volta, repeat
void repeat15() { repeat("repeat15.mscx", "1;2; 2; 2; 2; 2; 2; 2; 2;3"); } // repeat barline ||: x8 :||

void repeat16() { repeat("repeat16.mscx", "1;2;3;4; 4; 1;2"); } // jump in simple repeat
void repeat17() { repeat("repeat17.mscx", "1;2; 1; 3;4;5; 4; 6;7;8; 7; 9"); } // volta after coda

void repeat18() { repeat("repeat18.mscx", "1;2; 1; 3;4;5;6; 5; 7;8"); } // twice volta
void repeat19() { repeat("repeat19.mscx", "1;2;3;4; 1;2; 4"); } // DS al coda after the coda

void repeat20() { repeat("repeat20.mscx", "1;2;3; 1; 4;5;6;7;8; 5;6"); } // 1) DS al Coda, 2) DS1 al Fine
void repeat21() { repeat("repeat21.mscx", "1;2;3; 1;2;3;4;5;6;7; 5; 8"); } // 1) DS, 2) DS1 al Coda

void repeat22() { repeat("repeat22.mscx", "1;2;3; 2;3;4;5; 5; 5;6"); } // DS and ||: 3x :||
// complex roadmap
void repeat23() { repeat("repeat23.mscx", "1;2; 1;2;3; 2;3;4;5;6;7; 6;7;8;9;10;11; 9;10; 12; 12;13;14; 13;14;15;16; 13;14"); }

void repeat24() { repeat("repeat24.mscx", "1;2;3;4;5; 3;4; 2;3;4;5;6"); } // S ||: DS :||
void repeat25() { repeat("repeat25.mscx", "1;2; 1;2;3;4;5; 4; 2;3;4;5"); } // ||: S :|| ||: DS :||

void repeat26() { repeat("repeat26.mscx", "1; 1;2; 2;3"); } // empty and garbage jump

void repeat27() { repeat("repeat27.mscx", "1;2; 2; 1"); } // #73486 single-measure repeat at end of section
void repeat28() { repeat("repeat28.mscx", "1;2; 2; 1;2; 1"); } // #73486 single-measure repeat at end of section w/DC
void repeat29() { repeat("repeat29.mscx", "1;2;3; 3; 2;3; 1"); } // #73486 single-measure repeat at end of section w/DS

void repeat30() { repeat("repeat30.mscx", "1; 1;2; 1;2"); } // #73496 single measure section at beginning of score followed by a section with end repeat (without beginning repeat)

void repeat31() { repeat("repeat31.mscx", "1;2; 2; 1;2"); } // #73531 ending measure has jump and repeat m1 |: m2 DC :|
void repeat32() { repeat("repeat32.mscx", "1;2;3; 3; 2;3"); } // #73531 ending measure has jump and repeat m1 |S m2 |: m3 DS :|
void repeat33() { repeat("repeat33.mscx", "1;2;3; 2;3; 1;2;3"); } // #73531 ending measure has jump and repeat m1 |: m2 | m3 DC :|
void repeat34() { repeat("repeat34.mscx", "1;2;3; 2; 4;5; 5; 1;2; 4;5"); }// #73531 ending measure has jump and repeat m1 |: m2 |1e m3 :| 2e m4 |: m5 | DC :|

void repeat35() { repeat("repeat35.mscx", "1;2; 1;2; 1;2;3;4; 2;3; 1;2;3; 1;2; 1;2;3;4; 2;3; 5"); } // #65161 multiple sections, each with possible DC, DS, al Fine
void repeat36() { repeat("repeat36.mscx", "1;2;3;4;5; 1;2;3"); } // incomplete jump, missing Coda from D.S. al Coda

void repeat37() { repeat("repeat37.mscx", "1;2;1; 1;2;1; 1;2;1; 1;2;1; 1;2;1"); } // #65161, with section breaks occurring on non-measure frames
void repeat38() { repeat("repeat38.mscx", "1;2; 2;3;4; 2; 2;3; 5"); } // D.S. with repeats at start repeat

void repeat39() { repeat("repeat39.mscx", "1;2;3; 2; 4;5; 2;3; 2; 4;5; 2; 6"); } // volta 1.3.,2.4.

void repeat40() { repeat("repeat40.mscx", "1;2; 1; 3;4; 1; 5"); } // #148276 Open volta lines must extend over entire ending: next endRepeat
void repeat41() { repeat("repeat41.mscx", "1;2; 1; 3; 1; 4;5"); } // #148276 Open volta lines must extend over entire ending: next endRepeat at volta (SLine) end
void repeat42() { repeat("repeat42.mscx", "1;2; 1; 3; 5; 1; 4;5"); } // #148276 Open volta lines must extend over entire ending: next volta
void repeat43() { repeat("repeat43.mscx", "1;2; 1;2; 1; 3; 1;2; 1; 4; 1; 5"); } // #8604 Complex alternate endings 1.2.4. / 3./ 5.
void repeat44() { repeat("repeat44.mscx", "1;2;3;4;5; 3; 6; 3;4; 1; 7"); } // Jump from within a volta

void repeat45() { repeat("repeat45.mscx", "1;2;3;4; 3; 5;6; 2;3;4; 3; 5;6;7"); } // repeat12 but with 'play repeats' enabled
void repeat46() { repeat("repeat46.mscx", "1;2;3;4;5; 3;4; 2;3;4;5; 3;4;5;6"); } // repeat24 but with 'play repeats' enabled

void repeat47() { repeat("repeat47.mscx", "1;2;3; 2; 4;5;6;7; 6; 8;9;10;11; 2; 4; 13;14;15; 9;10; 16;17;18"); } // #269378 Double Coda messed up repeat rewind logic

void repeat48() { repeat("repeat48.mscx", "1;2;3;4; 1; 5;6;7; 3;4; 1; 5;8"); } // jump into first volta, without playRepeats
void repeat49() { repeat("repeat49.mscx", "1;2;3; 1;2;3;4;5;6; 3; 1;2;3;4; 7"); } // D.S. with playRepeats
void repeat50() { repeat("repeat50.mscx", "1;2;3;4; 1;2;3;4;5;6; 1;2;3;4; 1;2;3; 7"); } // D.S. with playRepeats with ToCoda inside the repeat
void repeat51() { repeat("repeat51.mscx", "1;2;3;4;5;6; 3;4; 7;8;9; 3;4; 10;11"); } // #270332 twice D.S. with playRepeats to same target with different Coda

void repeat52() { repeat("repeat52.mscx", "1;2;3; 1; 4;5; 1;2;3; 1; 4;5; 1; 6; 3; 1; 4;5; 1; 6"); } // Jump into volta "final" playthrough
void repeat53() { repeat("repeat53.mscx", "1;2;3; 1; 4;5; 1;2;3; 1; 4;5; 1; 6; 5; 1;2;3; 1; 4;5; 1; 6"); } // Jump into volta with repeats

void repeat54() { repeat("repeat54.mscx", "1;2;3; 1; 4;5;6;7;8; 5;6"); } // repeat20 without label changes, pick correct segno
void repeat55() { repeat("repeat55.mscx", "1;2;3; 1;2;3;4;5;6;7; 5; 8"); } // repeat21 without label changes, pick correct segno

void repeat56() { repeat("repeat56.mscx", "1;2;3;4; 2; 5;6;7; 5;6;7;8"); } // start of volta and start repeat on same measure
void repeat57() { repeat("repeat57.mscx", "1;2;3"); } // no repeat, skip volta until section end, relates to #274690
};
private slots:
void initTestCase();
void repeat01() { repeat("repeat01.mscx", "1;2;3; 2;3;4;5;6"); } // repeat barline 2 measures ||: | :||
void repeat02() { repeat("repeat02.mscx", "1;2; 2;3;4;5;6"); } // repeat barline 1 measure ||: :||
void repeat03() { repeat("repeat03.mscx", "1;2; 1;2;3;4;5;6"); } // repeat barline end to start :||
void repeat04() { repeat("repeat04.mscx", "1;2;3; 2;3;4; 2;3;4;5;6"); } // repeat barline ||: | :|| :||
void repeat05() { repeat("repeat05.mscx", "1;2;3; 2;3; 2;3;4; 2;3;4;5;6"); } // repeat barline ||: | x2 :|| :||
void repeat06() { repeat("repeat06.mscx", "1;2;3; 2; 4;5;6"); } // simple volta
void repeat07() { repeat("repeat07.mscx", "1;2;3;4;5;6; 1;2;3"); } // DC al fine
void repeat08() { repeat("repeat08.mscx", "1;2;3;4;5;6; 2;3;4; 7;8;9;10;11"); } // DS al coda

void repeat09() { repeat("repeat09.mscx", "1;2;3; 2; 5;6"); } // 3 voltas, but twice a volta1
void repeat10() { repeat("repeat10.mscx", "1;2;3;4; 1;2; 5;6;7;8; 1;2; 9;10; 1;2; 11;12"); } // 3 voltas
void repeat11() { repeat("repeat11.mscx", "1;2;3;4; 2;3; 5;6;7;8; 2; 9;10"); } // volta after to coda
void repeat12() { repeat("repeat12.mscx", "1;2;3;4; 3; 5;6; 2;3; 5;6;7"); } // volta between segno & DS
void repeat13() { repeat("repeat13.mscx", "1;2;3;4;5; 1;2;3;4;5"); } // incomplete jump -> carry on as good as you can
void repeat14()
{
repeat("repeat14.mscx",
"1;2;3;4;5;6;7;8;9;10; 2;3;4;5;6;7;8; 11;12; 2;3;4;5;6;7;8; 13;14;15;16;17;18; 16;17;18; 19;20;21;22;23; 5;6;7; 24;25;26");
} // complex roadmap DS al coda, volta, repeat
void repeat15() { repeat("repeat15.mscx", "1;2; 2; 2; 2; 2; 2; 2; 2;3"); } // repeat barline ||: x8 :||

void repeat16() { repeat("repeat16.mscx", "1;2;3;4; 4; 1;2"); } // jump in simple repeat
void repeat17() { repeat("repeat17.mscx", "1;2; 1; 3;4;5; 4; 6;7;8; 7; 9"); } // volta after coda

void repeat18() { repeat("repeat18.mscx", "1;2; 1; 3;4;5;6; 5; 7;8"); } // twice volta
void repeat19() { repeat("repeat19.mscx", "1;2;3;4; 1;2; 4"); } // DS al coda after the coda

void repeat20() { repeat("repeat20.mscx", "1;2;3; 1; 4;5;6;7;8; 5;6"); } // 1) DS al Coda, 2) DS1 al Fine
void repeat21() { repeat("repeat21.mscx", "1;2;3; 1;2;3;4;5;6;7; 5; 8"); } // 1) DS, 2) DS1 al Coda

void repeat22() { repeat("repeat22.mscx", "1;2;3; 2;3;4;5; 5; 5;6"); } // DS and ||: 3x :||
// complex roadmap
void repeat23() { repeat("repeat23.mscx", "1;2; 1;2;3; 2;3;4;5;6;7; 6;7;8;9;10;11; 9;10; 12; 12;13;14; 13;14;15;16; 13;14"); }

void repeat24() { repeat("repeat24.mscx", "1;2;3;4;5; 3;4; 2;3;4;5;6"); } // S ||: DS :||
void repeat25() { repeat("repeat25.mscx", "1;2; 1;2;3;4;5; 4; 2;3;4;5"); } // ||: S :|| ||: DS :||

void repeat26() { repeat("repeat26.mscx", "1; 1;2; 2;3"); } // empty and garbage jump

void repeat27() { repeat("repeat27.mscx", "1;2; 2; 1"); } // #73486 single-measure repeat at end of section
void repeat28() { repeat("repeat28.mscx", "1;2; 2; 1;2; 1"); } // #73486 single-measure repeat at end of section w/DC
void repeat29() { repeat("repeat29.mscx", "1;2;3; 3; 2;3; 1"); } // #73486 single-measure repeat at end of section w/DS

void repeat30() { repeat("repeat30.mscx", "1; 1;2; 1;2"); } // #73496 single measure section at beginning of score followed by a section with end repeat (without beginning repeat)

void repeat31() { repeat("repeat31.mscx", "1;2; 2; 1;2"); } // #73531 ending measure has jump and repeat m1 |: m2 DC :|
void repeat32() { repeat("repeat32.mscx", "1;2;3; 3; 2;3"); } // #73531 ending measure has jump and repeat m1 |S m2 |: m3 DS :|
void repeat33() { repeat("repeat33.mscx", "1;2;3; 2;3; 1;2;3"); } // #73531 ending measure has jump and repeat m1 |: m2 | m3 DC :|
void repeat34() { repeat("repeat34.mscx", "1;2;3; 2; 4;5; 5; 1;2; 4;5"); } // #73531 ending measure has jump and repeat m1 |: m2 |1e m3 :| 2e m4 |: m5 | DC :|

void repeat35() { repeat("repeat35.mscx", "1;2; 1;2; 1;2;3;4; 2;3; 1;2;3; 1;2; 1;2;3;4; 2;3; 5"); } // #65161 multiple sections, each with possible DC, DS, al Fine
void repeat36() { repeat("repeat36.mscx", "1;2;3;4;5; 1;2;3"); } // incomplete jump, missing Coda from D.S. al Coda

void repeat37() { repeat("repeat37.mscx", "1;2;1; 1;2;1; 1;2;1; 1;2;1; 1;2;1"); } // #65161, with section breaks occurring on non-measure frames
void repeat38() { repeat("repeat38.mscx", "1;2; 2;3;4; 2; 2;3; 5"); } // D.S. with repeats at start repeat

void repeat39() { repeat("repeat39.mscx", "1;2;3; 2; 4;5; 2;3; 2; 4;5; 2; 6"); } // volta 1.3.,2.4.

void repeat40() { repeat("repeat40.mscx", "1;2; 1; 3;4; 1; 5"); } // #148276 Open volta lines must extend over entire ending: next endRepeat
void repeat41() { repeat("repeat41.mscx", "1;2; 1; 3; 1; 4;5"); } // #148276 Open volta lines must extend over entire ending: next endRepeat at volta (SLine) end
void repeat42() { repeat("repeat42.mscx", "1;2; 1; 3; 5; 1; 4;5"); } // #148276 Open volta lines must extend over entire ending: next volta
void repeat43() { repeat("repeat43.mscx", "1;2; 1;2; 1; 3; 1;2; 1; 4; 1; 5"); } // #8604 Complex alternate endings 1.2.4. / 3./ 5.
void repeat44() { repeat("repeat44.mscx", "1;2;3;4;5; 3; 6; 3;4; 1; 7"); } // Jump from within a volta

void repeat45() { repeat("repeat45.mscx", "1;2;3;4; 3; 5;6; 2;3;4; 3; 5;6;7"); } // repeat12 but with 'play repeats' enabled
void repeat46() { repeat("repeat46.mscx", "1;2;3;4;5; 3;4; 2;3;4;5; 3;4;5;6"); } // repeat24 but with 'play repeats' enabled

void repeat47() { repeat("repeat47.mscx", "1;2;3; 2; 4;5;6;7; 6; 8;9;10;11; 2; 4; 13;14;15; 9;10; 16;17;18"); } // #269378 Double Coda messed up repeat rewind logic

void repeat48() { repeat("repeat48.mscx", "1;2;3;4; 1; 5;6;7; 3;4; 1; 5;8"); } // jump into first volta, without playRepeats
void repeat49() { repeat("repeat49.mscx", "1;2;3; 1;2;3;4;5;6; 3; 1;2;3;4; 7"); } // D.S. with playRepeats
void repeat50() { repeat("repeat50.mscx", "1;2;3;4; 1;2;3;4;5;6; 1;2;3;4; 1;2;3; 7"); } // D.S. with playRepeats with ToCoda inside the repeat
void repeat51() { repeat("repeat51.mscx", "1;2;3;4;5;6; 3;4; 7;8;9; 3;4; 10;11"); } // #270332 twice D.S. with playRepeats to same target with different Coda

void repeat52() { repeat("repeat52.mscx", "1;2;3; 1; 4;5; 1;2;3; 1; 4;5; 1; 6; 3; 1; 4;5; 1; 6"); } // Jump into volta "final" playthrough
void repeat53() { repeat("repeat53.mscx", "1;2;3; 1; 4;5; 1;2;3; 1; 4;5; 1; 6; 5; 1;2;3; 1; 4;5; 1; 6"); } // Jump into volta with repeats

void repeat54() { repeat("repeat54.mscx", "1;2;3; 1; 4;5;6;7;8; 5;6"); } // repeat20 without label changes, pick correct segno
void repeat55() { repeat("repeat55.mscx", "1;2;3; 1;2;3;4;5;6;7; 5; 8"); } // repeat21 without label changes, pick correct segno

void repeat56() { repeat("repeat56.mscx", "1;2;3;4; 2; 5;6;7; 5;6;7;8"); } // start of volta and start repeat on same measure
void repeat57() { repeat("repeat57.mscx", "1;2;3"); } // no repeat, skip volta until section end, relates to #274690

void repeat48() { repeat("repeat48.mscx", "1;2;3;4;1;5;6;7;3;4;1;5;8"); } // jump into first volta, without playRepeats
void repeat49() { repeat("repeat49.mscx", "1;2;3;1;2;3;4;5;6;3;1;2;3;4;7"); } // D.S. with playRepeats
Expand Down

0 comments on commit cef8652

Please sign in to comment.