diff --git a/Start_Windows/game.o b/Start_Windows/game.o index 15aecd9..d4ed330 100644 Binary files a/Start_Windows/game.o and b/Start_Windows/game.o differ diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 743c6bc..caff9b4 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -43,8 +43,8 @@ TEST_BIN = runTests test: input.o game.o unit_tests.c $(CC) $(CFLAGS) -I$(unityfolder) -o $(TEST_BIN) input.o game.o unit_tests.c $(BINARIES)/libunity.a -$(BINARIES)/libwordsalad_complete.a: input.o game.o - ar rcs $(BINARIES)/libwordsalad_complete.a input.o game.o +$(BINARIES)/libwordsalad_complete.a: input.o game.o graphicalGame.o + ar rcs $(BINARIES)/libwordsalad_complete.a input.o game.o graphicalGame.o wordsalad_myversion: main.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(CC) $(CFLAGS) -o wordsalad_myversion main.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) diff --git a/Start_Windows/runTests.exe b/Start_Windows/runTests.exe index 49d4b21..d473840 100644 Binary files a/Start_Windows/runTests.exe and b/Start_Windows/runTests.exe differ diff --git a/Start_Windows/unit_tests.c b/Start_Windows/unit_tests.c index 50a62cf..34b07ed 100644 --- a/Start_Windows/unit_tests.c +++ b/Start_Windows/unit_tests.c @@ -101,6 +101,35 @@ void test_createWordSalad_too_small(void) { } } +void test_createWordSalad_allWordsPlaced() { + char words[3][MAX_WORD_LEN] = {"CAT", "DOG", "MOUSE"}; + char saladHoriz[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; + char saladVert[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; + + int placed = createWordSalad(saladHoriz, 20, words, 3); + for(int i = 0; i < MAX_SEARCH_FIELD_LEN; i++) + { + for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++) + { + saladVert[j][i] = saladHoriz[i][j]; + } + } + + for(int i = 0; i < 3; i++) { + const char* word = words[i]; + int wordFound = 0; + for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++) + { + const char* row = saladHoriz[j]; + const char* col = saladVert[j]; + wordFound |= strstr(row, word) || strstr(col, word); + } + TEST_ASSERT_TRUE_MESSAGE(wordFound, "Not all words were placed."); + } + + TEST_ASSERT_EQUAL_INT(3, placed); +} + // ---------- Test Setup und TearDown Funktionen ---------- // Hier Setup- und TearDown-Funktionen definieren, @@ -135,6 +164,7 @@ int main(void) { RUN_TEST(test_readWords_empty_file); RUN_TEST(test_createWordSalad_all_fit); RUN_TEST(test_createWordSalad_too_small); + RUN_TEST(test_createWordSalad_allWordsPlaced); int result = UNITY_END(); // Test-Ergebnisse print_test_result(result); diff --git a/Start_Windows/windows/libwordsalad_complete.a b/Start_Windows/windows/libwordsalad_complete.a deleted file mode 100644 index 12567cb..0000000 Binary files a/Start_Windows/windows/libwordsalad_complete.a and /dev/null differ diff --git a/Start_Windows/wordsalad_myversion.exe b/Start_Windows/wordsalad_myversion.exe index 1913b0f..38a48b5 100644 Binary files a/Start_Windows/wordsalad_myversion.exe and b/Start_Windows/wordsalad_myversion.exe differ