moved libmscore split test

musescore · Dec 21, 2020 · 854faa2 · 854faa2
1 parent 6d2e815
commit 854faa2
Show file tree

Hide file tree

Showing 42 changed files with 9 additions and 23 deletions.
diff --git a/mtest/libmscore/split/CMakeLists.txt b/mtest/libmscore/split/CMakeLists.txt
diff --git a/src/libmscore/tests/CMakeLists.txt b/src/libmscore/tests/CMakeLists.txt
@@ -59,6 +59,7 @@ set(MODULE_TEST_SRC
     ${CMAKE_CURRENT_LIST_DIR}/tst_selectionfilter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_selectionrangedelete.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_spanners.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/tst_split.cpp
 )
 
 set(MODULE_TEST_LINK

diff --git a/mtest/libmscore/split/split01-ref.mscx → ...bmscore/tests/split_data/split01-ref.mscx b/mtest/libmscore/split/split01-ref.mscx → ...bmscore/tests/split_data/split01-ref.mscx
diff --git a/mtest/libmscore/split/split01.mscx → src/libmscore/tests/split_data/split01.mscx b/mtest/libmscore/split/split01.mscx → src/libmscore/tests/split_data/split01.mscx
diff --git a/mtest/libmscore/split/split02-ref.mscx → ...bmscore/tests/split_data/split02-ref.mscx b/mtest/libmscore/split/split02-ref.mscx → ...bmscore/tests/split_data/split02-ref.mscx
diff --git a/mtest/libmscore/split/split02.mscx → src/libmscore/tests/split_data/split02.mscx b/mtest/libmscore/split/split02.mscx → src/libmscore/tests/split_data/split02.mscx
diff --git a/mtest/libmscore/split/split03-ref.mscx → ...bmscore/tests/split_data/split03-ref.mscx b/mtest/libmscore/split/split03-ref.mscx → ...bmscore/tests/split_data/split03-ref.mscx
diff --git a/mtest/libmscore/split/split03.mscx → src/libmscore/tests/split_data/split03.mscx b/mtest/libmscore/split/split03.mscx → src/libmscore/tests/split_data/split03.mscx
diff --git a/mtest/libmscore/split/split04-ref.mscx → ...bmscore/tests/split_data/split04-ref.mscx b/mtest/libmscore/split/split04-ref.mscx → ...bmscore/tests/split_data/split04-ref.mscx
diff --git a/mtest/libmscore/split/split04.mscx → src/libmscore/tests/split_data/split04.mscx b/mtest/libmscore/split/split04.mscx → src/libmscore/tests/split_data/split04.mscx
diff --git a/mtest/libmscore/split/split05-ref.mscx → ...bmscore/tests/split_data/split05-ref.mscx b/mtest/libmscore/split/split05-ref.mscx → ...bmscore/tests/split_data/split05-ref.mscx
diff --git a/mtest/libmscore/split/split05.mscx → src/libmscore/tests/split_data/split05.mscx b/mtest/libmscore/split/split05.mscx → src/libmscore/tests/split_data/split05.mscx
diff --git a/mtest/libmscore/split/split06-ref.mscx → ...bmscore/tests/split_data/split06-ref.mscx b/mtest/libmscore/split/split06-ref.mscx → ...bmscore/tests/split_data/split06-ref.mscx
diff --git a/mtest/libmscore/split/split06.mscx → src/libmscore/tests/split_data/split06.mscx b/mtest/libmscore/split/split06.mscx → src/libmscore/tests/split_data/split06.mscx
diff --git a/mtest/libmscore/split/split07-ref.mscx → ...bmscore/tests/split_data/split07-ref.mscx b/mtest/libmscore/split/split07-ref.mscx → ...bmscore/tests/split_data/split07-ref.mscx
diff --git a/mtest/libmscore/split/split07.mscx → src/libmscore/tests/split_data/split07.mscx b/mtest/libmscore/split/split07.mscx → src/libmscore/tests/split_data/split07.mscx
diff --git a/mtest/libmscore/split/split08-ref.mscx → ...bmscore/tests/split_data/split08-ref.mscx b/mtest/libmscore/split/split08-ref.mscx → ...bmscore/tests/split_data/split08-ref.mscx
diff --git a/mtest/libmscore/split/split08.mscx → src/libmscore/tests/split_data/split08.mscx b/mtest/libmscore/split/split08.mscx → src/libmscore/tests/split_data/split08.mscx
diff --git a/...3846-irregular-hn-hn-qn-qn-hn-hn-ref.mscx → ...3846-irregular-hn-hn-qn-qn-hn-hn-ref.mscx b/...3846-irregular-hn-hn-qn-qn-hn-hn-ref.mscx → ...3846-irregular-hn-hn-qn-qn-hn-hn-ref.mscx
diff --git a/...it183846-irregular-hn-hn-qn-qn-hn-hn.mscx → ...it183846-irregular-hn-hn-qn-qn-hn-hn.mscx b/...it183846-irregular-hn-hn-qn-qn-hn-hn.mscx → ...it183846-irregular-hn-hn-qn-qn-hn-hn.mscx
diff --git a/...t/split183846-irregular-qn-qn-wn-ref.mscx → ...a/split183846-irregular-qn-qn-wn-ref.mscx b/...t/split183846-irregular-qn-qn-wn-ref.mscx → ...a/split183846-irregular-qn-qn-wn-ref.mscx
diff --git a/...split/split183846-irregular-qn-qn-wn.mscx → ..._data/split183846-irregular-qn-qn-wn.mscx b/...split/split183846-irregular-qn-qn-wn.mscx → ..._data/split183846-irregular-qn-qn-wn.mscx
diff --git a/...t/split183846-irregular-verylong-ref.mscx → ...a/split183846-irregular-verylong-ref.mscx b/...t/split183846-irregular-verylong-ref.mscx → ...a/split183846-irregular-verylong-ref.mscx
diff --git a/...split/split183846-irregular-verylong.mscx → ..._data/split183846-irregular-verylong.mscx b/...split/split183846-irregular-verylong.mscx → ..._data/split183846-irregular-verylong.mscx
diff --git a/...plit/split183846-irregular-wn-wn-ref.mscx → ...data/split183846-irregular-wn-wn-ref.mscx b/...plit/split183846-irregular-wn-wn-ref.mscx → ...data/split183846-irregular-wn-wn-ref.mscx
diff --git a/...re/split/split183846-irregular-wn-wn.mscx → ...lit_data/split183846-irregular-wn-wn.mscx b/...re/split/split183846-irregular-wn-wn.mscx → ...lit_data/split183846-irregular-wn-wn.mscx
diff --git a/...t183846-irregular-wn-wr-wn-hr-qr-ref.mscx → ...t183846-irregular-wn-wr-wn-hr-qr-ref.mscx b/...t183846-irregular-wn-wr-wn-hr-qr-ref.mscx → ...t183846-irregular-wn-wr-wn-hr-qr-ref.mscx
diff --git a/...split183846-irregular-wn-wr-wn-hr-qr.mscx → ...split183846-irregular-wn-wr-wn-hr-qr.mscx b/...split183846-irregular-wn-wr-wn-hr-qr.mscx → ...split183846-irregular-wn-wr-wn-hr-qr.mscx
diff --git a/...t183846-irregular-wr-wn-wr-hn-qn-ref.mscx → ...t183846-irregular-wr-wn-wr-hn-qn-ref.mscx b/...t183846-irregular-wr-wn-wr-hn-qn-ref.mscx → ...t183846-irregular-wr-wn-wr-hn-qn-ref.mscx
diff --git a/...split183846-irregular-wr-wn-wr-hn-qn.mscx → ...split183846-irregular-wr-wn-wr-hn-qn.mscx b/...split183846-irregular-wr-wn-wr-hn-qn.mscx → ...split183846-irregular-wr-wn-wr-hn-qn.mscx
diff --git a/...61-keep-tie-before-break-voice-4-ref.mscx → ...61-keep-tie-before-break-voice-4-ref.mscx b/...61-keep-tie-before-break-voice-4-ref.mscx → ...61-keep-tie-before-break-voice-4-ref.mscx
diff --git a/...184061-keep-tie-before-break-voice-4.mscx → ...184061-keep-tie-before-break-voice-4.mscx b/...184061-keep-tie-before-break-voice-4.mscx → ...184061-keep-tie-before-break-voice-4.mscx
diff --git a/...score/split/split184061-keep-tie-ref.mscx → .../split_data/split184061-keep-tie-ref.mscx b/...score/split/split184061-keep-tie-ref.mscx → .../split_data/split184061-keep-tie-ref.mscx
diff --git a/...libmscore/split/split184061-keep-tie.mscx → ...ests/split_data/split184061-keep-tie.mscx b/...libmscore/split/split184061-keep-tie.mscx → ...ests/split_data/split184061-keep-tie.mscx
diff --git a/...bmscore/split/split184061-no-tie-ref.mscx → ...ts/split_data/split184061-no-tie-ref.mscx b/...bmscore/split/split184061-no-tie-ref.mscx → ...ts/split_data/split184061-no-tie-ref.mscx
diff --git a/...t/libmscore/split/split184061-no-tie.mscx → .../tests/split_data/split184061-no-tie.mscx b/...t/libmscore/split/split184061-no-tie.mscx → .../tests/split_data/split184061-no-tie.mscx
diff --git a/...it184061-other-inst-only-one-tie-ref.mscx → ...it184061-other-inst-only-one-tie-ref.mscx b/...it184061-other-inst-only-one-tie-ref.mscx → ...it184061-other-inst-only-one-tie-ref.mscx
diff --git a/.../split184061-other-inst-only-one-tie.mscx → .../split184061-other-inst-only-one-tie.mscx b/.../split184061-other-inst-only-one-tie.mscx → .../split184061-other-inst-only-one-tie.mscx
diff --git a/mtest/libmscore/split/split295207-ref.mscx → ...ore/tests/split_data/split295207-ref.mscx b/mtest/libmscore/split/split295207-ref.mscx → ...ore/tests/split_data/split295207-ref.mscx
diff --git a/mtest/libmscore/split/split295207.mscx → ...bmscore/tests/split_data/split295207.mscx b/mtest/libmscore/split/split295207.mscx → ...bmscore/tests/split_data/split295207.mscx
diff --git a/mtest/libmscore/split/updateReference → ...ibmscore/tests/split_data/updateReference b/mtest/libmscore/split/updateReference → ...ibmscore/tests/split_data/updateReference
diff --git a/mtest/libmscore/split/tst_split.cpp → src/libmscore/tests/tst_split.cpp b/mtest/libmscore/split/tst_split.cpp → src/libmscore/tests/tst_split.cpp
@@ -10,14 +10,15 @@
 //  the file LICENCE.GPL
 //=============================================================================
 
-#include <QtTest/QtTest>
-#include "mtest/testutils.h"
+#include "testing/qtestsuite.h"
+#include "testutils.h"
+
 #include "libmscore/score.h"
 #include "libmscore/measure.h"
 #include "libmscore/segment.h"
 #include "libmscore/chordrest.h"
 
-#define DIR QString("libmscore/split/")
+static const QString SPLIT_DATA_DIR("split_data/");
 
 using namespace Ms;
 
@@ -79,7 +80,7 @@ void TestSplit::initTestCase()
 
 void TestSplit::split(const char* f1, const char* ref)
 {
-    MasterScore* score = readScore(DIR + f1);
+    MasterScore* score = readScore(SPLIT_DATA_DIR + f1);
     QVERIFY(score);
     Measure* m = score->firstMeasure();
     Segment* s = m->first(SegmentType::ChordRest);
@@ -89,13 +90,13 @@ void TestSplit::split(const char* f1, const char* ref)
 
     score->cmdSplitMeasure(cr);
 
-    QVERIFY(saveCompareScore(score, f1, DIR + ref));
+    QVERIFY(saveCompareScore(score, f1, SPLIT_DATA_DIR + ref));
     delete score;
 }
 
 void TestSplit::split(const char* f1, const char* ref, int index)
 {
-    MasterScore* score = readScore(DIR + f1);
+    MasterScore* score = readScore(SPLIT_DATA_DIR + f1);
     QVERIFY(score);
     Measure* m = score->firstMeasure();
     Segment* s = m->first(SegmentType::ChordRest);
@@ -106,7 +107,7 @@ void TestSplit::split(const char* f1, const char* ref, int index)
 
     score->cmdSplitMeasure(cr);
 
-    QVERIFY(saveCompareScore(score, f1, DIR + ref));
+    QVERIFY(saveCompareScore(score, f1, SPLIT_DATA_DIR + ref));
     delete score;
 }