sync mtest from 3.x

SKefalidis · Feb 16, 2021 · b1560a7 · b1560a7
1 parent 747cd4a
commit b1560a7
Show file tree

Hide file tree

Showing 650 changed files with 7,327 additions and 3,492 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ if (BUILD_UNIT_TESTS)
     add_subdirectory(userscores/tests)
 
 # needs actualization
-#    add_subdirectory(libmscore/tests)
+    add_subdirectory(libmscore/tests)
 #    add_subdirectory(importexport/bb/tests)
 #    add_subdirectory(importexport/braille/tests)
 #    add_subdirectory(importexport/bww/tests)

diff --git a/src/framework/fonts/fonts_Leland.qrc b/src/framework/fonts/fonts_Leland.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/">
         <file alias="fonts/leland/Leland.otf">../../../fonts/leland/Leland.otf</file>
         <file alias="fonts/leland/LelandText.otf">../../../fonts/leland/LelandText.otf</file>
+        <file alias="fonts/leland/metadata.json">../../../fonts/leland/metadata.json</file>
             </qresource>
 </RCC>
diff --git a/src/framework/testing/environment.cpp b/src/framework/testing/environment.cpp
@@ -20,6 +20,7 @@
 #include "environment.h"
 
 #include "framework/global/globalmodule.h"
+#include "framework/system/systemmodule.h"
 
 using namespace mu::testing;
 
@@ -55,6 +56,8 @@ void Environment::setup()
 
     //! NOTE Now we can use logger and profiler
 
+    m_dependencyModules.push_back(new mu::system::SystemModule());
+
     for (mu::framework::IModuleSetup* m : m_dependencyModules) {
         m->registerResources();
     }

diff --git a/src/framework/testing/gtest.cmake b/src/framework/testing/gtest.cmake
@@ -55,6 +55,7 @@ target_link_libraries(${MODULE_TEST}
     Qt5::Gui
     gmock
     global
+    system
     ${MODULE_TEST_LINK}
     )
 

diff --git a/src/framework/testing/qtest.cmake b/src/framework/testing/qtest.cmake
@@ -62,6 +62,7 @@ target_link_libraries(${MODULE_TEST}
     Qt5::Widgets
     Qt5::Test
     global
+    system
     ${MODULE_TEST_LINK}
     )
 

diff --git a/src/framework/testing/qtestsuite.h b/src/framework/testing/qtestsuite.h
@@ -19,6 +19,7 @@
 #ifndef MU_TESTING_QTESTSUITE_H
 #define MU_TESTING_QTESTSUITE_H
 
+#include <QDebug>
 #include <QtTest/QtTest>
 #include <QList>
 
@@ -65,6 +66,10 @@ class QTestSuite
     inline static int run(int argc, char* argv[])
     {
         //! TODO Add filter by the test function
+        qDebug() << "========================== argc: " << argc;
+        for (int i = 0; i < argc; ++i) {
+            qDebug() << "========================== argv " << i << ": " << argv[i];
+        }
         int ret = 0;
         for (QObject* test : testList()) {
             ret += QTest::qExec(test, argc, argv);

diff --git a/src/framework/uicomponents/uicomponentsmodule.cpp b/src/framework/uicomponents/uicomponentsmodule.cpp
@@ -47,5 +47,8 @@ void UiComponentsModule::registerUiTypes()
 
     qmlRegisterType<PopupView>("MuseScore.UiComponents", 1, 0, "PopupView");
 
-    framework::ioc()->resolve<ui::IUiEngine>(moduleName())->addSourceImportPath(uicomponents_QML_IMPORT);
+    auto ui = framework::ioc()->resolve<ui::IUiEngine>(moduleName());
+    if (ui) {
+        ui->addSourceImportPath(uicomponents_QML_IMPORT);
+    }
 }
diff --git a/src/importexport/bb/tests/testbase.cpp b/src/importexport/bb/tests/testbase.cpp
@@ -114,6 +114,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/importexport/braille/tests/testbase.cpp b/src/importexport/braille/tests/testbase.cpp
@@ -123,6 +123,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/importexport/bww/tests/testbase.cpp b/src/importexport/bww/tests/testbase.cpp
@@ -108,6 +108,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/importexport/capella/tests/testbase.cpp b/src/importexport/capella/tests/testbase.cpp
@@ -119,6 +119,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/importexport/midiimport/tests/testbase.cpp b/src/importexport/midiimport/tests/testbase.cpp
@@ -111,6 +111,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/importexport/musicxml/tests/testbase.cpp b/src/importexport/musicxml/tests/testbase.cpp
@@ -136,6 +136,6 @@ void MTest::initMTest(const QString& rootDir)
     mscore->init();
 
     root = rootDir;
-    loadInstrumentTemplates(":/instruments.xml");
+    loadInstrumentTemplates(":/data/instruments.xml");
 }
 }
diff --git a/src/libmscore/tests/CMakeLists.txt b/src/libmscore/tests/CMakeLists.txt
@@ -41,27 +41,27 @@ set(MODULE_TEST_SRC
     ${CMAKE_CURRENT_LIST_DIR}/tst_dynamic.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_earlymusic.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_element.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/tst_exchangevoices.cpp
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_exchangevoices.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_hairpin.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_implodeExplode.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_instrumentchange.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_join.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/tst_keysig.cpp
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_keysig.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_layout_benchmark.cpp
     # ${CMAKE_CURRENT_LIST_DIR}/tst_links.cpp # fail
-    ${CMAKE_CURRENT_LIST_DIR}/tst_measure.cpp
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_measure.cpp
     # ${CMAKE_CURRENT_LIST_DIR}/tst_midi.cpp not ported
     # ${CMAKE_CURRENT_LIST_DIR}/tst_midimapping.cpp not ported
     ${CMAKE_CURRENT_LIST_DIR}/tst_note.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/tst_parts.cpp
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_parts.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_readwriteundoreset.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_remove.cpp
     # ${CMAKE_CURRENT_LIST_DIR}/tst_repeat.cpp # fail
     ${CMAKE_CURRENT_LIST_DIR}/tst_rhythmicGrouping.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/tst_selectionfilter.cpp
+#    ${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
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_spanners.cpp
+#    ${CMAKE_CURRENT_LIST_DIR}/tst_split.cpp
     ${CMAKE_CURRENT_LIST_DIR}/tst_splitstaff.cpp
     # ${CMAKE_CURRENT_LIST_DIR}/tst_text.cpp not actual, not compile
     ${CMAKE_CURRENT_LIST_DIR}/tst_timesig.cpp
@@ -76,6 +76,11 @@ set(MODULE_TEST_LINK
     qzip
     libmscore
     fonts
+#    ui
+#    actions
+#    notation
+    instruments
+    uicomponents
     )
 
 set(MODULE_TEST_DATA_ROOT ${CMAKE_CURRENT_LIST_DIR})

diff --git a/src/libmscore/tests/barline_data/barlinedelete-ref.mscx b/src/libmscore/tests/barline_data/barlinedelete-ref.mscx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<museScore version="3.01">
+<museScore version="3.02">
   <Score>
     <LayerTag id="0" tag="default"></LayerTag>
     <currentLayer>0</currentLayer>
@@ -30,14 +30,15 @@
           </StaffType>
         </Staff>
       <trackName>Piano</trackName>
-      <Instrument>
+      <Instrument id="piano">
         <longName>Piano</longName>
         <shortName>Pno.</shortName>
         <trackName>Piano</trackName>
         <minPitchP>21</minPitchP>
         <maxPitchP>108</maxPitchP>
         <minPitchA>21</minPitchA>
         <maxPitchA>108</maxPitchA>
+        <instrumentId>keyboard.piano</instrumentId>
         <clef staff="2">F</clef>
         <Articulation>
           <velocity>100</velocity>
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ target_link_libraries(${MODULE_TEST} @@
         Qt5::Gui
         gmock
         global
+        system
         ${MODULE_TEST_LINK}
         )
@@ Expand Down @@