fix: ensure game’s stopped to prevent races

Author: gfauredev

test/ChordGameTest.cpp

@@ -42,6 +42,7 @@ TEST_CASE("ChordGame Flow") {
     CHECK(res1.getType() == "result");
     CHECK(res1.hasField("correct"));
 
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -67,12 +68,8 @@ TEST_CASE("ChordGame Partial and Incorrect") {
     while (std::getline(ss, segment, ' ')) notes.push_back(segment);
 
     // Envoyer seulement 1 note correcte (Partiel)
-    if (!notes.empty()) {
-        midi.pushNotes({notes[0]});
-    } else {
-        midi.pushNotes(std::vector<Note>{});
-    }
-
+    if (!notes.empty()) midi.pushNotes({notes[0]});
+    else midi.pushNotes(std::vector<Note>{});
     Message res1 = transport.waitForSentMessage();
     CHECK(res1.getType() == "result");
 
@@ -85,7 +82,7 @@ TEST_CASE("ChordGame Partial and Incorrect") {
         // "incorrect" n'est PAS présent
         CHECK_FALSE(res1.hasField("incorrect"));
     }
-
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -122,12 +119,10 @@ TEST_CASE("ChordGame Inversions") {
         transport.waitForSentMessage(); // result
 
         // Envoyer ready seulement si on attend un autre tour
-        if (i < 19) {
-            transport.pushIncoming(Message("ready"));
-        }
+        if (i < 19) transport.pushIncoming(Message("ready"));
     }
-
     CHECK(seenInversion); // Devrait être très probable
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -151,6 +146,7 @@ TEST_CASE("ChordGame Unknown Scale") {
     midi.pushNotes(std::vector<Note>{});
     transport.waitForSentMessage();
 
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -179,6 +175,7 @@ TEST_CASE("ChordGame Completely Incorrect") {
     CHECK(res.getType() == "result");
     CHECK(res.hasField("incorrect"));
 
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -206,6 +203,7 @@ TEST_CASE("ChordGame Ready Message Error") {
     transport.pushIncoming(Message("wrong"));
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -239,12 +237,10 @@ TEST_CASE("ChordGame With Inversions Coverage") {
 
         midi.pushNotes(std::vector<Note>{});
         transport.waitForSentMessage(); // result
-
-        if (i < 49) {
-            transport.pushIncoming(Message("ready"));
-        }
+        if (i < 49) transport.pushIncoming(Message("ready"));
     }
 
     CHECK(foundInversion); // Très probable avec 50 tentatives
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }

test/NoteGameTest.cpp

@@ -17,36 +17,29 @@ TEST_CASE("NoteGame Flow") {
     config.mode = "Majeur";
     config.maxChallenges = 2; // Test avec 2 défis pour vérifier l'enchaînement
     NoteGame game(transport, midi, config);
-
     game.start();
     std::thread gameThread([&game]() { game.play(); });
-
     // Premier défi
     Message msg1 = transport.waitForSentMessage();
     CHECK(msg1.getType() == "note");
     std::string expectedNote = msg1.getField("note");
-
     // Simulation de la réponse correcte via MIDI
     midi.pushNotes({expectedNote});
-
     // Vérification du résultat (attendu correct)
     Message res1 = transport.waitForSentMessage();
     CHECK(res1.getType() == "result");
     CHECK(res1.hasField("correct"));
-
     // Signal pour passer au défi suivant
     transport.pushIncoming(Message("ready"));
-
     // Deuxième défi
     Message msg2 = transport.waitForSentMessage();
     CHECK(msg2.getType() == "note");
     expectedNote = msg2.getField("note");
     midi.pushNotes({expectedNote});
-
     Message res2 = transport.waitForSentMessage();
     CHECK(res2.getType() == "result");
     CHECK(res2.hasField("correct"));
-
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -60,22 +53,18 @@ TEST_CASE("NoteGame Incorrect Answer") {
     config.mode = "maj";
     config.maxChallenges = 1;
     NoteGame game(transport, midi, config);
-
     game.start();
     std::thread gameThread([&game]() { game.play(); });
-
     Message msg1 = transport.waitForSentMessage();
     std::string expectedNote = msg1.getField("note");
-
     // Envoyer note incorrecte
     std::string wrongNote = (expectedNote == "c4") ? "d4" : "c4";
     midi.pushNotes({wrongNote});
-
     Message res1 = transport.waitForSentMessage();
     CHECK(res1.getType() == "result");
     CHECK(res1.hasField("incorrect"));
     CHECK_FALSE(res1.hasField("correct"));
-
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -89,15 +78,12 @@ TEST_CASE("NoteGame Unknown Scale Fallback") {
     config.mode = "mode";
     config.maxChallenges = 1;
     NoteGame game(transport, midi, config);
-
     game.start();
     std::thread gameThread([&game]() { game.play(); });
-
     // Devrait fallback sur Do Majeur, donc générer une note
     Message msg1 = transport.waitForSentMessage();
     CHECK(msg1.getType() == "note");
-
-    midi.close(); // Arrêter attente notes
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }
 
@@ -111,26 +97,22 @@ TEST_CASE("NoteGame Multiple Incorrect Notes") {
     config.mode = "maj";
     config.maxChallenges = 1;
     NoteGame game(transport, midi, config);
-
     game.start();
     std::thread gameThread([&game]() { game.play(); });
-
     Message msg1 = transport.waitForSentMessage();
     std::string expectedNote = msg1.getField("note");
-
     // Envoyer plusieurs notes incorrectes (couvre ligne 60 branch)
     std::vector<std::string> wrongNotes;
     if (expectedNote != "c4") wrongNotes.push_back("c4");
     if (expectedNote != "d4") wrongNotes.push_back("d4");
     if (expectedNote != "e4") wrongNotes.push_back("e4");
     midi.pushNotes(wrongNotes);
-
     Message res1 = transport.waitForSentMessage();
     CHECK(res1.getType() == "result");
     CHECK(res1.hasField("incorrect"));
     // Vérifier que champ incorrect contient espaces (ligne 60)
     std::string incorrect = res1.getField("incorrect");
     CHECK(incorrect.find(" ") != std::string::npos);
-
+    game.stop();
     if (gameThread.joinable()) gameThread.join();
 }