freudenreichan/info2Praktikum-Wortsalat
Template
4
0
Fork 20
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: freudenreichan:main
Branches Tags
freudenreichan:main
reckertni101608:main
..
compare: reckertni101608:main
Branches Tags
reckertni101608:main
freudenreichan:main

No commits in common. "main" and "main" have entirely different histories.
main ... main

11 changed files with 11 additions and 101 deletions
Show Stats Expand all files Collapse all files

BIN
Start_Linux/linux/libraylib.a
View File

Binary file not shown.

6
Start_Linux/makefile
View File

@ -1,9 +1,9 @@
CC = gcc CC = gcc
CFLAGS = -g -Wall CFLAGS = -g -Wall -I$(raylibfolder)
LDFLAGS = -lGL -lX11 -lm LDFLAGS = -lGL -lX11 -lm
BINARIES = ./linux BINARIES = ./linux
raylibfolder = ./raylib raylib_folder = ./raylib
unityfolder = ./unity unityfolder = ./unity
# -------------------------- # --------------------------
@ -28,7 +28,7 @@ game.o: game.c
$(CC) $(CFLAGS) -c game.c $(CC) $(CFLAGS) -c game.c
graphicalGame.o: graphicalGame.c graphicalGame.o: graphicalGame.c
$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c $(CC) $(CFLAGS) -c graphicalGame.c
# -------------------------- # --------------------------
# Unit Tests # Unit Tests

33
Start_Linux/unit_tests.c
View File

@ -101,37 +101,7 @@ 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 ---------- // ---------- Test Setup und TearDown Funktionen ----------
// Hier Setup- und TearDown-Funktionen definieren, // Hier Setup- und TearDown-Funktionen definieren,
// falls Vor- und Nachbereitungen für die Tests benötigt. // falls Vor- und Nachbereitungen für die Tests benötigt.
@ -164,10 +134,9 @@ int main(void) {
RUN_TEST(test_readWords_empty_file); RUN_TEST(test_readWords_empty_file);
RUN_TEST(test_createWordSalad_all_fit); RUN_TEST(test_createWordSalad_all_fit);
RUN_TEST(test_createWordSalad_too_small); RUN_TEST(test_createWordSalad_too_small);
RUN_TEST(test_createWordSalad_allWordsPlaced);
int result = UNITY_END(); // Test-Ergebnisse int result = UNITY_END(); // Test-Ergebnisse
print_test_result(result); print_test_result(result);
return result; return result;
} }

0
Start_Mac/macos-x86_64/libraylib.a → Start_Mac/macos-x64/libraylib.a
View File

0
Start_Mac/macos-x86_64/libunity.a → Start_Mac/macos-x64/libunity.a
View File

0
Start_Mac/macos-x86_64/libwordsalad.a → Start_Mac/macos-x64/libwordsalad.a
View File

0
Start_Mac/macos-x86_64/libwordsalad_complete.a → Start_Mac/macos-x64/libwordsalad_complete.a
View File

4
Start_Mac/makefile
View File

@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f
ARCH := $(shell uname -m) ARCH := $(shell uname -m)
BINARIES = ./macos-$(ARCH) BINARIES = ./macos-$(ARCH)
raylibfolder = ./raylib raylib_folder = ./raylib
unityfolder = ./unity unityfolder = ./unity
# -------------------------- # --------------------------
@ -43,4 +43,4 @@ test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
# Clean # Clean
# -------------------------- # --------------------------
clean: clean:
rm -f *.o wordsalad $(TEST_BIN) rm -f *.o wordsalad

30
Start_Mac/unit_tests.c
View File

@ -101,35 +101,6 @@ 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 ---------- // ---------- Test Setup und TearDown Funktionen ----------
// Hier Setup- und TearDown-Funktionen definieren, // Hier Setup- und TearDown-Funktionen definieren,
@ -164,7 +135,6 @@ int main(void) {
RUN_TEST(test_readWords_empty_file); RUN_TEST(test_readWords_empty_file);
RUN_TEST(test_createWordSalad_all_fit); RUN_TEST(test_createWordSalad_all_fit);
RUN_TEST(test_createWordSalad_too_small); RUN_TEST(test_createWordSalad_too_small);
RUN_TEST(test_createWordSalad_allWordsPlaced);
int result = UNITY_END(); // Test-Ergebnisse int result = UNITY_END(); // Test-Ergebnisse
print_test_result(result); print_test_result(result);

9
Start_Windows/makefile
View File

@ -1,9 +1,9 @@
CC = gcc CC = gcc
CFLAGS = -g -Wall CFLAGS = -g -Wall -I$(raylibfolder)
LDFLAGS = -lopengl32 -lgdi32 -lwinmm LDFLAGS = -lopengl32 -lgdi32 -lwinmm
BINARIES = ./windows BINARIES = ./windows
raylibfolder = ./raylib raylib_folder = ./raylib
unityfolder = ./unity unityfolder = ./unity
# -------------------------- # --------------------------
@ -12,6 +12,7 @@ unityfolder = ./unity
wordsalad_initial: wordsalad_initial:
$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
# -------------------------- # --------------------------
# Normales Spiel bauen # Normales Spiel bauen
# -------------------------- # --------------------------
@ -22,13 +23,13 @@ main.o: main.c
$(CC) -c $(CFLAGS) main.c $(CC) -c $(CFLAGS) main.c
input.o: input.c input.o: input.c
$(CC) -c $(CFLAGS) input.c $(CC) -c $(CFLAGS)input.c
game.o: game.c game.o: game.c
$(CC) -c $(CFLAGS) game.c $(CC) -c $(CFLAGS) game.c
graphicalGame.o: graphicalGame.c graphicalGame.o: graphicalGame.c
$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c $(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
# -------------------------- # --------------------------
# Unit Tests # Unit Tests

30
Start_Windows/unit_tests.c
View File

@ -101,35 +101,6 @@ 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 ---------- // ---------- Test Setup und TearDown Funktionen ----------
// Hier Setup- und TearDown-Funktionen definieren, // Hier Setup- und TearDown-Funktionen definieren,
@ -164,7 +135,6 @@ int main(void) {
RUN_TEST(test_readWords_empty_file); RUN_TEST(test_readWords_empty_file);
RUN_TEST(test_createWordSalad_all_fit); RUN_TEST(test_createWordSalad_all_fit);
RUN_TEST(test_createWordSalad_too_small); RUN_TEST(test_createWordSalad_too_small);
RUN_TEST(test_createWordSalad_allWordsPlaced);
int result = UNITY_END(); // Test-Ergebnisse int result = UNITY_END(); // Test-Ergebnisse
print_test_result(result); print_test_result(result);