From d8885f0875593a8e48489dd54fea5c1ee76c360f Mon Sep 17 00:00:00 2001 From: Kevin Schellberg Date: Tue, 6 Feb 2024 12:37:47 +0100 Subject: [PATCH] refactoring: Refactoring2 --- build/test/cache/input.yml | 242 ++++++++++++++++++ build/test/cache/test_casualQuiz.c | 0 build/test/dependencies/quizduell.d | 1 + .../dependencies/test_casualQuiz_runner.d | 4 + .../test/dependencies/test_timequiz_runner.d | 4 + build/test/dependencies/test_wwm_runner.d | 3 + build/test/out/c/quizduell.o | Bin 13290 -> 13290 bytes build/test/out/test_casualQuiz.out | Bin 101213 -> 101213 bytes build/test/out/test_quizduell.out | Bin 129987 -> 129987 bytes build/test/out/test_timequiz.out | Bin 101211 -> 101211 bytes build/test/out/test_wwm.out | Bin 101188 -> 101188 bytes build/test/preprocess/files/test_casualQuiz.c | 0 .../preprocess/includes/test_casualQuiz.c | 1 + .../test/preprocess/includes/test_quizduell.c | 3 + build/test/results/test_casualQuiz.pass | 2 +- build/test/results/test_quizduell.pass | 2 +- build/test/results/test_timequiz.pass | 2 +- build/test/results/test_wwm.pass | 2 +- build/test/runners/test_casualQuiz_runner.c | 57 +++++ src/quizduell.c | 3 +- 20 files changed, 321 insertions(+), 5 deletions(-) create mode 100644 build/test/cache/input.yml create mode 100644 build/test/cache/test_casualQuiz.c create mode 100644 build/test/dependencies/quizduell.d create mode 100644 build/test/dependencies/test_casualQuiz_runner.d create mode 100644 build/test/dependencies/test_timequiz_runner.d create mode 100644 build/test/dependencies/test_wwm_runner.d create mode 100644 build/test/preprocess/files/test_casualQuiz.c create mode 100644 build/test/preprocess/includes/test_casualQuiz.c create mode 100644 build/test/preprocess/includes/test_quizduell.c create mode 100644 build/test/runners/test_casualQuiz_runner.c diff --git a/build/test/cache/input.yml b/build/test/cache/input.yml new file mode 100644 index 0000000..eefbd61 --- /dev/null +++ b/build/test/cache/input.yml @@ -0,0 +1,242 @@ +--- +: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 new file mode 100644 index 0000000..e69de29 diff --git a/build/test/dependencies/quizduell.d b/build/test/dependencies/quizduell.d new file mode 100644 index 0000000..de79562 --- /dev/null +++ b/build/test/dependencies/quizduell.d @@ -0,0 +1 @@ +build/test/out/c/quizduell.o: src/quizduell.c src/quizduell.h diff --git a/build/test/dependencies/test_casualQuiz_runner.d b/build/test/dependencies/test_casualQuiz_runner.d new file mode 100644 index 0000000..7d14e54 --- /dev/null +++ b/build/test/dependencies/test_casualQuiz_runner.d @@ -0,0 +1,4 @@ +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_timequiz_runner.d b/build/test/dependencies/test_timequiz_runner.d new file mode 100644 index 0000000..bf1976a --- /dev/null +++ b/build/test/dependencies/test_timequiz_runner.d @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..d12ff22 --- /dev/null +++ b/build/test/dependencies/test_wwm_runner.d @@ -0,0 +1,3 @@ +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/out/c/quizduell.o b/build/test/out/c/quizduell.o index c1f2cb3d7230c6fd6e19f4480f4c6bd4f0f6cd95..4faa0d54be2a8e86ba9ebead3c99a8a10af11742 100644 GIT binary patch delta 219 zcmaEr{wjULE*Zwg$-8A_7+WUakWsdr&G(prfq{AAfjY*-(&F;Oj2zFrl++4_MZ9i| z3=B*YeHhD9i_%I{(~}a5QoR#PQq%K`GE?&y4oo(YRbX5)IaF4Sam(ZySvkgolV{87 zGFDAKDJu;mpUP@67EczClLnGHavLOM`TAKw=D9Ft8ZsfMVZMNKpTuE>&h!Knr!x$7h_?J*_@`F$tdEgz^cT+#KKg8ZsfMVZMNKpPAv>&h!K8gKTO7h_?J-kheK$tdEcz^cT+#KKgd16M6XI@Hb1;e7rfB(xf9+)c2sKB^nsvV=6!WKa{ zph?UV_tZ16PR)cE>k2Xx2pBUN4o+=h)RnEWg<9wgkpNow3uqzBA|SVF>N!R&#^R|z z8KoJEr;9Q&Zjg}W>t|(PV4CQ{n3bQMTI85lQl4K_!k{?)E+eBdqv3Q$CPooPqv>Ky wjEamV+bx(FkC-sVZ2xPJF4vY*842>K>0tguAY+`0$5LyFd zHcvkIUs-Y%-(w(~dE$XO#>CR%^2CfB&%Bh>3WkM~|NfU}+&@*8QGs#sR69mBh0TI) zK$Dm!?x|;BotguF&;S4c diff --git a/build/test/out/test_timequiz.out b/build/test/out/test_timequiz.out index a50bbeeb84a48a923185422e7056f20964b52200..2d338dc7fc99b941e210f130a0fdf48437d7d633 100755 GIT binary patch delta 26 icmcaTjqUa{wh0}~36h5yjqS)Zwh0}~36h5-g=ucvkL%_p9+%z delta 26 icmX>yjqS)Zwh0}~A{X~h?Dl28wU@E+_SV~snOy*+K@4O7 diff --git a/build/test/preprocess/files/test_casualQuiz.c b/build/test/preprocess/files/test_casualQuiz.c new file mode 100644 index 0000000..e69de29 diff --git a/build/test/preprocess/includes/test_casualQuiz.c b/build/test/preprocess/includes/test_casualQuiz.c new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/build/test/preprocess/includes/test_casualQuiz.c @@ -0,0 +1 @@ +--- [] diff --git a/build/test/preprocess/includes/test_quizduell.c b/build/test/preprocess/includes/test_quizduell.c new file mode 100644 index 0000000..11ef2c0 --- /dev/null +++ b/build/test/preprocess/includes/test_quizduell.c @@ -0,0 +1,3 @@ +--- +- 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/results/test_casualQuiz.pass b/build/test/results/test_casualQuiz.pass index 3301a27..17c38f2 100644 --- a/build/test/results/test_casualQuiz.pass +++ b/build/test/results/test_casualQuiz.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0179982999979984 +:time: 0.019618399994214997 diff --git a/build/test/results/test_quizduell.pass b/build/test/results/test_quizduell.pass index 633bfd2..5e02b30 100644 --- a/build/test/results/test_quizduell.pass +++ b/build/test/results/test_quizduell.pass @@ -51,4 +51,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.01801990000240039 +:time: 0.01995129999704659 diff --git a/build/test/results/test_timequiz.pass b/build/test/results/test_timequiz.pass index 8e588fd..8bab1b8 100644 --- a/build/test/results/test_timequiz.pass +++ b/build/test/results/test_timequiz.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.017314299999270588 +:time: 0.02664090000325814 diff --git a/build/test/results/test_wwm.pass b/build/test/results/test_wwm.pass index 20ee08d..4c520b3 100644 --- a/build/test/results/test_wwm.pass +++ b/build/test/results/test_wwm.pass @@ -11,4 +11,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.017585499997949228 +:time: 0.021034899982623756 diff --git a/build/test/runners/test_casualQuiz_runner.c b/build/test/runners/test_casualQuiz_runner.c new file mode 100644 index 0000000..78eb33b --- /dev/null +++ b/build/test/runners/test_casualQuiz_runner.c @@ -0,0 +1,57 @@ +/* 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 4e92364..a60eb72 100644 --- a/src/quizduell.c +++ b/src/quizduell.c @@ -157,7 +157,8 @@ void quizduell() { zeigeVerfuegbareKategorien(kategorien); printf("Your selection: "); - scanf("%s", auswahl); + if (scanf("%s", auswahl) != 1) { + } int auswahlIndex = -1;