add tests for incorrect measure sequences in systems

rpatters1 · Feb 11, 2025 · 571c416 · 571c416
1 parent 170a16f
commit 571c416
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 5 deletions.
diff --git a/src/mnxvalidate.cpp b/src/mnxvalidate.cpp
@@ -348,6 +348,8 @@ static void validateScores(const MnxValidateContext& context)
                     }
                 }
             }
+            std::optional<size_t> lastSystemMeasure;
+            bool isFirstSystem = true;
             if (auto pages = score.pages()) {
                 for (const auto page : pages.value()) {
                     size_t x = page.calcArrayIndex();
@@ -360,19 +362,32 @@ static void validateScores(const MnxValidateContext& context)
                         size_t y = system.calcArrayIndex();
                         if (const auto layout = system.layout()) {
                             if (!context.getLayoutIndex(layout.value(), "System[" + std::to_string(y)
-                                        + "] in page[" + std::to_string(x) + "] in score \"" + score.name() + "\"")) {
+                                        + "] on page[" + std::to_string(x) + "] in score \"" + score.name() + "\"")) {
                                 valid = false;
                             }
                         }
-                        if (!context.getMeasureIndex(system.measure(), "System[" + std::to_string(y)
-                                        + "] in page[" + std::to_string(x) + "] in score \"" + score.name() + "\"")) {
+                        auto currentSystemMeasure = context.getMeasureIndex(system.measure(), "System[" + std::to_string(y)
+                                + "] on page[" + std::to_string(x) + "] in score \"" + score.name() + "\"");
+                        if (!currentSystemMeasure) {
                             valid = false;
+                        } else if (isFirstSystem && currentSystemMeasure.value() > 0) {
+                            context.logMessage(LogMsg() << "The first system in score \"" << score.name() 
+                                << "\" starts after the first measure.", LogSeverity::Error);
                         }
+                        isFirstSystem = false;
+                        if (lastSystemMeasure && currentSystemMeasure <= lastSystemMeasure) {
+                            std::string msg = currentSystemMeasure < lastSystemMeasure
+                                                                   ? " starts before"
+                                                                   : " starts on the same measure as";
+                            context.logMessage(LogMsg() << "System[" << y << "] on page[" << x << "] in score \"" << score.name() << "\""
+                                << msg << " previous system.", LogSeverity::Error);
+                        }
+                        lastSystemMeasure = currentSystemMeasure;
                         if (const auto layoutChanges = system.layoutChanges()) {
                             for (const auto layoutChange : layoutChanges.value()) {
                                 size_t z = layoutChange.calcArrayIndex();
                                 if (!context.getLayoutIndex(layoutChange.layout(), "Layout change[" + std::to_string(z) + "] in system[" + std::to_string(y)
-                                            + "] in page[" + std::to_string(x) + "] in score \"" + score.name() + "\"")) {
+                                            + "] on page[" + std::to_string(x) + "] in score \"" + score.name() + "\"")) {
                                     valid = false;
                                 }
                                 /// @todo validate location.bar

diff --git a/tests/data/inputs/errors/score_system_bad_start.json b/tests/data/inputs/errors/score_system_bad_start.json
@@ -0,0 +1,37 @@
+{
+    "mnx": {
+        "version": 1
+    },
+    "global": {
+        "measures": [
+            {
+                "index": 2
+            },
+            {},
+            {},
+            {},
+            {}
+        ]
+    },
+    "parts": [],
+    "scores": [
+        {
+            "name": "Score",
+            "pages": [
+                {
+                    "systems": [
+                        {
+                            "measure": 2
+                        },
+                        {
+                            "measure": 4
+                        },
+                        {
+                            "measure": 3
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/data/inputs/errors/score_system_bad_start2.json b/tests/data/inputs/errors/score_system_bad_start2.json
@@ -0,0 +1,34 @@
+{
+    "mnx": {
+        "version": 1
+    },
+    "global": {
+        "measures": [
+            {
+                "index": 2
+            },
+            {},
+            {},
+            {},
+            {}
+        ]
+    },
+    "parts": [],
+    "scores": [
+        {
+            "name": "Score",
+            "pages": [
+                {
+                    "systems": []
+                },
+                {
+                    "systems": [
+                        {
+                            "measure": 3
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/test_scores.cpp b/tests/test_scores.cpp
@@ -94,7 +94,27 @@ TEST(Scores, InvalidSystemStartMeasure)
     setupTestDataPaths();
     std::filesystem::path inputPath = getInputPath() / "errors" / "score_system_bad_measure.json";
     ArgList args = { MNXVALIDATE_NAME, inputPath.u8string(), "--no-log" };
-    checkStderr({ std::string("score_system_bad_measure.json"), "System[0] in page[0] in score \"Score\" references non-existent measure 1" }, [&]() {
+    checkStderr({ std::string("score_system_bad_measure.json"), "System[0] on page[0] in score \"Score\" references non-existent measure 1" }, [&]() {
+        EXPECT_NE(mnxValidateTestMain(args.argc(), args.argv()), 0) << "validate " << inputPath.u8string();
+    });
+}
+
+TEST(Scores, InvalidSystemMeasureSequence)
+{
+    setupTestDataPaths();
+    std::filesystem::path inputPath = getInputPath() / "errors" / "score_system_bad_start.json";
+    ArgList args = { MNXVALIDATE_NAME, inputPath.u8string(), "--no-log" };
+    checkStderr({ std::string("score_system_bad_start.json"), "System[2] on page[0] in score \"Score\" starts before previous system" }, [&]() {
+        EXPECT_NE(mnxValidateTestMain(args.argc(), args.argv()), 0) << "validate " << inputPath.u8string();
+    });
+}
+
+TEST(Scores, InvalidSystemMeasureSequence2)
+{
+    setupTestDataPaths();
+    std::filesystem::path inputPath = getInputPath() / "errors" / "score_system_bad_start2.json";
+    ArgList args = { MNXVALIDATE_NAME, inputPath.u8string(), "--no-log" };
+    checkStderr({ std::string("score_system_bad_start2.json"), "The first system in score \"Score\" starts after the first measure" }, [&]() {
         EXPECT_NE(mnxValidateTestMain(args.argc(), args.argv()), 0) << "validate " << inputPath.u8string();
     });
 }