From 191b29fc64e5d24bf708062b5cb236adc81e8479 Mon Sep 17 00:00:00 2001 From: Kevin Schellberg Date: Tue, 6 Feb 2024 12:35:44 +0100 Subject: [PATCH] refactoring: Refactoring1 --- build/test/cache/input.yml | 242 ------------------ build/test/cache/test_casualQuiz.c | 0 build/test/dependencies/cmock.d | 6 - build/test/dependencies/quizduell.d | 1 - build/test/dependencies/test_casualQuiz.d | 1 - .../dependencies/test_casualQuiz_runner.d | 4 - build/test/dependencies/test_quizduell.d | 4 - .../test/dependencies/test_quizduell_runner.d | 4 - .../test/dependencies/test_timequiz_runner.d | 4 - build/test/dependencies/test_wwm_runner.d | 3 - build/test/dependencies/unity.d | 4 - build/test/preprocess/files/test_casualQuiz.c | 0 .../preprocess/includes/test_casualQuiz.c | 1 - .../test/preprocess/includes/test_quizduell.c | 3 - build/test/runners/test_casualQuiz_runner.c | 57 ----- src/quizduell.c | 3 +- 16 files changed, 2 insertions(+), 335 deletions(-) delete mode 100644 build/test/cache/input.yml delete mode 100644 build/test/cache/test_casualQuiz.c delete mode 100644 build/test/dependencies/cmock.d delete mode 100644 build/test/dependencies/quizduell.d delete mode 100644 build/test/dependencies/test_casualQuiz.d delete mode 100644 build/test/dependencies/test_casualQuiz_runner.d delete mode 100644 build/test/dependencies/test_quizduell.d delete mode 100644 build/test/dependencies/test_quizduell_runner.d delete mode 100644 build/test/dependencies/test_timequiz_runner.d delete mode 100644 build/test/dependencies/test_wwm_runner.d delete mode 100644 build/test/dependencies/unity.d delete mode 100644 build/test/preprocess/files/test_casualQuiz.c delete mode 100644 build/test/preprocess/includes/test_casualQuiz.c delete mode 100644 build/test/preprocess/includes/test_quizduell.c delete mode 100644 build/test/runners/test_casualQuiz_runner.c diff --git a/build/test/cache/input.yml b/build/test/cache/input.yml deleted file mode 100644 index eefbd61..0000000 --- a/build/test/cache/input.yml +++ /dev/null @@ -1,242 +0,0 @@ ---- -:project: - :use_exceptions: false - :use_mocks: true - :compile_threads: 1 - :test_threads: 1 - :use_test_preprocessor: true - :use_preprocessor_directives: false - :use_deep_dependencies: false - :generate_deep_dependencies: true - :auto_link_deep_dependencies: false - :test_file_prefix: test_ - :options_paths: [] - :release_build: false - :use_auxiliary_dependencies: true - :build_root: build - :which_ceedling: gem - :ceedling_version: 0.31.1 - :default_tasks: - - test:all -:release_build: - :use_assembly: false - :artifacts: [] -:paths: - :test: - - "+:test/**" - - "-:test/support" - :source: - - src/** - :support: - - test/support - :include: [] - :libraries: [] - :test_toolchain_include: [] - :release_toolchain_include: [] -:files: - :test: [] - :source: [] - :assembly: [] - :support: [] - :include: [] -:environment: -- :rake_columns: '120' -:defines: - :test: - - &1 [] - - TEST - :test_preprocess: - - *1 - - TEST - :release: [] - :release_preprocess: [] - :use_test_definition: false - :common: [] -:libraries: - :flag: "-l${1}" - :path_flag: "-L ${1}" - :test: [] - :test_preprocess: [] - :release: [] - :release_preprocess: [] - :placement: :end - :system: [] -:flags: {} -:extension: - :header: ".h" - :source: ".c" - :assembly: ".s" - :object: ".o" - :libraries: - - ".a" - - ".so" - :executable: ".out" - :map: ".map" - :list: ".lst" - :testpass: ".pass" - :testfail: ".fail" - :dependencies: ".d" -:unity: - :vendor_path: C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor - :defines: [] -:cmock: - :vendor_path: C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor - :defines: [] - :includes: [] - :mock_prefix: mock_ - :when_no_prototypes: :warn - :enforce_strict_ordering: true - :plugins: - - :ignore - - :callback - :treat_as: - uint8: HEX8 - uint16: HEX16 - uint32: UINT32 - int8: INT8 - bool: UINT8 - :mock_path: build/test/mocks - :verbosity: 3 - :unity_helper: false -:cexception: - :vendor_path: C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor - :defines: [] -:test_runner: - :includes: [] - :file_suffix: _runner -:tools: - :test_compiler: - :executable: gcc.exe - :name: default_test_compiler - :stderr_redirect: :none - :background_exec: :none - :optional: false - :arguments: - - '' - - '' - - -I"$": COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR - - -I"$": COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE - - "-D$": COLLECTION_DEFINES_TEST_AND_VENDOR - - "-DGNU_COMPILER" - - "-g" - - '' - - -c "${1}" - - -o "${2}" - - "-MMD" - - -MF "${4}" - :test_fixture: - :executable: "${1}" - :name: default_test_fixture - :stderr_redirect: :auto - :background_exec: :none - :optional: false - :arguments: [] - :test_linker: - :executable: gcc.exe - :name: default_test_linker - :stderr_redirect: :none - :background_exec: :none - :optional: false - :arguments: - - '' - - '' - - '' - - '"${1}"' - - "${5}" - - -o "${2}" - - '' - - "${4}" - - '' - :test_file_preprocessor: - :executable: gcc.exe - :name: default_test_file_preprocessor - :stderr_redirect: :none - :background_exec: :none - :optional: false - :arguments: - - '' - - '' - - "-E" - - -I"$": COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR - - -I"$": COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE - - "-D$": COLLECTION_DEFINES_TEST_AND_VENDOR - - "-D$": DEFINES_TEST_PREPROCESS - - "-DGNU_COMPILER" - - '"${1}"' - - -o "${2}" - :test_file_preprocessor_directives: - :executable: gcc.exe - :name: default_test_file_preprocessor_directives - :stderr_redirect: :none - :background_exec: :none - :optional: false - :arguments: - - "-E" - - -I"$": COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR - - -I"$": COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE - - "-D$": COLLECTION_DEFINES_TEST_AND_VENDOR - - "-D$": DEFINES_TEST_PREPROCESS - - "-DGNU_COMPILER" - - "-fdirectives-only" - - '"${1}"' - - -o "${2}" - :test_includes_preprocessor: - :executable: gcc.exe - :name: default_test_includes_preprocessor - :stderr_redirect: :none - :background_exec: :none - :optional: false - :arguments: - - '' - - '' - - "-E" - - "-MM" - - "-MG" - - -I"$": COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR - - -I"$": COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE - - "-D$": COLLECTION_DEFINES_TEST_AND_VENDOR - - "-D$": DEFINES_TEST_PREPROCESS - - "-DGNU_COMPILER" - - '"${1}"' -:test_compiler: - :arguments: [] -:test_linker: - :arguments: [] -:test_fixture: - :arguments: [] - :link_objects: [] -:test_includes_preprocessor: - :arguments: [] -:test_file_preprocessor: - :arguments: [] -:test_file_preprocessor_directives: - :arguments: [] -:test_dependencies_generator: - :arguments: [] -:release_compiler: - :arguments: [] -:release_linker: - :arguments: [] -:release_assembler: - :arguments: [] -:release_dependencies_generator: - :arguments: [] -:plugins: - :load_paths: - - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/lib/../plugins - :enabled: - - stdout_pretty_tests_report - - module_generator - :display_raw_test_results: false - :stdout_pretty_tests_report_path: C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/lib/../plugins/stdout_pretty_tests_report - :module_generator_path: C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/lib/../plugins/module_generator -:gcov: - :reports: - - HtmlDetailed - :gcovr: - :html_medium_threshold: 75 - :html_high_threshold: 90 -:module_generator: - :project_root: "./" - :source_root: src/ - :test_root: test/ diff --git a/build/test/cache/test_casualQuiz.c b/build/test/cache/test_casualQuiz.c deleted file mode 100644 index e69de29..0000000 diff --git a/build/test/dependencies/cmock.d b/build/test/dependencies/cmock.d deleted file mode 100644 index bdf4cc9..0000000 --- a/build/test/dependencies/cmock.d +++ /dev/null @@ -1,6 +0,0 @@ -build/test/out/c/cmock.o: \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/cmock/src/cmock.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/cmock/src/cmock.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/cmock/src/cmock_internals.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/quizduell.d b/build/test/dependencies/quizduell.d deleted file mode 100644 index de79562..0000000 --- a/build/test/dependencies/quizduell.d +++ /dev/null @@ -1 +0,0 @@ -build/test/out/c/quizduell.o: src/quizduell.c src/quizduell.h diff --git a/build/test/dependencies/test_casualQuiz.d b/build/test/dependencies/test_casualQuiz.d deleted file mode 100644 index 5256c22..0000000 --- a/build/test/dependencies/test_casualQuiz.d +++ /dev/null @@ -1 +0,0 @@ -build/test/out/c/test_casualQuiz.o: test/test_casualQuiz.c diff --git a/build/test/dependencies/test_casualQuiz_runner.d b/build/test/dependencies/test_casualQuiz_runner.d deleted file mode 100644 index 7d14e54..0000000 --- a/build/test/dependencies/test_casualQuiz_runner.d +++ /dev/null @@ -1,4 +0,0 @@ -build/test/out/c/test_casualQuiz_runner.o: \ - build/test/runners/test_casualQuiz_runner.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/test_quizduell.d b/build/test/dependencies/test_quizduell.d deleted file mode 100644 index 7ee91aa..0000000 --- a/build/test/dependencies/test_quizduell.d +++ /dev/null @@ -1,4 +0,0 @@ -build/test/out/c/test_quizduell.o: test/test_quizduell.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h \ - src/quizduell.h diff --git a/build/test/dependencies/test_quizduell_runner.d b/build/test/dependencies/test_quizduell_runner.d deleted file mode 100644 index 44b7475..0000000 --- a/build/test/dependencies/test_quizduell_runner.d +++ /dev/null @@ -1,4 +0,0 @@ -build/test/out/c/test_quizduell_runner.o: \ - build/test/runners/test_quizduell_runner.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/test_timequiz_runner.d b/build/test/dependencies/test_timequiz_runner.d deleted file mode 100644 index bf1976a..0000000 --- a/build/test/dependencies/test_timequiz_runner.d +++ /dev/null @@ -1,4 +0,0 @@ -build/test/out/c/test_timequiz_runner.o: \ - build/test/runners/test_timequiz_runner.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/test_wwm_runner.d b/build/test/dependencies/test_wwm_runner.d deleted file mode 100644 index d12ff22..0000000 --- a/build/test/dependencies/test_wwm_runner.d +++ /dev/null @@ -1,3 +0,0 @@ -build/test/out/c/test_wwm_runner.o: build/test/runners/test_wwm_runner.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/unity.d b/build/test/dependencies/unity.d deleted file mode 100644 index 0baf56c..0000000 --- a/build/test/dependencies/unity.d +++ /dev/null @@ -1,4 +0,0 @@ -build/test/out/c/unity.o: \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.c \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ - C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/preprocess/files/test_casualQuiz.c b/build/test/preprocess/files/test_casualQuiz.c deleted file mode 100644 index e69de29..0000000 diff --git a/build/test/preprocess/includes/test_casualQuiz.c b/build/test/preprocess/includes/test_casualQuiz.c deleted file mode 100644 index dcd024e..0000000 --- a/build/test/preprocess/includes/test_casualQuiz.c +++ /dev/null @@ -1 +0,0 @@ ---- [] diff --git a/build/test/preprocess/includes/test_quizduell.c b/build/test/preprocess/includes/test_quizduell.c deleted file mode 100644 index 11ef2c0..0000000 --- a/build/test/preprocess/includes/test_quizduell.c +++ /dev/null @@ -1,3 +0,0 @@ ---- -- C:/Ruby30-x64/lib/ruby/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h -- src/quizduell.h diff --git a/build/test/runners/test_casualQuiz_runner.c b/build/test/runners/test_casualQuiz_runner.c deleted file mode 100644 index 78eb33b..0000000 --- a/build/test/runners/test_casualQuiz_runner.c +++ /dev/null @@ -1,57 +0,0 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -/*=======Automagically Detected Files To Include=====*/ -#include "unity.h" - -int GlobalExpectCount; -int GlobalVerifyOrder; -char* GlobalOrderError; - -/*=======External Functions This Runner Calls=====*/ -extern void setUp(void); -extern void tearDown(void); - - -/*=======Mock Management=====*/ -static void CMock_Init(void) -{ - GlobalExpectCount = 0; - GlobalVerifyOrder = 0; - GlobalOrderError = NULL; -} -static void CMock_Verify(void) -{ -} -static void CMock_Destroy(void) -{ -} - -/*=======Setup (stub)=====*/ -void setUp(void) {} - -/*=======Teardown (stub)=====*/ -void tearDown(void) {} - -/*=======Test Reset Options=====*/ -void resetTest(void); -void resetTest(void) -{ - tearDown(); - CMock_Verify(); - CMock_Destroy(); - CMock_Init(); - setUp(); -} -void verifyTest(void); -void verifyTest(void) -{ - CMock_Verify(); -} - -/*=======MAIN=====*/ -int main(void) -{ - UnityBegin("test_casualQuiz.c"); - - return UnityEnd(); -} diff --git a/src/quizduell.c b/src/quizduell.c index 752db04..4e92364 100644 --- a/src/quizduell.c +++ b/src/quizduell.c @@ -25,7 +25,8 @@ int spieleKategorie(Kategorie* kategorie) { int jokerVerwendet = 0; for (int i = 0; i < kategorie->anzahlFragen; i++) { - char benutzerAntwort[10]; + #define MAX_ANSWER_LENGTH 10 + char benutzerAntwort[MAX_ANSWER_LENGTH]; printf("\nQuestion %d:\n%s", i + 1, kategorie->fragen[i].frage);