Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MU3] Remove (the commented out) mtest for cut2 and cut3 timesigs #7094

Merged
merged 1 commit into from
Dec 30, 2020
Merged

[MU3] Remove (the commented out) mtest for cut2 and cut3 timesigs #7094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions mtest/libmscore/timesig/tst_timesig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,16 +279,10 @@ void TestTimesig::timesig10()
ts2->setSig(Fraction(2, 2), TimeSigType::NORMAL);
TimeSig* ts3 = new TimeSig(score);
ts3->setSig(Fraction(4, 4), TimeSigType::FOUR_FOUR);
//TimeSig* ts4 = new TimeSig(score);
//ts4->setSig(Fraction(2, 2), TimeSigType::CUT_BACH);

score->cmdAddTimeSig(m2, 0, ts2, false);
m2 = score->firstMeasure()->nextMeasure();
score->cmdAddTimeSig(m2, 0, ts3, false);
//m2 = score->firstMeasure()->nextMeasure();
//score->cmdAddTimeSig(m2, 0, ts4, false);
//m2 = score->firstMeasure()->nextMeasure();
//score->cmdAddTimeSig(m2, 0, ts5, false);

score->doLayout();
QVERIFY(saveCompareScore(score, "timesig-10.mscx", DIR + "timesig-10-ref.mscx"));
Expand All @@ -310,15 +304,11 @@ void TestTimesig::timesig_78216()
Measure* m1 = score->firstMeasure();
Measure* m2 = m1->nextMeasure();
Measure* m3 = m2->nextMeasure();
//Measure* m4 = m3->nextMeasure();
//Measure* m5 = m4->nextMeasure();

// verify no timesig exists in segment of final tick of m1, m2, m3
QVERIFY2(!m1->findSegment(SegmentType::TimeSig, m1->endTick()), "Should be no timesig at the end of measure 1.");
QVERIFY2(!m2->findSegment(SegmentType::TimeSig, m2->endTick()), "Should be no timesig at the end of measure 2.");
QVERIFY2(!m3->findSegment(SegmentType::TimeSig, m3->endTick()), "Should be no timesig at the end of measure 3.");
//QVERIFY2(!m4->findSegment(SegmentType::TimeSig, m4->endTick()), "Should be no timesig at the end of measure 4.");
//QVERIFY2(!m5->findSegment(SegmentType::TimeSig, m5->endTick()), "Should be no timesig at the end of measure 5.");
delete score;
}

Expand Down
3 changes: 3 additions & 0 deletions mtest/libmscore/timesig/updateReference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ cp ../../../build.debug/mtest/libmscore/timesig/timesig-04.mscx timesig-04-ref.m
cp ../../../build.debug/mtest/libmscore/timesig/timesig-05.mscx timesig-05-ref.mscx
cp ../../../build.debug/mtest/libmscore/timesig/timesig-06.mscx timesig-06-ref.mscx
cp ../../../build.debug/mtest/libmscore/timesig/timesig-07.mscx timesig-07-ref.mscx
cp ../../../build.debug/mtest/libmscore/timesig/timesig-08.mscx timesig-08-ref.mscx
cp ../../../build.debug/mtest/libmscore/timesig/timesig-09.mscx timesig-09-ref.mscx
cp ../../../build.debug/mtest/libmscore/timesig/timesig-10.mscx timesig-10-ref.mscx