diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/1-Assignment_-_BitManipulations.docx b/C/C(extra) ExtraAssignments/BitStuff/1-Assignment_-_BitManipulations.docx similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/1-Assignment_-_BitManipulations.docx rename to C/C(extra) ExtraAssignments/BitStuff/1-Assignment_-_BitManipulations.docx diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Makefile b/C/C(extra) ExtraAssignments/BitStuff/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Makefile rename to C/C(extra) ExtraAssignments/BitStuff/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/Unity/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/Unity/.gitkeep diff --git a/C/Adidas/Unity/unity.c b/C/C(extra) ExtraAssignments/BitStuff/Unity/unity.c similarity index 100% rename from C/Adidas/Unity/unity.c rename to C/C(extra) ExtraAssignments/BitStuff/Unity/unity.c diff --git a/C/Adidas/Unity/unity.h b/C/C(extra) ExtraAssignments/BitStuff/Unity/unity.h similarity index 100% rename from C/Adidas/Unity/unity.h rename to C/C(extra) ExtraAssignments/BitStuff/Unity/unity.h diff --git a/C/Adidas/Unity/unity_internals.h b/C/C(extra) ExtraAssignments/BitStuff/Unity/unity_internals.h similarity index 100% rename from C/Adidas/Unity/unity_internals.h rename to C/C(extra) ExtraAssignments/BitStuff/Unity/unity_internals.h diff --git a/C/Adidas/Unity/unity_test_module.c b/C/C(extra) ExtraAssignments/BitStuff/Unity/unity_test_module.c similarity index 100% rename from C/Adidas/Unity/unity_test_module.c rename to C/C(extra) ExtraAssignments/BitStuff/Unity/unity_test_module.c diff --git a/C/Adidas/Unity/unity_test_module.h b/C/C(extra) ExtraAssignments/BitStuff/Unity/unity_test_module.h similarity index 100% rename from C/Adidas/Unity/unity_test_module.h rename to C/C(extra) ExtraAssignments/BitStuff/Unity/unity_test_module.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/build/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/build/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/build/main_test b/C/C(extra) ExtraAssignments/BitStuff/build/main_test old mode 100755 new mode 100644 similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/build/main_test rename to C/C(extra) ExtraAssignments/BitStuff/build/main_test diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/build/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/product/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/build/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/product/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/product/bit_stuff_main.c b/C/C(extra) ExtraAssignments/BitStuff/product/bit_stuff_main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/product/bit_stuff_main.c rename to C/C(extra) ExtraAssignments/BitStuff/product/bit_stuff_main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/product/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/shared/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/product/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/shared/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/bit_stuff.c b/C/C(extra) ExtraAssignments/BitStuff/shared/bit_stuff.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/bit_stuff.c rename to C/C(extra) ExtraAssignments/BitStuff/shared/bit_stuff.c diff --git a/C/Adidas/shared/bit_stuff.h b/C/C(extra) ExtraAssignments/BitStuff/shared/bit_stuff.h similarity index 100% rename from C/Adidas/shared/bit_stuff.h rename to C/C(extra) ExtraAssignments/BitStuff/shared/bit_stuff.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/.gitkeep b/C/C(extra) ExtraAssignments/BitStuff/test/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/.gitkeep rename to C/C(extra) ExtraAssignments/BitStuff/test/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/test/bit_stuff_test.c b/C/C(extra) ExtraAssignments/BitStuff/test/bit_stuff_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/test/bit_stuff_test.c rename to C/C(extra) ExtraAssignments/BitStuff/test/bit_stuff_test.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/SecretService/2-Challenge Secret Service.pdf b/C/C(extra) ExtraAssignments/SecretService/2-Challenge Secret Service.pdf similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/SecretService/2-Challenge Secret Service.pdf rename to C/C(extra) ExtraAssignments/SecretService/2-Challenge Secret Service.pdf diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/2-Assignment - Skater.docx b/C/C(extra) ExtraAssignments/Skater/2-Assignment - Skater.docx similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/2-Assignment - Skater.docx rename to C/C(extra) ExtraAssignments/Skater/2-Assignment - Skater.docx diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Makefile b/C/C(extra) ExtraAssignments/Skater/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Makefile rename to C/C(extra) ExtraAssignments/Skater/Makefile diff --git a/C/C2/Unity/unity.c b/C/C(extra) ExtraAssignments/Skater/Unity/unity.c similarity index 100% rename from C/C2/Unity/unity.c rename to C/C(extra) ExtraAssignments/Skater/Unity/unity.c diff --git a/C/C2/Unity/unity.h b/C/C(extra) ExtraAssignments/Skater/Unity/unity.h similarity index 100% rename from C/C2/Unity/unity.h rename to C/C(extra) ExtraAssignments/Skater/Unity/unity.h diff --git a/C/C2/Unity/unity_internals.h b/C/C(extra) ExtraAssignments/Skater/Unity/unity_internals.h similarity index 100% rename from C/C2/Unity/unity_internals.h rename to C/C(extra) ExtraAssignments/Skater/Unity/unity_internals.h diff --git a/C/C2/Unity/unity_test_module.c b/C/C(extra) ExtraAssignments/Skater/Unity/unity_test_module.c similarity index 100% rename from C/C2/Unity/unity_test_module.c rename to C/C(extra) ExtraAssignments/Skater/Unity/unity_test_module.c diff --git a/C/C2/Unity/unity_test_module.h b/C/C(extra) ExtraAssignments/Skater/Unity/unity_test_module.h similarity index 100% rename from C/C2/Unity/unity_test_module.h rename to C/C(extra) ExtraAssignments/Skater/Unity/unity_test_module.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/doc/Assignment.txt b/C/C(extra) ExtraAssignments/Skater/doc/Assignment.txt similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/doc/Assignment.txt rename to C/C(extra) ExtraAssignments/Skater/doc/Assignment.txt diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/main.c b/C/C(extra) ExtraAssignments/Skater/product/main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/main.c rename to C/C(extra) ExtraAssignments/Skater/product/main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/terminal_io.c b/C/C(extra) ExtraAssignments/Skater/product/terminal_io.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/terminal_io.c rename to C/C(extra) ExtraAssignments/Skater/product/terminal_io.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/terminal_io.h b/C/C(extra) ExtraAssignments/Skater/product/terminal_io.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/product/terminal_io.h rename to C/C(extra) ExtraAssignments/Skater/product/terminal_io.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/shared/skater.c b/C/C(extra) ExtraAssignments/Skater/shared/skater.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/shared/skater.c rename to C/C(extra) ExtraAssignments/Skater/shared/skater.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/shared/skater.h b/C/C(extra) ExtraAssignments/Skater/shared/skater.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/shared/skater.h rename to C/C(extra) ExtraAssignments/Skater/shared/skater.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/test/main.c b/C/C(extra) ExtraAssignments/Skater/test/main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/test/main.c rename to C/C(extra) ExtraAssignments/Skater/test/main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/test/skater_test.c b/C/C(extra) ExtraAssignments/Skater/test/skater_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/test/skater_test.c rename to C/C(extra) ExtraAssignments/Skater/test/skater_test.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageCitroen2Cv.bmp b/C/C(extra) ExtraAssignments/Stegano/ImageCitroen2Cv.bmp similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageCitroen2Cv.bmp rename to C/C(extra) ExtraAssignments/Stegano/ImageCitroen2Cv.bmp diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageRedFerrari.bmp b/C/C(extra) ExtraAssignments/Stegano/ImageRedFerrari.bmp similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageRedFerrari.bmp rename to C/C(extra) ExtraAssignments/Stegano/ImageRedFerrari.bmp diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageTrabant.bmp b/C/C(extra) ExtraAssignments/Stegano/ImageTrabant.bmp similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageTrabant.bmp rename to C/C(extra) ExtraAssignments/Stegano/ImageTrabant.bmp diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageYellowFerrari.bmp b/C/C(extra) ExtraAssignments/Stegano/ImageYellowFerrari.bmp similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ImageYellowFerrari.bmp rename to C/C(extra) ExtraAssignments/Stegano/ImageYellowFerrari.bmp diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Makefile b/C/C(extra) ExtraAssignments/Stegano/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Makefile rename to C/C(extra) ExtraAssignments/Stegano/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/list.c b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/list.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/list.c rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/list.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/list.h b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/list.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/list.h rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/list.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/resource_detector.c b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/resource_detector.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/resource_detector.c rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/resource_detector.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/resource_detector.h b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/resource_detector.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/resource_detector.h rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/resource_detector.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/test/Makefile b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/test/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/test/Makefile rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/test/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/test/list_test.c b/C/C(extra) ExtraAssignments/Stegano/ResourceDetector/test/list_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/ResourceDetector/test/list_test.c rename to C/C(extra) ExtraAssignments/Stegano/ResourceDetector/test/list_test.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/SteganoAssignment.doc b/C/C(extra) ExtraAssignments/Stegano/SteganoAssignment.doc similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/SteganoAssignment.doc rename to C/C(extra) ExtraAssignments/Stegano/SteganoAssignment.doc diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/TextFontys.txt b/C/C(extra) ExtraAssignments/Stegano/TextFontys.txt similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/TextFontys.txt rename to C/C(extra) ExtraAssignments/Stegano/TextFontys.txt diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity.c b/C/C(extra) ExtraAssignments/Stegano/Unity/unity.c similarity index 100% rename from C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity.c rename to C/C(extra) ExtraAssignments/Stegano/Unity/unity.c diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity.h b/C/C(extra) ExtraAssignments/Stegano/Unity/unity.h similarity index 100% rename from C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity.h rename to C/C(extra) ExtraAssignments/Stegano/Unity/unity.h diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_internals.h b/C/C(extra) ExtraAssignments/Stegano/Unity/unity_internals.h similarity index 100% rename from C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_internals.h rename to C/C(extra) ExtraAssignments/Stegano/Unity/unity_internals.h diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_test_module.c b/C/C(extra) ExtraAssignments/Stegano/Unity/unity_test_module.c similarity index 100% rename from C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_test_module.c rename to C/C(extra) ExtraAssignments/Stegano/Unity/unity_test_module.c diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_test_module.h b/C/C(extra) ExtraAssignments/Stegano/Unity/unity_test_module.h similarity index 100% rename from C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Unity/unity_test_module.h rename to C/C(extra) ExtraAssignments/Stegano/Unity/unity_test_module.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/bmp.h b/C/C(extra) ExtraAssignments/Stegano/bmp.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/bmp.h rename to C/C(extra) ExtraAssignments/Stegano/bmp.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/challengelevel.json b/C/C(extra) ExtraAssignments/Stegano/challengelevel.json similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/challengelevel.json rename to C/C(extra) ExtraAssignments/Stegano/challengelevel.json diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano.c b/C/C(extra) ExtraAssignments/Stegano/stegano.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano.c rename to C/C(extra) ExtraAssignments/Stegano/stegano.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano.h b/C/C(extra) ExtraAssignments/Stegano/stegano.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano.h rename to C/C(extra) ExtraAssignments/Stegano/stegano.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano_main.c b/C/C(extra) ExtraAssignments/Stegano/stegano_main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano_main.c rename to C/C(extra) ExtraAssignments/Stegano/stegano_main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano_test.c b/C/C(extra) ExtraAssignments/Stegano/stegano_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/stegano_test.c rename to C/C(extra) ExtraAssignments/Stegano/stegano_test.c diff --git a/C/C1.zip b/C/C1 bike computer.zip similarity index 100% rename from C/C1.zip rename to C/C1 bike computer.zip diff --git a/C/C1/.vscode/settings.json b/C/C1 bike computer/.vscode/settings.json similarity index 100% rename from C/C1/.vscode/settings.json rename to C/C1 bike computer/.vscode/settings.json diff --git a/C/C1/Makefile b/C/C1 bike computer/Makefile similarity index 100% rename from C/C1/Makefile rename to C/C1 bike computer/Makefile diff --git a/C/C1/bike_math.c b/C/C1 bike computer/bike_math.c similarity index 100% rename from C/C1/bike_math.c rename to C/C1 bike computer/bike_math.c diff --git a/C/C1/bike_math.h b/C/C1 bike computer/bike_math.h similarity index 100% rename from C/C1/bike_math.h rename to C/C1 bike computer/bike_math.h diff --git a/C/C1/bike_measure.c b/C/C1 bike computer/bike_measure.c similarity index 100% rename from C/C1/bike_measure.c rename to C/C1 bike computer/bike_measure.c diff --git a/C/C1/bike_measure.h b/C/C1 bike computer/bike_measure.h similarity index 100% rename from C/C1/bike_measure.h rename to C/C1 bike computer/bike_measure.h diff --git a/C/C1/bike_store.c b/C/C1 bike computer/bike_store.c similarity index 100% rename from C/C1/bike_store.c rename to C/C1 bike computer/bike_store.c diff --git a/C/C1/bike_store.h b/C/C1 bike computer/bike_store.h similarity index 100% rename from C/C1/bike_store.h rename to C/C1 bike computer/bike_store.h diff --git a/C/C1/main b/C/C1 bike computer/main old mode 100755 new mode 100644 similarity index 100% rename from C/C1/main rename to C/C1 bike computer/main diff --git a/C/C1/main.c b/C/C1 bike computer/main.c similarity index 100% rename from C/C1/main.c rename to C/C1 bike computer/main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/.gitignore b/C/C2 AnimalShelter/.gitignore similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/.gitignore rename to C/C2 AnimalShelter/.gitignore diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/2-Assignment - AnimalShelter.docx.url b/C/C2 AnimalShelter/2-Assignment - AnimalShelter.docx.url similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/2-Assignment - AnimalShelter.docx.url rename to C/C2 AnimalShelter/2-Assignment - AnimalShelter.docx.url diff --git a/C/C2/Makefile b/C/C2 AnimalShelter/Makefile similarity index 100% rename from C/C2/Makefile rename to C/C2 AnimalShelter/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity.c b/C/C2 AnimalShelter/Unity/unity.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity.c rename to C/C2 AnimalShelter/Unity/unity.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity.h b/C/C2 AnimalShelter/Unity/unity.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity.h rename to C/C2 AnimalShelter/Unity/unity.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_internals.h b/C/C2 AnimalShelter/Unity/unity_internals.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_internals.h rename to C/C2 AnimalShelter/Unity/unity_internals.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_test_module.c b/C/C2 AnimalShelter/Unity/unity_test_module.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_test_module.c rename to C/C2 AnimalShelter/Unity/unity_test_module.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_test_module.h b/C/C2 AnimalShelter/Unity/unity_test_module.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Unity/unity_test_module.h rename to C/C2 AnimalShelter/Unity/unity_test_module.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/test/.gitkeep b/C/C2 AnimalShelter/build/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/test/.gitkeep rename to C/C2 AnimalShelter/build/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/main b/C/C2 AnimalShelter/build/main old mode 100755 new mode 100644 similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/main rename to C/C2 AnimalShelter/build/main diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/main_test b/C/C2 AnimalShelter/build/main_test old mode 100755 new mode 100644 similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/build/main_test rename to C/C2 AnimalShelter/build/main_test diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/main.c b/C/C2 AnimalShelter/product/main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/main.c rename to C/C2 AnimalShelter/product/main.c diff --git a/C/C2/product/terminal_io.c b/C/C2 AnimalShelter/product/terminal_io.c similarity index 100% rename from C/C2/product/terminal_io.c rename to C/C2 AnimalShelter/product/terminal_io.c diff --git a/C/C2/product/terminal_io.h b/C/C2 AnimalShelter/product/terminal_io.h similarity index 100% rename from C/C2/product/terminal_io.h rename to C/C2 AnimalShelter/product/terminal_io.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/administration.c b/C/C2 AnimalShelter/shared/administration.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/administration.c rename to C/C2 AnimalShelter/shared/administration.c diff --git a/C/C2/shared/administration.h b/C/C2 AnimalShelter/shared/administration.h similarity index 100% rename from C/C2/shared/administration.h rename to C/C2 AnimalShelter/shared/administration.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/animal.h b/C/C2 AnimalShelter/shared/animal.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/animal.h rename to C/C2 AnimalShelter/shared/animal.h diff --git a/C/C2/shared/file_element.c b/C/C2 AnimalShelter/shared/file_element.c similarity index 100% rename from C/C2/shared/file_element.c rename to C/C2 AnimalShelter/shared/file_element.c diff --git a/C/C2/shared/file_element.h b/C/C2 AnimalShelter/shared/file_element.h similarity index 100% rename from C/C2/shared/file_element.h rename to C/C2 AnimalShelter/shared/file_element.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/administration_test.c b/C/C2 AnimalShelter/test/administration_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/administration_test.c rename to C/C2 AnimalShelter/test/administration_test.c diff --git a/C/C2/test/file_element_test.c b/C/C2 AnimalShelter/test/file_element_test.c similarity index 100% rename from C/C2/test/file_element_test.c rename to C/C2 AnimalShelter/test/file_element_test.c diff --git a/C/C2/test/main.c b/C/C2 AnimalShelter/test/main.c similarity index 100% rename from C/C2/test/main.c rename to C/C2 AnimalShelter/test/main.c diff --git a/C/C2/.vscode/c_cpp_properties.json b/C/C2/.vscode/c_cpp_properties.json deleted file mode 100644 index c2098a2..0000000 --- a/C/C2/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "linux-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "/usr/bin/gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "linux-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file diff --git a/C/C2/.vscode/launch.json b/C/C2/.vscode/launch.json deleted file mode 100644 index a53e5db..0000000 --- a/C/C2/.vscode/launch.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "type": "lldb", - "request": "launch", - "name": "Debug", - "program": "${workspaceFolder}/", - "args": [], - "cwd": "${workspaceFolder}" - }, - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": false, - "cwd": "/home/rens/T2/C/C2", - "program": "/home/rens/T2/C/C2/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file diff --git a/C/C2/.vscode/settings.json b/C/C2/.vscode/settings.json deleted file mode 100644 index 3e5eb95..0000000 --- a/C/C2/.vscode/settings.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wcast-align", - "-Wconversion", - "-Wsign-conversion", - "-Wnull-dereference" - ], - "C_Cpp_Runner.msvcWarnings": [ - "/W4", - "/permissive-", - "/w14242", - "/w14287", - "/w14296", - "/w14311", - "/w14826", - "/w44062", - "/w44242", - "/w14905", - "/w14906", - "/w14263", - "/w44265", - "/w14928" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false, - "C_Cpp_Runner.useUndefinedSanitizer": false, - "C_Cpp_Runner.useLeakSanitizer": false, - "C_Cpp_Runner.showCompilationTime": false, - "C_Cpp_Runner.useLinkTimeOptimization": false, - "C_Cpp_Runner.msvcSecureNoWarnings": false -} \ No newline at end of file diff --git a/C/C2/2-Assignment - AnimalShelter.docx b/C/C2/2-Assignment - AnimalShelter.docx deleted file mode 100644 index 401f9fe..0000000 Binary files a/C/C2/2-Assignment - AnimalShelter.docx and /dev/null differ diff --git a/C/C2/assignment.pdf b/C/C2/assignment.pdf deleted file mode 100644 index 75ade2e..0000000 Binary files a/C/C2/assignment.pdf and /dev/null differ diff --git a/C/C2/build/main b/C/C2/build/main deleted file mode 100755 index 1f39513..0000000 Binary files a/C/C2/build/main and /dev/null differ diff --git a/C/C2/build/main_test b/C/C2/build/main_test deleted file mode 100644 index df1347b..0000000 Binary files a/C/C2/build/main_test and /dev/null differ diff --git a/C/C2/product/main.c b/C/C2/product/main.c deleted file mode 100644 index a06d475..0000000 --- a/C/C2/product/main.c +++ /dev/null @@ -1,160 +0,0 @@ -#include -#include -#include -#include - -#include "administration.h" -#include "animal.h" -#include "terminal_io.h" -#include "file_element.h" - - -static void addTestData(Animal* animals, size_t* nrAnimals) -{ - Animal a1 = { 1, Dog, Male, 12, { 1, 2, 3 } }; - Animal a2 = { 2, Cat, Female, 4, { 4, 3, 2 } }; - Animal a3 = { 3, Parrot, Male, 40, { 8, 9, 10 } }; - Animal a4 = { 4, Dog, Female, 1, { 1, 1, 100 } }; - Animal a5 = { 5, GuineaPig, Male, 3, { 3, 4, 1 } }; - - animals[(*nrAnimals)++] = a1; - animals[(*nrAnimals)++] = a2; - animals[(*nrAnimals)++] = a3; - animals[(*nrAnimals)++] = a4; - animals[(*nrAnimals)++] = a5; -} - -int main(int argc, char* argv[]) -{ - const size_t MaxNrAnimals = 20; - Animal animals[MaxNrAnimals]; - size_t nrAnimals = 0; - MenuOptions choice = MO_SHOW_ANIMALS; - - addTestData(animals, &nrAnimals); - - printf("PRC assignment 'Animal Shelter'\n" - "-------------------------------------------"); - - if (argc != 1) - { - fprintf(stderr, "%s: argc=%d\n", argv[0], argc); - } - - while (choice != MO_QUIT) - { - printf("\n\nMENU\n====\n\n"); - choice = getMenuChoice(); - - switch (choice) - { - case MO_SHOW_ANIMALS: - printAnimals(animals, nrAnimals); - break; - case MO_ADD_ANIMAL: - { - Animal newAnimal; - newAnimal.Id = getInt("Enter animal ID: "); - newAnimal.Species = (Species)getLimitedInt("Enter species: ", SpeciesNames, sizeof(SpeciesNames) / sizeof(SpeciesNames[0])); - newAnimal.Sex = (Sex)getLimitedInt("Enter sex: ", SexNames, sizeof(SexNames) / sizeof(SexNames[0])); - newAnimal.Age = getInt("Enter age: "); - newAnimal.DateFound = getDate("Enter date found: "); - if (addAnimal(&newAnimal, animals, MaxNrAnimals, nrAnimals, &nrAnimals) == 0) - { - printf("Animal added successfully.\n"); - } - else - { - printf("Failed to add animal.\n"); - } - break; - } - case MO_REMOVE_ANIMAL: - { - int animalId = getInt("Enter animal ID to remove: "); - size_t newNrAnimals; - if (removeAnimal(animalId, animals, nrAnimals, &newNrAnimals) >= 0) - { - nrAnimals = newNrAnimals; - printf("Animal removed successfully.\n"); - } - else - { - printf("Failed to remove animal.\n"); - } - break; - } - case MO_SORT_ANIMALS_BY_AGE: - if (sortAnimalsByAge(animals, nrAnimals) == 0) - { - printf("Animals sorted by age successfully.\n"); - } - else - { - printf("Failed to sort animals by age.\n"); - } - break; - case MO_SORT_ANIMALS_BY_YEAR_FOUND: - if (sortAnimalsByYearFound(animals, nrAnimals) == 0) - { - printf("Animals sorted by year found successfully.\n"); - } - else - { - printf("Failed to sort animals by year found.\n"); - } - break; - case MO_SORT_ANIMALS_BY_SEX: - if (sortAnimalsBySex(animals, nrAnimals) == 0) - { - printf("Animals sorted by sex successfully.\n"); - } - else - { - printf("Failed to sort animals by sex.\n"); - } - break; - case MO_FIND_ANIMAL: - { - int animalId = getInt("Enter animal ID to find: "); - Animal foundAnimal; - if (findAnimalById(animalId, animals, nrAnimals, &foundAnimal) == 1) - { - printf("Animal found:\n"); - printAnimals(&foundAnimal, 1); - } - else - { - printf("Animal not found.\n"); - } - break; - } - case MO_SAVE: - if (writeAnimals("animals.dat", animals, nrAnimals) == 0) - { - printf("Animals saved to disk successfully.\n"); - } - else - { - printf("Failed to save animals to disk.\n"); - } - break; - case MO_LOAD: - if (readAnimals("animals.dat", animals, MaxNrAnimals) >= 0) - { - printf("Animals loaded from disk successfully.\n"); - } - else - { - printf("Failed to load animals from disk.\n"); - } - break; - case MO_QUIT: - break; - default: - printf("ERROR: invalid choice: %d\n", choice); - break; - } - } - return 0; -} diff --git a/C/C2/shared/administration.c b/C/C2/shared/administration.c deleted file mode 100644 index 04e1b76..0000000 --- a/C/C2/shared/administration.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "administration.h" - -#include -#include -#include -#include -#include "animal.h" - - -int removeAnimal( - int animalId, Animal* animalArray, - size_t numberOfAnimalsPresent, - size_t* newNumberOfAnimalsPresent) -{ - //add implementation - return -1; -} - - -// To do : add the missing functions - - diff --git a/C/C2/shared/animal.h b/C/C2/shared/animal.h deleted file mode 100644 index d3fa4ad..0000000 --- a/C/C2/shared/animal.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef ANIMAL_H -#define ANIMAL_H - -typedef enum { - Cat, - Dog, - GuineaPig, - Parrot -} Species; - -typedef enum { - Male, - Female -} Sex; - -typedef struct { - int Day; - int Month; - int Year; -} Date; - -#define MaxNameLength 25 -#define MaxLocationLength 100 - -typedef struct { - int Id; - Species Species; - Sex Sex; - int Age; - Date DateFound; -} Animal; - -#endif \ No newline at end of file diff --git a/C/C2/test/administration_test.c b/C/C2/test/administration_test.c deleted file mode 100644 index a8d0b8a..0000000 --- a/C/C2/test/administration_test.c +++ /dev/null @@ -1,35 +0,0 @@ -#include - -#include "administration.h" -#include "unity.h" -#include "unity_test_module.h" - -// I rather dislike keeping line numbers updated, so I made my own macro to ditch the line number -#define MY_RUN_TEST(func) RUN_TEST(func, 0) - -void administration_setUp(void) -{ - // This is run before EACH test -} - -void administration_tearDown(void) -{ - // This is run after EACH test -} - -void test_EmptyTest(void) -{ - TEST_ASSERT_EQUAL(1, 0); -} - -//add here your testcases - -void run_administration_tests() -{ - UnityRegisterSetupTearDown(administration_setUp, administration_tearDown); - - MY_RUN_TEST(test_EmptyTest); - - UnityUnregisterSetupTearDown(); -} - diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/.gitignore b/C/C3 Watch/.gitignore similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/.gitignore rename to C/C3 Watch/.gitignore diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Makefile b/C/C3 Watch/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/Makefile rename to C/C3 Watch/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/list.c b/C/C3 Watch/ResourceDetector/list.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/list.c rename to C/C3 Watch/ResourceDetector/list.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/list.h b/C/C3 Watch/ResourceDetector/list.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/list.h rename to C/C3 Watch/ResourceDetector/list.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/resource_detector.c b/C/C3 Watch/ResourceDetector/resource_detector.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/resource_detector.c rename to C/C3 Watch/ResourceDetector/resource_detector.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/resource_detector.h b/C/C3 Watch/ResourceDetector/resource_detector.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/resource_detector.h rename to C/C3 Watch/ResourceDetector/resource_detector.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/test/Makefile b/C/C3 Watch/ResourceDetector/test/Makefile similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/test/Makefile rename to C/C3 Watch/ResourceDetector/test/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/test/list_test.c b/C/C3 Watch/ResourceDetector/test/list_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/ResourceDetector/test/list_test.c rename to C/C3 Watch/ResourceDetector/test/list_test.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity.c b/C/C3 Watch/Unity/unity.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity.c rename to C/C3 Watch/Unity/unity.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity.h b/C/C3 Watch/Unity/unity.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity.h rename to C/C3 Watch/Unity/unity.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_internals.h b/C/C3 Watch/Unity/unity_internals.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_internals.h rename to C/C3 Watch/Unity/unity_internals.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_test_module.c b/C/C3 Watch/Unity/unity_test_module.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_test_module.c rename to C/C3 Watch/Unity/unity_test_module.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_test_module.h b/C/C3 Watch/Unity/unity_test_module.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_test_module.h rename to C/C3 Watch/Unity/unity_test_module.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Watch-Registers-Assignment.docx b/C/C3 Watch/Watch-Registers-Assignment.docx similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/Watch-Registers-Assignment.docx rename to C/C3 Watch/Watch-Registers-Assignment.docx diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/build/.gitkeep b/C/C3 Watch/build/.gitkeep similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/build/.gitkeep rename to C/C3 Watch/build/.gitkeep diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/build/main b/C/C3 Watch/build/main old mode 100755 new mode 100644 similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/build/main rename to C/C3 Watch/build/main diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/build/main_test b/C/C3 Watch/build/main_test old mode 100755 new mode 100644 similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/build/main_test rename to C/C3 Watch/build/main_test diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/main.c b/C/C3 Watch/product/main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/main.c rename to C/C3 Watch/product/main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch.c b/C/C3 Watch/product/watch.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch.c rename to C/C3 Watch/product/watch.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch.h b/C/C3 Watch/product/watch.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch.h rename to C/C3 Watch/product/watch.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_device_simulator.c b/C/C3 Watch/product/watch_device_simulator.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_device_simulator.c rename to C/C3 Watch/product/watch_device_simulator.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_device_simulator.h b/C/C3 Watch/product/watch_device_simulator.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_device_simulator.h rename to C/C3 Watch/product/watch_device_simulator.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_i2c.c b/C/C3 Watch/product/watch_i2c.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_i2c.c rename to C/C3 Watch/product/watch_i2c.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_i2c.h b/C/C3 Watch/product/watch_i2c.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/product/watch_i2c.h rename to C/C3 Watch/product/watch_i2c.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/shared/watch_registers.c b/C/C3 Watch/shared/watch_registers.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/shared/watch_registers.c rename to C/C3 Watch/shared/watch_registers.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/shared/watch_registers.h b/C/C3 Watch/shared/watch_registers.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/shared/watch_registers.h rename to C/C3 Watch/shared/watch_registers.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/test/main.c b/C/C3 Watch/test/main.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/test/main.c rename to C/C3 Watch/test/main.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/test/watch_registers_test.c b/C/C3 Watch/test/watch_registers_test.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/Watch/test/watch_registers_test.c rename to C/C3 Watch/test/watch_registers_test.c diff --git a/C/Adidas.zip b/C/C5 Adidas.zip similarity index 100% rename from C/Adidas.zip rename to C/C5 Adidas.zip diff --git a/C/Adidas/.gitignore b/C/C5 and C6 Adidas/.gitignore similarity index 100% rename from C/Adidas/.gitignore rename to C/C5 and C6 Adidas/.gitignore diff --git a/C/Adidas/Adidas-module-design.pptx b/C/C5 and C6 Adidas/Adidas-module-design.pptx similarity index 100% rename from C/Adidas/Adidas-module-design.pptx rename to C/C5 and C6 Adidas/Adidas-module-design.pptx diff --git a/C/Adidas/Assignment - Adidas.docx b/C/C5 and C6 Adidas/Assignment - Adidas.docx similarity index 100% rename from C/Adidas/Assignment - Adidas.docx rename to C/C5 and C6 Adidas/Assignment - Adidas.docx diff --git a/C/Adidas/Makefile b/C/C5 and C6 Adidas/Makefile similarity index 100% rename from C/Adidas/Makefile rename to C/C5 and C6 Adidas/Makefile diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity.c b/C/C5 and C6 Adidas/Unity/unity.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity.c rename to C/C5 and C6 Adidas/Unity/unity.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity.h b/C/C5 and C6 Adidas/Unity/unity.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity.h rename to C/C5 and C6 Adidas/Unity/unity.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_internals.h b/C/C5 and C6 Adidas/Unity/unity_internals.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_internals.h rename to C/C5 and C6 Adidas/Unity/unity_internals.h diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_test_module.c b/C/C5 and C6 Adidas/Unity/unity_test_module.c similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_test_module.c rename to C/C5 and C6 Adidas/Unity/unity_test_module.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_test_module.h b/C/C5 and C6 Adidas/Unity/unity_test_module.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_test_module.h rename to C/C5 and C6 Adidas/Unity/unity_test_module.h diff --git a/C/Adidas/build/.gitkeep b/C/C5 and C6 Adidas/build/.gitkeep similarity index 100% rename from C/Adidas/build/.gitkeep rename to C/C5 and C6 Adidas/build/.gitkeep diff --git a/C/Adidas/build/main_test b/C/C5 and C6 Adidas/build/main_test old mode 100755 new mode 100644 similarity index 100% rename from C/Adidas/build/main_test rename to C/C5 and C6 Adidas/build/main_test diff --git a/C/Adidas/product/channel_main.c b/C/C5 and C6 Adidas/product/channel_main.c similarity index 100% rename from C/Adidas/product/channel_main.c rename to C/C5 and C6 Adidas/product/channel_main.c diff --git a/C/Adidas/product/decode_main.c b/C/C5 and C6 Adidas/product/decode_main.c similarity index 100% rename from C/Adidas/product/decode_main.c rename to C/C5 and C6 Adidas/product/decode_main.c diff --git a/C/Adidas/product/encode_main.c b/C/C5 and C6 Adidas/product/encode_main.c similarity index 100% rename from C/Adidas/product/encode_main.c rename to C/C5 and C6 Adidas/product/encode_main.c diff --git a/C/Adidas/product/main.c b/C/C5 and C6 Adidas/product/main.c similarity index 100% rename from C/Adidas/product/main.c rename to C/C5 and C6 Adidas/product/main.c diff --git a/C/Adidas/shared/bit_stuff.c b/C/C5 and C6 Adidas/shared/bit_stuff.c similarity index 100% rename from C/Adidas/shared/bit_stuff.c rename to C/C5 and C6 Adidas/shared/bit_stuff.c diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/bit_stuff.h b/C/C5 and C6 Adidas/shared/bit_stuff.h similarity index 100% rename from C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/shared/bit_stuff.h rename to C/C5 and C6 Adidas/shared/bit_stuff.h diff --git a/C/Adidas/shared/channel.c b/C/C5 and C6 Adidas/shared/channel.c similarity index 100% rename from C/Adidas/shared/channel.c rename to C/C5 and C6 Adidas/shared/channel.c diff --git a/C/Adidas/shared/channel.h b/C/C5 and C6 Adidas/shared/channel.h similarity index 100% rename from C/Adidas/shared/channel.h rename to C/C5 and C6 Adidas/shared/channel.h diff --git a/C/Adidas/shared/decode.c b/C/C5 and C6 Adidas/shared/decode.c similarity index 100% rename from C/Adidas/shared/decode.c rename to C/C5 and C6 Adidas/shared/decode.c diff --git a/C/Adidas/shared/decode.h b/C/C5 and C6 Adidas/shared/decode.h similarity index 100% rename from C/Adidas/shared/decode.h rename to C/C5 and C6 Adidas/shared/decode.h diff --git a/C/Adidas/shared/encode.c b/C/C5 and C6 Adidas/shared/encode.c similarity index 100% rename from C/Adidas/shared/encode.c rename to C/C5 and C6 Adidas/shared/encode.c diff --git a/C/Adidas/shared/encode.h b/C/C5 and C6 Adidas/shared/encode.h similarity index 100% rename from C/Adidas/shared/encode.h rename to C/C5 and C6 Adidas/shared/encode.h diff --git a/C/Adidas/shared/parity.c b/C/C5 and C6 Adidas/shared/parity.c similarity index 100% rename from C/Adidas/shared/parity.c rename to C/C5 and C6 Adidas/shared/parity.c diff --git a/C/Adidas/shared/parity.h b/C/C5 and C6 Adidas/shared/parity.h similarity index 100% rename from C/Adidas/shared/parity.h rename to C/C5 and C6 Adidas/shared/parity.h diff --git a/C/Adidas/test/channel_test.c b/C/C5 and C6 Adidas/test/channel_test.c similarity index 100% rename from C/Adidas/test/channel_test.c rename to C/C5 and C6 Adidas/test/channel_test.c diff --git a/C/Adidas/test/decode_test.c b/C/C5 and C6 Adidas/test/decode_test.c similarity index 100% rename from C/Adidas/test/decode_test.c rename to C/C5 and C6 Adidas/test/decode_test.c diff --git a/C/Adidas/test/encode_test.c b/C/C5 and C6 Adidas/test/encode_test.c similarity index 100% rename from C/Adidas/test/encode_test.c rename to C/C5 and C6 Adidas/test/encode_test.c diff --git a/C/Adidas/test/main.c b/C/C5 and C6 Adidas/test/main.c similarity index 100% rename from C/Adidas/test/main.c rename to C/C5 and C6 Adidas/test/main.c diff --git a/C/Adidas/test/parity_test.c b/C/C5 and C6 Adidas/test/parity_test.c similarity index 100% rename from C/Adidas/test/parity_test.c rename to C/C5 and C6 Adidas/test/parity_test.c diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas (1).zip b/C/t-oer-prc2-cbdb-main-Assignments-Adidas (1).zip deleted file mode 100644 index b4938a9..0000000 Binary files a/C/t-oer-prc2-cbdb-main-Assignments-Adidas (1).zip and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/c_cpp_properties.json b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/c_cpp_properties.json deleted file mode 100644 index 653e1ee..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux", - "includePath": [ - "${workspaceFolder}/**", - "${workspaceFolder}/Assignments/Adidas/Unity", - "${workspaceFolder}/Assignments/Adidas/BitStuff/product" - ], - "defines": [], - "compilerPath": "/usr/bin/clang", - "cStandard": "c17", - "cppStandard": "c++14", - "intelliSenseMode": "linux-clang-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/settings.json b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/settings.json deleted file mode 100644 index ab9995c..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "files.associations": { - "parity.h": "c", - "stddef.h": "c", - "encode.h": "c" - } -} \ No newline at end of file diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.gitignore b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.gitignore deleted file mode 100644 index 8e048a9..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -encode -channel -decode -encode_test -channel_test -decode_test -a.tmp -b.tmp -c.tmp diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.~lock.Assignment - Adidas.docx# b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.~lock.Assignment - Adidas.docx# deleted file mode 100644 index d12518a..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/.~lock.Assignment - Adidas.docx# +++ /dev/null @@ -1 +0,0 @@ -,thijs,thijs,20.05.2025 13:21,file:///home/thijs/.config/libreoffice/4; \ No newline at end of file diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Adidas-module-design.pptx b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Adidas-module-design.pptx deleted file mode 100644 index fb142d9..0000000 Binary files a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Adidas-module-design.pptx and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Assignment - Adidas.docx b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Assignment - Adidas.docx deleted file mode 100644 index deff4e8..0000000 Binary files a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Assignment - Adidas.docx and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Makefile b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Makefile deleted file mode 100644 index 35e0c37..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -PROD_DIR := ./product -SHARED_DIR := ./shared -TEST_DIR := ./test -UNITY_FOLDER :=./Unity -BUILD_DIR :=./build - -PROD_EXEC = main - -PROD_DIRS := $(PROD_DIR) $(SHARED_DIR) -PROD_FILES := $(wildcard $(patsubst %,%/*.c, $(PROD_DIRS))) -HEADER_PROD_FILES := $(wildcard $(patsubst %,%/*.h, $(PROD_DIRS))) -PROD_INC_DIRS=-I$(PROD_DIR) -I$(SHARED_DIR) - -TEST_EXEC = main_test -TEST_DIRS := $(TEST_DIR) $(SHARED_DIR) $(UNITY_FOLDER) -TEST_FILES := $(wildcard $(patsubst %,%/*.c, $(TEST_DIRS))) -HEADER_TEST_FILES := $(wildcard $(patsubst %,%/*.h, $(TEST_DIRS))) -TEST_INC_DIRS=-I$(TEST_DIR) -I$(SHARED_DIR) -I$(UNITY_FOLDER) - -CC=gcc -SYMBOLS=-Wall -Werror -g -O0 -std=c99 - -TEST_SYMBOLS=$(SYMBOLS) -DTEST -DUNITY_USE_MODULE_SETUP_TEARDOWN - -.PHONY: clean test - -all: $(PROD_EXEC) $(TEST_EXEC) - -$(PROD_EXEC): Makefile $(PROD_FILES) $(HEADER_FILES) - $(CC) $(PROD_INC_DIRS) $(SYMBOLS) $(PROD_FILES) -o $(BUILD_DIR)/$(PROD_EXEC) - - -$(TEST_EXEC): Makefile $(TEST_FILES) $(HEADER_FILES) - $(CC) $(TEST_INC_DIRS) $(TEST_SYMBOLS) $(TEST_FILES) -o $(BUILD_DIR)/$(TEST_EXEC) - -run: $(PROD_EXEC) - @./$(BUILD_DIR)/$(PROD_EXEC) encode Makefile a.tmp - @./$(BUILD_DIR)/$(PROD_EXEC) channel a.tmp b.tmp - @./$(BUILD_DIR)/$(PROD_EXEC) decode b.tmp c.tmp - cmp Makefile c.tmp - -test: $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) - -encode_test : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) encode - -channel_test : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) channel - -decode_test : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) decode - -parity_test : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) parity - -testio : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) io - -clean: - rm -f $(BUILD_DIR)/$(PROD_EXEC) - rm -f $(BUILD_DIR)/$(TEST_EXEC) diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/.gitkeep b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main deleted file mode 100755 index 3cdbfcd..0000000 Binary files a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main_test b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main_test deleted file mode 100755 index fa6f990..0000000 Binary files a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/build/main_test and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/channel_main.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/channel_main.c deleted file mode 100644 index 1a28f3e..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/channel_main.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "channel.h" -// add here includes, if needed - -int channel_main(int argc, char* argv[]) -{ - //add your code here - - return 0; -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/decode_main.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/decode_main.c deleted file mode 100644 index 7ed5d24..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/decode_main.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "decode.h" -// add here includes, if needed - - -int decode_main(int argc, char* argv[]) -{ - //add your code here - - return 0; -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/encode_main.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/encode_main.c deleted file mode 100644 index 85f6124..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/encode_main.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "encode.h" -// add here includes, if needed - - -int encode_main(int argc, char* argv[]) -{ - //add your code here - - return 0; -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/main.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/main.c deleted file mode 100644 index b640df1..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/product/main.c +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include -#include - -#include "encode.h" - -extern int encode_main(int argc, char* argv[]); -extern int channel_main(int argc, char* argv[]); -extern int decode_main(int argc, char* argv[]); - -int main(int argc, char* argv[]) -{ - if (argc < 4) - { - printf("Please provide file name arguments:\n"); - printf("[encode|channel|decode] inputfile outpfile\n\n"); - printf("Example:\n"); - printf("main encode input.txt output.txt\n"); - exit(0); - } - - printf("%s: %s --> %s\n", argv[1], argv[2], argv[3]); - - if(strcmp("encode", argv[1]) == 0) - { - return encode_main(argc,argv); - } - else if(strcmp("channel", argv[1]) == 0) - { - return channel_main(argc,argv); - } - else if(strcmp("decode", argv[1]) == 0) - { - return decode_main(argc,argv); - } - - return 0; -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/channel.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/channel.c deleted file mode 100644 index e69de29..0000000 diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/channel.h b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/channel.h deleted file mode 100644 index 910a626..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/channel.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef CHANNEL_H -#define CHANNEL_H - -#include - - -/*! - * Initialiase the channel module - */ -void channel_init(); - -/*! - * Randomly invert one the bits of the input 'value' parameter - * - * @param value: A byte - * - * @return: The input 'value' where on of the bits is randomly inverted - */ -uint8_t channel_change_one_random_bit(uint8_t value); - -#endif - diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/decode.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/decode.c deleted file mode 100644 index e69de29..0000000 diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/decode.h b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/decode.h deleted file mode 100644 index 5ed4e2e..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/decode.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef DECODE_H_ -#define DECODE_H_ - -#include - -/*! - * Combines the nibbles located at the 4-least-significant bits of - * parameters 'low' and 'high' into one byte. - * - * @param high: A nibble that contains the 4 most-significant bits - * @param low: A nibble that contains the 4 most-significant bits - * - * @return: A byte that combines the high and low nibble. - */ -uint8_t decode_combine_nibbles(uint8_t high, uint8_t low); - -/*! - * Decodes a nibble from a byte that contains the nible (4-bits) and - * corresponding parity bits (3-bits). See assignment for more details. - * - * @param in: A bytes that contains a nibble and parity bits. - * @param nibble: The address to which the decoded nibble - * of 'in' will be written. - * - */ -void decode_byte(uint8_t in, uint8_t* nibble); - -#endif - diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.c deleted file mode 100644 index 047f6bf..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "encode.h" -#include "parity.h" -#include -#include - -void encode_get_nibbles(uint8_t value, uint8_t* high, uint8_t* low) { - if (high == NULL || low == NULL) { - return; - } - *high = (value >> 4) & 0x0F; // bits 7-4 - *low = value & 0x0F; // bits 3-0 -} - -void encode_value(uint8_t input, uint8_t* high, uint8_t* low) { - if (high == NULL || low == NULL) { - return; - } - - uint8_t nibble_high, nibble_low; - - // Splits input-byte in twee nibbles - encode_get_nibbles(input, &nibble_high, &nibble_low); - - // Voeg pariteitsbits toe - *high = add_parity(nibble_high); - *low = add_parity(nibble_low); -} \ No newline at end of file diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.h b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.h deleted file mode 100644 index 1aff76d..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/encode.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef ENCODE_H_ -#define ENCODE_H_ - -#include -#include - -/*! - * Split a byte 'value' into two nibbles (4-bits) named 'low' and 'high'. - * See assignment for more details. - * - * @param value: A byte that will be encoded. - * @param low: The address to which the 4 least-significant-bits - * of 'value' will be written. - * @param high: The address to which the 4 most-significant-bits - * of 'value' will be written. - */ -void encode_get_nibbles(uint8_t value, uint8_t* high, uint8_t* low); - -/*! - * Encodes a the byte 'value' into two bytes named 'low' and 'high'. - * The encoded bytes contain the parity bits. See assignment for more details. - * - * @param value: A byte that will be encoded. - * @param low: The address to which the encoded value of the - * 4 least-significant-bits of 'value' will be written. - * @param high: The address to which the encoded value of the - * 4 most-significant-bits of 'value' will be written. - */ -void encode_value(uint8_t input, uint8_t* high, uint8_t* low); - -#endif - diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.c deleted file mode 100644 index 6e43836..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "parity.h" - -uint8_t add_parity(uint8_t nibble) { - - uint8_t d0 = (nibble >> 0) & 1; - uint8_t d1 = (nibble >> 1) & 1; - uint8_t d2 = (nibble >> 2) & 1; - uint8_t d3 = (nibble >> 3) & 1; - - // Stel pariteitsbits samen (voorbeeld: p0 = even(d0, d1, d3), etc.) - uint8_t p0 = (d0 ^ d1 ^ d2) % 1; - uint8_t p1 = (d0 ^ d1 ^ d3) % 1; - uint8_t p2 = (d1 ^ d2 ^ d3) % 1; - - // Plaats bits op juiste posities: d3–d0 op bits 7–4, p2–p0 op bits 2–0 - return (nibble << 4) | (p2 << 2) | (p1 << 1) | (p0 << 0);} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.h b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.h deleted file mode 100644 index ed44af9..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/shared/parity.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef PARITY_H -#define PARITY_H - -#include - -uint8_t add_parity(uint8_t nibble); - -#endif diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/channel_test.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/channel_test.c deleted file mode 100644 index 86529e8..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/channel_test.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "unity.h" -#include "unity_test_module.h" -#include "channel.h" - - -// I rather dislike keeping line numbers updated, so I made my own macro to ditch the line number -#define MY_RUN_TEST(func) RUN_TEST(func, 0) - -extern void channel_setUp(void) -{ - // This is run before EACH test -} - -extern void channel_tearDown(void) -{ - // This is run after EACH test -} - -static void test_channel(void) -{ - TEST_ASSERT_EQUAL(1, 0); -} - -void run_channel_tests() -{ - UnityRegisterSetupTearDown( channel_setUp, channel_tearDown); - - MY_RUN_TEST(test_channel); - - UnityUnregisterSetupTearDown(); -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/decode_test.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/decode_test.c deleted file mode 100644 index 0e08dc0..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/decode_test.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "unity.h" -#include "unity_test_module.h" -#include "decode.h" - -// I rather dislike keeping line numbers updated, so I made my own macro to ditch the line number -#define MY_RUN_TEST(func) RUN_TEST(func, 0) - -extern void decode_setUp(void) -{ - // This is run before EACH test -} - -extern void decode_tearDown(void) -{ - // This is run after EACH test -} - -void test_decode(void) -{ - TEST_ASSERT_EQUAL(1, 0); -} - -void run_decode_tests() -{ - UnityRegisterSetupTearDown( decode_setUp, decode_tearDown); - - MY_RUN_TEST(test_decode); - - UnityUnregisterSetupTearDown(); -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/encode_test.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/encode_test.c deleted file mode 100644 index 157ce7f..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/encode_test.c +++ /dev/null @@ -1,87 +0,0 @@ -#include -#include // for close() - -#include "unity.h" -#include "parity.h" -#include "unity_test_module.h" -#include "encode.h" - -// Macro om zonder regelnummers te testen -#define MY_RUN_TEST(func) RUN_TEST(func, 0) - -// Setup/teardown hooks -extern void encode_setUp(void) {} -extern void encode_tearDown(void) {} - -/// --- TEST: encode_get_nibbles --- - -void test_encode_get_nibbles_normal(void) { - uint8_t high, low; - encode_get_nibbles(0xAB, &high, &low); // 0xAB = 10101011 - TEST_ASSERT_EQUAL_UINT8(0x0A, high); // 1010 - TEST_ASSERT_EQUAL_UINT8(0x0B, low); // 1011 -} - -void test_encode_get_nibbles_null_ptrs(void) { - uint8_t value = 0xAA; - encode_get_nibbles(value, NULL, NULL); // mag niet crashen - // Geen assert nodig; slaagt bij geen crash -} - -void test_encode_value_normal(void) { - uint8_t high, low; - encode_value(0xAC, &high, &low); // 0xA = 1010, 0xC = 1100 - TEST_ASSERT_EQUAL_UINT8(add_parity(0xA), high); - TEST_ASSERT_EQUAL_UINT8(add_parity(0xC), low); -} - -void test_encode_value_null_pointers(void) { - encode_value(0x55, NULL, NULL); // mag niet crashen -} - -void test_encode_value_all_zeros(void) { - uint8_t high, low; - encode_value(0x00, &high, &low); - TEST_ASSERT_EQUAL_UINT8(add_parity(0x00), high); - TEST_ASSERT_EQUAL_UINT8(add_parity(0x00), low); -} - -void test_encode_value_all_ones(void) { - uint8_t high, low; - encode_value(0xFF, &high, &low); - TEST_ASSERT_EQUAL_UINT8(add_parity(0x0F), high); // 1111 - TEST_ASSERT_EQUAL_UINT8(add_parity(0x0F), low); // 1111 -} - -void test_encode_value_output_differs_from_input(void) { - uint8_t input = 0x3C; - uint8_t high, low; - encode_value(input, &high, &low); - TEST_ASSERT_NOT_EQUAL(input, high); - TEST_ASSERT_NOT_EQUAL(input, low); -} - -void test_encode_value_is_consistent(void) { - uint8_t h1, l1, h2, l2; - encode_value(0x6E, &h1, &l1); - encode_value(0x6E, &h2, &l2); - TEST_ASSERT_EQUAL_UINT8(h1, h2); - TEST_ASSERT_EQUAL_UINT8(l1, l2); -} - - -void run_encode_tests() { - UnityRegisterSetupTearDown(encode_setUp, encode_tearDown); - - MY_RUN_TEST(test_encode_get_nibbles_normal); - MY_RUN_TEST(test_encode_get_nibbles_null_ptrs); - - MY_RUN_TEST(test_encode_value_normal); - MY_RUN_TEST(test_encode_value_null_pointers); - MY_RUN_TEST(test_encode_value_all_zeros); - MY_RUN_TEST(test_encode_value_all_ones); - MY_RUN_TEST(test_encode_value_output_differs_from_input); - MY_RUN_TEST(test_encode_value_is_consistent); - - UnityUnregisterSetupTearDown(); -} diff --git a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/main.c b/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/main.c deleted file mode 100644 index 5be7c1d..0000000 --- a/C/t-oer-prc2-cbdb-main-Assignments-Adidas/Adidas/test/main.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "unity_test_module.h" - -/* As an alternative for header files we can declare that - * the following methos are available 'extern'ally. - */ -extern void run_encode_tests(); -extern void run_channel_tests(); -extern void run_decode_tests(); -/* - * You can add here additional run_XXX_tests modules, if needed. Can be handy when you have - * code that can be used by the encoder as well as the decoder. - * Then you need to add additional files! - * - */ - - -int main (int argc, char * argv[]) -{ - UnityTestModule allModules[] = { { "encode", run_encode_tests}, - { "channel", run_channel_tests}, - { "decode", run_decode_tests} - }; - - size_t number_of_modules = sizeof(allModules)/sizeof(allModules[0]); - - return UnityTestModuleRun(argc, argv, allModules, number_of_modules); -} diff --git a/C/t-oer-prc2-cbdb-main.zip b/C/t-oer-prc2-cbdb-main.zip deleted file mode 100644 index 9ad61b6..0000000 Binary files a/C/t-oer-prc2-cbdb-main.zip and /dev/null differ diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Makefile b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Makefile deleted file mode 100644 index 35ace1c..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -PROD_DIR := ./product -SHARED_DIR := ./shared -TEST_DIR := ./test -UNITY_FOLDER :=./Unity -BUILD_DIR :=./build - -PROD_EXEC = main -PROD_DIRS := $(PROD_DIR) $(SHARED_DIR) -PROD_FILES := $(wildcard $(patsubst %,%/*.c, $(PROD_DIRS))) -HEADER_PROD_FILES := $(wildcard $(patsubst %,%/*.h, $(PROD_DIRS))) -PROD_INC_DIRS=-I$(PROD_DIR) -I$(SHARED_DIR) - -TEST_EXEC = main_test -TEST_DIRS := $(TEST_DIR) $(SHARED_DIR) $(UNITY_FOLDER) -TEST_FILES := $(wildcard $(patsubst %,%/*.c, $(TEST_DIRS))) -HEADER_TEST_FILES := $(wildcard $(patsubst %,%/*.h, $(TEST_DIRS))) -TEST_INC_DIRS=-I$(TEST_DIR) -I$(SHARED_DIR) -I$(UNITY_FOLDER) - -CC=gcc -SYMBOLS=-Wall -Werror -g -pedantic -O0 -std=c99 -TEST_SYMBOLS=$(SYMBOLS) -DTEST -DUNITY_USE_MODULE_SETUP_TEARDOWN - -.PHONY: clean test - -all: $(PROD_EXEC) - -$(PROD_EXEC): Makefile $(PROD_FILES) $(HEADER_FILES) - $(CC) $(PROD_INC_DIRS) $(SYMBOLS) $(PROD_FILES) -o $(BUILD_DIR)/$(PROD_EXEC) - -$(TEST_EXEC): Makefile $(TEST_FILES) $(HEADER_FILES) - $(CC) $(TEST_INC_DIRS) $(TEST_SYMBOLS) $(TEST_FILES) -o $(BUILD_DIR)/$(TEST_EXEC) - -run: $(PROD_EXEC) - @./$(BUILD_DIR)/$(PROD_EXEC) - -test: $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) administration - -testfile : $(TEST_EXEC) - @./$(BUILD_DIR)/$(TEST_EXEC) file_element - -clean: - rm -f $(BUILD_DIR)/$(PROD_EXEC) - rm -f $(BUILD_DIR)/$(TEST_EXEC) diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.c b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.c deleted file mode 100644 index 59dd5b0..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.c +++ /dev/null @@ -1,98 +0,0 @@ -#include -#include - -#include "terminal_io.h" - -#define MAX_STRLEN 80 - -static const char* SpeciesNames[] = { "Cat", "Dog", "Guinea pig", "Parrot" }; - -static const char* SexNames[] = { "Male", "Female" }; - - -static const char* MenuStrings[] = { - "Show animals", - "Add animal", - "Remove animal", - "Sort animals by age", - "Sort animals by year found", - "Sort animals by sex", - "Find animal", - "Load administration from disk", - "Save administration to disk", - "Quit" -}; -static const size_t NrMenuStrings = - sizeof(MenuStrings) / sizeof(MenuStrings[0]); - -int getInt(const char* message) -{ - char line[MAX_STRLEN]; - char* result = NULL; - int value = -1; - - printf("%s", message); - result = fgets(line, sizeof(line), stdin); - if (result != NULL) - { - sscanf(result, "%d", &value); - } - - return value; -} - -int getLimitedInt(const char* message, const char* items[], int nrItems) -{ - int choice = -1; - do - { - for (int i = 0; i < nrItems; i++) - { - printf(" [%d] %s\n", i, items[i]); - } - choice = getInt(message); - } while (choice < 0 || choice >= nrItems); - - return choice; -} - -MenuOptions getMenuChoice(void) -{ - return (MenuOptions)getLimitedInt("choice: ", MenuStrings, NrMenuStrings); -} - -Date getDate(const char* message) -{ - Date temp = { 0, 0, 0 }; - printf("%s", message); - temp.Day = getInt(" enter day: "); - temp.Month = getInt(" enter month: "); - temp.Year = getInt(" enter year: "); - return temp; -} - -void printAnimals(const Animal* animals, int nrAnimals) -{ - if (animals != NULL) - { - if (nrAnimals <= 0) - { - printf("\nAnimal array is empty, or nrAnimals is less than 0\n\n"); - } - else - { - for (int i = 0; i < nrAnimals; i++) - { - printf("\nAnimal %d:\n", i + 1); - printf("Id: %d\n", animals[i].Id); - printf("Species: %s\n", SpeciesNames[animals[i].Species]); - printf("Sex: %s\n", SexNames[animals[i].Sex]); - printf("Age: %d\n", animals[i].Age); - printf("Animal was found:\n"); - printf(" at date: %02d-%02d-%02d\n", - animals[i].DateFound.Day, animals[i].DateFound.Month, - animals[i].DateFound.Year); - } - } - } -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.h b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.h deleted file mode 100644 index c0c6036..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/product/terminal_io.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef TERMINAL_IO_H -#define TERMINAL_IO_H - -#include "animal.h" - -typedef enum -{ - MO_SHOW_ANIMALS, - MO_ADD_ANIMAL, - MO_REMOVE_ANIMAL, - MO_SORT_ANIMALS_BY_AGE, - MO_SORT_ANIMALS_BY_YEAR_FOUND, - MO_SORT_ANIMALS_BY_SEX, - MO_FIND_ANIMAL, - MO_LOAD, - MO_SAVE, - MO_QUIT -} MenuOptions; - - -MenuOptions getMenuChoice(void); -void printAnimals(const Animal* animals, int nrAnimals); -//add the missing functions - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/administration.h b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/administration.h deleted file mode 100644 index 5872413..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/administration.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef ADMINISTRATION_H -#define ADMINISTRATION_H - -#include - -#include "animal.h" - - -/* pre : animalArrayLength must be greater than numberOfAnimalsPresent - * post : animalArray is updated with the information from animalPtr, the - * updated number of animals is passed in newNumberOfAnimalsPresent returns: 0 - * on success or -1 if an error occurs - */ -int addAnimal( - const Animal* animalPtr, Animal* animalArray, - size_t animalArrayLength, size_t numberOfAnimalsPresent, - size_t* newNumberOfAnimalsPresent); - -/* pre : - * post : All animals with id 'animalId' are removed from AnimalArray, the - * updated number of animals is passed in newNumberOfAnimalsPresent returns: The - * number of removed animals, 0 if no animals removed or -1 if an error occurs - */ -int removeAnimal( - int animalId, Animal* animalArray, - size_t numberOfAnimalsPresent, - size_t* newNumberOfAnimalsPresent); - -/* pre : - * post : The first animal from animalArray with id 'animalId' is copied into - * animalPtr returns: 1 on success, 0 if not found or -1 if an error occurs - */ -int findAnimalById( - int animalId, const Animal* animalArray, - size_t numberOfAnimalsPresent, Animal* animalPtr); - -/* pre : - * post : All animals in animalArray are sorted by age - * returns: 0 on success or -1 if an error occurs - */ -int sortAnimalsByAge(Animal* animalArray, size_t numberOfAnimalsPresent); - -/* pre : - * post : All animals in animalArray are sorted by the year in which they were - * found returns: 0 on success or -1 if an error occurs - */ -int sortAnimalsByYearFound( - Animal* animalArray, size_t numberOfAnimalsPresent); - -/* pre : - * post : All animals in animalArray are sorted: first female animals and then - * male animals returns: 0 on success or -1 if an error occurs - */ -int sortAnimalsBySex(Animal* animalArray, size_t numberOfAnimalsPresent); - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.c b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.c deleted file mode 100644 index cc4710e..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "file_element.h" - - -int readAnimals(const char* filename, Animal* animalPtr, size_t nrAnimals) -{ - return -1; -} - -int writeAnimals(const char* filename, const Animal* animalPtr, size_t nrAnimals) -{ - return -1; -} - -int getNrAnimalsInFile(const char* filename, size_t* nrAnimals) -{ - return -1; -} - -int readAnimalFromFile( - const char* filename, size_t filePosition, Animal* animalPtr) -{ - return -1; -} - -int writeAnimalToFile( - const char* filename, size_t filePosition, const Animal* animalPtr) -{ - return -1; -} - -int renameAnimalInFile( - const char* filename, size_t filePosition, const char* animalSurname) -{ - return -1; -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.h b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.h deleted file mode 100644 index ab8cf2f..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/shared/file_element.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef FILE_ELEMENT_H -#define FILE_ELEMENT_H - -#include - -#include "animal.h" - -int readAnimals(const char* filename, Animal* animalPtr, size_t nrAnimals); -/* pre : n.a. - * post : If file contains enough Animals, nrAnimals Animals are read into - * animalPtr. If less animals than nrAnimals exist, all animals from - * the file are read into animalPtr. - * returns: Nr of animals written into animalPtr or -1 if an error occurs - */ - -int writeAnimals(const char* filename, const Animal* animalPtr, size_t nrAnimals); -/* pre : n.a. - * post : nrAnimals animals are written into a new file with data from - * animalPtr - * returns: On succes: 0, on error (file could not be written, input pointers - * are NULL): -1 - */ - -int getNrAnimalsInFile(const char* filename, size_t* nrAnimals); -/* pre : n.a. - * post : get number of animals (Animal structures) in the file - * returns: on succes: 0, on error: -1 - * - */ - - -int readAnimalFromFile( - const char* filename, size_t filePosition, Animal* animalPtr); -/* pre : n.a. - * post : read the animal on filePosition (first animal is filePosition 0, - * second animal is filePosition 1, ...) into animalPtr - * returns: On success: 0, on error: -1 (no data available on filePosition, - * file could not be read, ...) - */ - -int writeAnimalToFile( - const char* filename, size_t filePosition, const Animal* animalPtr); -/* pre : - * post : write the animal in animalPtr to the file at position 'filePosition' - * returns: On success: 0, on error: -1 - * - **** note: do not open the file in append mode (a or a+): in append mode you - **** ALWAYS write to the end of the file. You cannot open the file in - **** write mode either (w or w+), as this will truncate an existing file - **** to 0 bytes. You MUST open the file in "r+" mode (means: r+w) and if - **** that fails (could mean: file does not exist) retry in "w" mode. - */ - -int renameAnimalInFile( - const char* filename, size_t filePosition, const char* animalSurname); -/* pre : - * post : change the animal name on the filePosition in this way: - * The new animal name will start with animalSurname, followed - * by a space and followed by the original animal name - * Example : We have animal called "Max" on filePosition and animalSurname - * "Verstappen". The new animal name will be "Verstappen Max". - * The renamed animal will be written back to the file. - * returns : On success: 0, on error: -1 - */ - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/file_element_test.c b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/file_element_test.c deleted file mode 100644 index 16fd978..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/file_element_test.c +++ /dev/null @@ -1,34 +0,0 @@ -#include - -#include "file_element.h" -#include "unity.h" -#include "unity_test_module.h" - - - -// I rather dislike keeping line numbers updated, so I made my own macro to ditch the line number -#define MY_RUN_TEST(func) RUN_TEST(func, 0) - -void file_element_setUp(void) -{ - // This is run before EACH test -} - -void file_element_tearDown(void) -{ - // This is run after EACH test -} - -void test_EmptyTest_file(void) -{ - TEST_ASSERT_EQUAL(1, 0); -} - -void run_file_element_tests() -{ - UnityRegisterSetupTearDown( file_element_setUp, file_element_tearDown); - - MY_RUN_TEST(test_EmptyTest_file); - - UnityUnregisterSetupTearDown(); -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/main.c b/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/main.c deleted file mode 100644 index 4595f44..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/AnimalShelter/test/main.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "unity_test_module.h" - - -/* As an alternative for header files we can declare that - * the following methos are available 'extern'ally. - */ -extern void run_administration_tests(); -extern void run_file_element_tests(); - -int main (int argc, char * argv[]) -{ - UnityTestModule allModules[] = { { "administration", run_administration_tests} , - { "file_element", run_file_element_tests} - }; - - size_t number_of_modules = sizeof(allModules)/sizeof(allModules[0]); - - return UnityTestModuleRun(argc, argv, allModules, number_of_modules); -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.c b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.c deleted file mode 100644 index b9462c9..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.c +++ /dev/null @@ -1,841 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#include "unity.h" -#include -#include - -#define UNITY_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); } -#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); } -/// return prematurely if we are already in failure or ignore state -#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} } -#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); } - -struct _Unity Unity = { 0 }; - -const char* UnityStrNull = "NULL"; -const char* UnityStrSpacer = ". "; -const char* UnityStrExpected = " Expected "; -const char* UnityStrWas = " Was "; -const char* UnityStrTo = " To "; -const char* UnityStrElement = " Element "; -const char* UnityStrMemory = " Memory Mismatch"; -const char* UnityStrDelta = " Values Not Within Delta "; -const char* UnityStrPointless= " You Asked Me To Compare Nothing, Which Was Pointless."; -const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL"; -const char* UnityStrNullPointerForActual = " Actual pointer was NULL"; - -//----------------------------------------------- -// Pretty Printers & Test Result Output Handlers -//----------------------------------------------- - -void UnityPrint(const char* string) -{ - const char* pch = string; - - if (pch != NULL) - { - while (*pch) - { - // printable characters plus CR & LF are printed - if ((*pch <= 126) && (*pch >= 32)) - { - UNITY_OUTPUT_CHAR(*pch); - } - //write escaped carriage returns - else if (*pch == 13) - { - UNITY_OUTPUT_CHAR('\\'); - UNITY_OUTPUT_CHAR('r'); - } - //write escaped line feeds - else if (*pch == 10) - { - UNITY_OUTPUT_CHAR('\\'); - UNITY_OUTPUT_CHAR('n'); - } - // unprintable characters are shown as codes - else - { - UNITY_OUTPUT_CHAR('\\'); - UnityPrintNumberHex((_U_SINT)*pch, 2); - } - pch++; - } - } -} - -//----------------------------------------------- -void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style) -{ - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) - { - UnityPrintNumber(number); - } - else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT) - { - UnityPrintNumberUnsigned((_U_UINT)number); - } - else - { - UnityPrintNumberHex((_U_UINT)number, (style & 0x000F) << 1); - } -} - -//----------------------------------------------- -/// basically do an itoa using as little ram as possible -void UnityPrintNumber(const _U_SINT number_to_print) -{ - _U_SINT divisor = 1; - _U_SINT next_divisor; - _U_SINT number = number_to_print; - - if (number < 0) - { - UNITY_OUTPUT_CHAR('-'); - number = -number; - } - - // figure out initial divisor - while (number / divisor > 9) - { - next_divisor = divisor * 10; - if (next_divisor > divisor) - divisor = next_divisor; - else - break; - } - - // now mod and print, then divide divisor - do - { - UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10))); - divisor /= 10; - } - while (divisor > 0); -} - -//----------------------------------------------- -/// basically do an itoa using as little ram as possible -void UnityPrintNumberUnsigned(const _U_UINT number) -{ - _U_UINT divisor = 1; - _U_UINT next_divisor; - - // figure out initial divisor - while (number / divisor > 9) - { - next_divisor = divisor * 10; - if (next_divisor > divisor) - divisor = next_divisor; - else - break; - } - - // now mod and print, then divide divisor - do - { - UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10))); - divisor /= 10; - } - while (divisor > 0); -} - -//----------------------------------------------- -void UnityPrintNumberHex(const _U_UINT number, const char nibbles_to_print) -{ - _U_UINT nibble; - char nibbles = nibbles_to_print; - UNITY_OUTPUT_CHAR('0'); - UNITY_OUTPUT_CHAR('x'); - - while (nibbles > 0) - { - nibble = (number >> (--nibbles << 2)) & 0x0000000F; - if (nibble <= 9) - { - UNITY_OUTPUT_CHAR((char)('0' + nibble)); - } - else - { - UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble)); - } - } -} - -//----------------------------------------------- -void UnityPrintMask(const _U_UINT mask, const _U_UINT number) -{ - _U_UINT current_bit = (_U_UINT)1 << (UNITY_INT_WIDTH - 1); - _US32 i; - - for (i = 0; i < UNITY_INT_WIDTH; i++) - { - if (current_bit & mask) - { - if (current_bit & number) - { - UNITY_OUTPUT_CHAR('1'); - } - else - { - UNITY_OUTPUT_CHAR('0'); - } - } - else - { - UNITY_OUTPUT_CHAR('X'); - } - current_bit = current_bit >> 1; - } -} - -//----------------------------------------------- -#ifdef UNITY_FLOAT_VERBOSE -void UnityPrintFloat(_UF number) -{ - char TempBuffer[32]; - sprintf(TempBuffer, "%.6f", number); - UnityPrint(TempBuffer); -} -#endif - -//----------------------------------------------- -void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line) -{ - UnityPrint(file); - UNITY_OUTPUT_CHAR(':'); - UnityPrintNumber(line); - UNITY_OUTPUT_CHAR(':'); - UnityPrint(Unity.CurrentTestName); - UNITY_OUTPUT_CHAR(':'); -} - -//----------------------------------------------- -void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line) -{ - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("FAIL:"); -} - -//----------------------------------------------- -void UnityConcludeTest(void) -{ - if (Unity.CurrentTestIgnored) - { - Unity.TestIgnores++; - } - else if (!Unity.CurrentTestFailed) - { - UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber); - UnityPrint("PASS"); - UNITY_PRINT_EOL; - } - else - { - Unity.TestFailures++; - } - - Unity.CurrentTestFailed = 0; - Unity.CurrentTestIgnored = 0; -} - -//----------------------------------------------- -void UnityAddMsgIfSpecified(const char* msg) -{ - if (msg) - { - UnityPrint(UnityStrSpacer); - UnityPrint(msg); - } -} - -//----------------------------------------------- -void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual) -{ - UnityPrint(UnityStrExpected); - if (expected != NULL) - { - UNITY_OUTPUT_CHAR('\''); - UnityPrint(expected); - UNITY_OUTPUT_CHAR('\''); - } - else - { - UnityPrint(UnityStrNull); - } - UnityPrint(UnityStrWas); - if (actual != NULL) - { - UNITY_OUTPUT_CHAR('\''); - UnityPrint(actual); - UNITY_OUTPUT_CHAR('\''); - } - else - { - UnityPrint(UnityStrNull); - } -} - -//----------------------------------------------- -// Assertion & Control Helpers -//----------------------------------------------- - -int UnityCheckArraysForNull(const void* expected, const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg) -{ - //return true if they are both NULL - if ((expected == NULL) && (actual == NULL)) - return 1; - - //throw error if just expected is NULL - if (expected == NULL) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrNullPointerForExpected); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - //throw error if just actual is NULL - if (actual == NULL) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrNullPointerForActual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - //return false if neither is NULL - return 0; -} - -//----------------------------------------------- -// Assertion Functions -//----------------------------------------------- - -void UnityAssertBits(const _U_SINT mask, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - UNITY_SKIP_EXECUTION; - - if ((mask & expected) != (mask & actual)) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrExpected); - UnityPrintMask(mask, expected); - UnityPrint(UnityStrWas); - UnityPrintMask(mask, actual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualNumber(const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - UNITY_SKIP_EXECUTION; - - if (expected != actual) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - _UU32 elements = num_elements; - const _US8* ptr_exp = (_US8*)expected; - const _US8* ptr_act = (_US8*)actual; - - UNITY_SKIP_EXECUTION; - - if (elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - switch(style) - { - case UNITY_DISPLAY_STYLE_HEX8: - case UNITY_DISPLAY_STYLE_INT8: - case UNITY_DISPLAY_STYLE_UINT8: - while (elements--) - { - if (*ptr_exp != *ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 1; - ptr_act += 1; - } - break; - case UNITY_DISPLAY_STYLE_HEX16: - case UNITY_DISPLAY_STYLE_INT16: - case UNITY_DISPLAY_STYLE_UINT16: - while (elements--) - { - if (*(_US16*)ptr_exp != *(_US16*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US16*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US16*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 2; - ptr_act += 2; - } - break; -#ifdef UNITY_SUPPORT_64 - case UNITY_DISPLAY_STYLE_HEX64: - case UNITY_DISPLAY_STYLE_INT64: - case UNITY_DISPLAY_STYLE_UINT64: - while (elements--) - { - if (*(_US64*)ptr_exp != *(_US64*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US64*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US64*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 8; - ptr_act += 8; - } - break; -#endif - default: - while (elements--) - { - if (*(_US32*)ptr_exp != *(_US32*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US32*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US32*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 4; - ptr_act += 4; - } - break; - } -} - -//----------------------------------------------- -#ifndef UNITY_EXCLUDE_FLOAT -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 elements = num_elements; - const _UF* ptr_expected = expected; - const _UF* ptr_actual = actual; - _UF diff, tol; - - UNITY_SKIP_EXECUTION; - - if (elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - while (elements--) - { - diff = *ptr_expected - *ptr_actual; - if (diff < 0.0) - diff = 0.0 - diff; - tol = UNITY_FLOAT_PRECISION * *ptr_expected; - if (tol < 0.0) - tol = 0.0 - tol; - if (diff > tol) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); -#ifdef UNITY_FLOAT_VERBOSE - UnityPrint(UnityStrExpected); - UnityPrintFloat(*ptr_expected); - UnityPrint(UnityStrWas); - UnityPrintFloat(*ptr_actual); -#else - UnityPrint(UnityStrDelta); -#endif - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_expected++; - ptr_actual++; - } -} - -//----------------------------------------------- -void UnityAssertFloatsWithin(const _UF delta, - const _UF expected, - const _UF actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UF diff = actual - expected; - _UF pos_delta = delta; - - UNITY_SKIP_EXECUTION; - - if (diff < 0) - { - diff = 0.0f - diff; - } - if (pos_delta < 0) - { - pos_delta = 0.0f - pos_delta; - } - - if (pos_delta < diff) - { - UnityTestResultsFailBegin(lineNumber); -#ifdef UNITY_FLOAT_VERBOSE - UnityPrint(UnityStrExpected); - UnityPrintFloat(expected); - UnityPrint(UnityStrWas); - UnityPrintFloat(actual); -#else - UnityPrint(UnityStrDelta); -#endif - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} -#endif - -//----------------------------------------------- -void UnityAssertNumbersWithin( const _U_SINT delta, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - UNITY_SKIP_EXECUTION; - - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) - { - if (actual > expected) - Unity.CurrentTestFailed = ((actual - expected) > delta); - else - Unity.CurrentTestFailed = ((expected - actual) > delta); - } - else - { - if ((_U_UINT)actual > (_U_UINT)expected) - Unity.CurrentTestFailed = ((_U_UINT)(actual - expected) > (_U_UINT)delta); - else - Unity.CurrentTestFailed = ((_U_UINT)(expected - actual) > (_U_UINT)delta); - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrDelta); - UnityPrintNumberByStyle(delta, style); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualString(const char* expected, - const char* actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 i; - - UNITY_SKIP_EXECUTION; - - // if both pointers not null compare the strings - if (expected && actual) - { - for (i = 0; expected[i] || actual[i]; i++) - { - if (expected[i] != actual[i]) - { - Unity.CurrentTestFailed = 1; - break; - } - } - } - else - { // handle case of one pointers being null (if both null, test should pass) - if (expected != actual) - { - Unity.CurrentTestFailed = 1; - } - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrintExpectedAndActualStrings(expected, actual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualStringArray( const char** expected, - const char** actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 i, j = 0; - - UNITY_SKIP_EXECUTION; - - // if no elements, it's an error - if (num_elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - do - { - // if both pointers not null compare the strings - if (expected[j] && actual[j]) - { - for (i = 0; expected[j][i] || actual[j][i]; i++) - { - if (expected[j][i] != actual[j][i]) - { - Unity.CurrentTestFailed = 1; - break; - } - } - } - else - { // handle case of one pointers being null (if both null, test should pass) - if (expected[j] != actual[j]) - { - Unity.CurrentTestFailed = 1; - } - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - if (num_elements > 1) - { - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - j - 1), UNITY_DISPLAY_STYLE_UINT); - } - UnityPrintExpectedAndActualStrings((const char*)(expected[j]), (const char*)(actual[j])); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - } while (++j < num_elements); -} - -//----------------------------------------------- -void UnityAssertEqualMemory( const void* expected, - const void* actual, - _UU32 length, - _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - unsigned char* expected_ptr = (unsigned char*)expected; - unsigned char* actual_ptr = (unsigned char*)actual; - _UU32 elements = num_elements; - - UNITY_SKIP_EXECUTION; - - if ((elements == 0) || (length == 0)) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - while (elements--) - { - if (memcmp((const void*)expected_ptr, (const void*)actual_ptr, length) != 0) - { - Unity.CurrentTestFailed = 1; - break; - } - expected_ptr += length; - actual_ptr += length; - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - if (num_elements > 1) - { - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - } - UnityPrint(UnityStrMemory); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -// Control Functions -//----------------------------------------------- - -void UnityFail(const char* msg, const UNITY_LINE_TYPE line) -{ - UNITY_SKIP_EXECUTION; - - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("FAIL"); - if (msg != NULL) - { - UNITY_OUTPUT_CHAR(':'); - if (msg[0] != ' ') - { - UNITY_OUTPUT_CHAR(' '); - } - UnityPrint(msg); - } - UNITY_FAIL_AND_BAIL; -} - -//----------------------------------------------- -void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line) -{ - UNITY_SKIP_EXECUTION; - - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("IGNORE"); - if (msg != NULL) - { - UNITY_OUTPUT_CHAR(':'); - UNITY_OUTPUT_CHAR(' '); - UnityPrint(msg); - } - UNITY_IGNORE_AND_BAIL; -} - -//----------------------------------------------- -void setUp(void); -void tearDown(void); -void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum) -{ - Unity.CurrentTestName = FuncName; - Unity.CurrentTestLineNumber = FuncLineNum; - Unity.NumberOfTests++; - if (TEST_PROTECT()) - { - setUp(); - Func(); - } - if (TEST_PROTECT() && !(Unity.CurrentTestIgnored)) - { - tearDown(); - } - UnityConcludeTest(); -} - -//----------------------------------------------- -void UnityBegin(void) -{ - Unity.NumberOfTests = 0; -} - -//----------------------------------------------- -int UnityEnd(void) -{ - UnityPrint("-----------------------"); - UNITY_PRINT_EOL; - UnityPrintNumber(Unity.NumberOfTests); - UnityPrint(" Tests "); - UnityPrintNumber(Unity.TestFailures); - UnityPrint(" Failures "); - UnityPrintNumber(Unity.TestIgnores); - UnityPrint(" Ignored"); - UNITY_PRINT_EOL; - if (Unity.TestFailures == 0U) - { - UnityPrint("OK"); - } - else - { - UnityPrint("FAIL"); - } - UNITY_PRINT_EOL; - return Unity.TestFailures; -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.h b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.h deleted file mode 100644 index 902edd6..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity.h +++ /dev/null @@ -1,209 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#ifndef UNITY_FRAMEWORK_H -#define UNITY_FRAMEWORK_H - -#define UNITY - -#include "unity_internals.h" - -//------------------------------------------------------- -// Configuration Options -//------------------------------------------------------- - -// Integers -// - Unity assumes 32 bit integers by default -// - If your compiler treats ints of a different size, define UNITY_INT_WIDTH - -// Floats -// - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons -// - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT -// - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats -// - define UNITY_FLOAT_VERBOSE to print floating point values in errors (uses sprintf) - -// Output -// - by default, Unity prints to standard out with putchar. define UNITY_OUTPUT_CHAR(a) with a different function if desired - -// Optimization -// - by default, line numbers are stored in unsigned shorts. Define UNITY_LINE_TYPE with a different type if your files are huge -// - by default, test and failure counters are unsigned shorts. Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests. - -//------------------------------------------------------- -// Test Running Macros -//------------------------------------------------------- - -#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0) - -#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);} - -#ifndef RUN_TEST -#define RUN_TEST(func, line_num) UnityDefaultTestRun(func, #func, line_num) -#endif - -#define TEST_LINE_NUM (Unity.CurrentTestLineNumber) -#define TEST_IS_IGNORED (Unity.CurrentTestIgnored) - -#define TEST_CASE(...) - -//------------------------------------------------------- -// Basic Fail and Ignore -//------------------------------------------------------- - -#define TEST_FAIL_MESSAGE(message) UNITY_TEST_FAIL(__LINE__, message) -#define TEST_FAIL() UNITY_TEST_FAIL(__LINE__, NULL) -#define TEST_IGNORE_MESSAGE(message) UNITY_TEST_IGNORE(__LINE__, message) -#define TEST_IGNORE() UNITY_TEST_IGNORE(__LINE__, NULL) -#define TEST_ONLY() - -//------------------------------------------------------- -// Test Asserts (simple) -//------------------------------------------------------- - -//Boolean -#define TEST_ASSERT(condition) UNITY_TEST_ASSERT( (condition), __LINE__, " Expression Evaluated To FALSE") -#define TEST_ASSERT_TRUE(condition) UNITY_TEST_ASSERT( (condition), __LINE__, " Expected TRUE Was FALSE") -#define TEST_ASSERT_UNLESS(condition) UNITY_TEST_ASSERT( !(condition), __LINE__, " Expression Evaluated To TRUE") -#define TEST_ASSERT_FALSE(condition) UNITY_TEST_ASSERT( !(condition), __LINE__, " Expected FALSE Was TRUE") -#define TEST_ASSERT_NULL(pointer) UNITY_TEST_ASSERT_NULL( (pointer), __LINE__, " Expected NULL") -#define TEST_ASSERT_NOT_NULL(pointer) UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL") - -//Integers (of all sizes) -#define TEST_ASSERT_EQUAL_INT(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT8(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT16(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT32(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT64(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_NOT_EQUAL(expected, actual) UNITY_TEST_ASSERT(((expected) != (actual)), __LINE__, " Expected Not-Equal") -#define TEST_ASSERT_EQUAL_UINT(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT8(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT16(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT32(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT64(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX8(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX16(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX32(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX64(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS(mask, expected, actual) UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS_HIGH(mask, actual) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS_LOW(mask, actual) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, NULL) -#define TEST_ASSERT_BIT_HIGH(bit, actual) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, NULL) -#define TEST_ASSERT_BIT_LOW(bit, actual) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, NULL) - -//Integer Ranges (of all sizes) -#define TEST_ASSERT_INT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, NULL) - -//Structs and Strings -#define TEST_ASSERT_EQUAL_PTR(expected, actual) UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_STRING(expected, actual) UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len) UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, NULL) - -//Arrays -#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements) UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, NULL) - -//Floating Point (If Enabled) -#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_FLOAT(expected, actual) UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, NULL) - -//------------------------------------------------------- -// Test Asserts (with additional messages) -//------------------------------------------------------- - -//Boolean -#define TEST_ASSERT_MESSAGE(condition, message) UNITY_TEST_ASSERT( (condition), __LINE__, message) -#define TEST_ASSERT_TRUE_MESSAGE(condition, message) UNITY_TEST_ASSERT( (condition), __LINE__, message) -#define TEST_ASSERT_UNLESS_MESSAGE(condition, message) UNITY_TEST_ASSERT( !(condition), __LINE__, message) -#define TEST_ASSERT_FALSE_MESSAGE(condition, message) UNITY_TEST_ASSERT( !(condition), __LINE__, message) -#define TEST_ASSERT_NULL_MESSAGE(pointer, message) UNITY_TEST_ASSERT_NULL( (pointer), __LINE__, message) -#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message) UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, message) - -//Integers (of all sizes) -#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message) -#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT(((expected) != (actual)), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message) UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, message) -#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, message) -#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, message) - -//Integer Ranges (of all sizes) -#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, message) - -//Structs and Strings -#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, message) - -//Arrays -#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message) UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, message) - -//Floating Point (If Enabled) -#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, message) -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_internals.h b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_internals.h deleted file mode 100644 index 4827fa1..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/BitStuff/Unity/unity_internals.h +++ /dev/null @@ -1,356 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#ifndef UNITY_INTERNALS_H -#define UNITY_INTERNALS_H - -#include -#include - -//------------------------------------------------------- -// Int Support -//------------------------------------------------------- - -#ifndef UNITY_INT_WIDTH -#define UNITY_INT_WIDTH (32) -#endif - -#ifndef UNITY_LONG_WIDTH -#define UNITY_LONG_WIDTH (32) -#endif - -#if (UNITY_INT_WIDTH == 32) - typedef unsigned char _UU8; - typedef unsigned short _UU16; - typedef unsigned int _UU32; - typedef signed char _US8; - typedef signed short _US16; - typedef signed int _US32; -#elif (UNITY_INT_WIDTH == 16) - typedef unsigned char _UU8; - typedef unsigned int _UU16; - typedef unsigned long _UU32; - typedef signed char _US8; - typedef signed int _US16; - typedef signed long _US32; -#else - #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported) -#endif - -//------------------------------------------------------- -// 64-bit Support -//------------------------------------------------------- - -#ifndef UNITY_SUPPORT_64 - -//No 64-bit Support -typedef _UU32 _U_UINT; -typedef _US32 _U_SINT; - -#else - -//64-bit Support -#if (UNITY_LONG_WIDTH == 32) - typedef unsigned long long _UU64; - typedef signed long long _US64; -#elif (UNITY_LONG_WIDTH == 64) - typedef unsigned long _UU64; - typedef signed long _US64; -#else - #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported) -#endif -typedef _UU64 _U_UINT; -typedef _US64 _U_SINT; - -#endif - -//------------------------------------------------------- -// Pointer Support -//------------------------------------------------------- - -#ifndef UNITY_POINTER_WIDTH -#define UNITY_POINTER_WIDTH (32) -#endif - -#if (UNITY_POINTER_WIDTH == 32) - typedef _UU32 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32 -#elif (UNITY_POINTER_WIDTH == 64) - typedef _UU64 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64 -#elif (UNITY_POINTER_WIDTH == 16) - typedef _UU16 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16 -#else - #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported) -#endif - -//------------------------------------------------------- -// Float Support -//------------------------------------------------------- - -#ifdef UNITY_EXCLUDE_FLOAT - -//No Floating Point Support -#undef UNITY_FLOAT_PRECISION -#undef UNITY_FLOAT_TYPE -#undef UNITY_FLOAT_VERBOSE - -#else - -//Floating Point Support -#ifndef UNITY_FLOAT_PRECISION -#define UNITY_FLOAT_PRECISION (0.00001f) -#endif -#ifndef UNITY_FLOAT_TYPE -#define UNITY_FLOAT_TYPE float -#endif -typedef UNITY_FLOAT_TYPE _UF; - -#endif - -//------------------------------------------------------- -// Output Method -//------------------------------------------------------- - -#ifndef UNITY_OUTPUT_CHAR -//Default to using putchar, which is defined in stdio.h above -#define UNITY_OUTPUT_CHAR(a) putchar(a) -#else -//If defined as something else, make sure we declare it here so it's ready for use -extern int UNITY_OUTPUT_CHAR(int); -#endif - -//------------------------------------------------------- -// Footprint -//------------------------------------------------------- - -#ifndef UNITY_LINE_TYPE -#define UNITY_LINE_TYPE unsigned short -#endif - -#ifndef UNITY_COUNTER_TYPE -#define UNITY_COUNTER_TYPE unsigned short -#endif - -//------------------------------------------------------- -// Internal Structs Needed -//------------------------------------------------------- - -typedef void (*UnityTestFunction)(void); - -#define UNITY_DISPLAY_RANGE_INT (0x10) -#define UNITY_DISPLAY_RANGE_UINT (0x20) -#define UNITY_DISPLAY_RANGE_HEX (0x40) -#define UNITY_DISPLAY_RANGE_AUTO (0x80) - -typedef enum -{ - UNITY_DISPLAY_STYLE_INT = 4 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO, - UNITY_DISPLAY_STYLE_INT8 = 1 + UNITY_DISPLAY_RANGE_INT, - UNITY_DISPLAY_STYLE_INT16 = 2 + UNITY_DISPLAY_RANGE_INT, - UNITY_DISPLAY_STYLE_INT32 = 4 + UNITY_DISPLAY_RANGE_INT, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_INT64 = 8 + UNITY_DISPLAY_RANGE_INT, -#endif - UNITY_DISPLAY_STYLE_UINT = 4 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO, - UNITY_DISPLAY_STYLE_UINT8 = 1 + UNITY_DISPLAY_RANGE_UINT, - UNITY_DISPLAY_STYLE_UINT16 = 2 + UNITY_DISPLAY_RANGE_UINT, - UNITY_DISPLAY_STYLE_UINT32 = 4 + UNITY_DISPLAY_RANGE_UINT, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_UINT64 = 8 + UNITY_DISPLAY_RANGE_UINT, -#endif - UNITY_DISPLAY_STYLE_HEX8 = 1 + UNITY_DISPLAY_RANGE_HEX, - UNITY_DISPLAY_STYLE_HEX16 = 2 + UNITY_DISPLAY_RANGE_HEX, - UNITY_DISPLAY_STYLE_HEX32 = 4 + UNITY_DISPLAY_RANGE_HEX, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_HEX64 = 8 + UNITY_DISPLAY_RANGE_HEX, -#endif -} UNITY_DISPLAY_STYLE_T; - -struct _Unity -{ - const char* TestFile; - const char* CurrentTestName; - _UU32 CurrentTestLineNumber; - UNITY_COUNTER_TYPE NumberOfTests; - UNITY_COUNTER_TYPE TestFailures; - UNITY_COUNTER_TYPE TestIgnores; - UNITY_COUNTER_TYPE CurrentTestFailed; - UNITY_COUNTER_TYPE CurrentTestIgnored; - jmp_buf AbortFrame; -}; - -extern struct _Unity Unity; - -//------------------------------------------------------- -// Test Suite Management -//------------------------------------------------------- - -void UnityBegin(void); -int UnityEnd(void); - -void UnityConcludeTest(void); -void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum); - -//------------------------------------------------------- -// Test Output -//------------------------------------------------------- - -void UnityPrint(const char* string); -void UnityPrintMask(const _U_UINT mask, const _U_UINT number); -void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style); -void UnityPrintNumber(const _U_SINT number); -void UnityPrintNumberUnsigned(const _U_UINT number); -void UnityPrintNumberHex(const _U_UINT number, const char nibbles); - -#ifdef UNITY_FLOAT_VERBOSE -void UnityPrintFloat(const _UF number); -#endif - -//------------------------------------------------------- -// Test Assertion Fuctions -//------------------------------------------------------- -// Use the macros below this section instead of calling -// these directly. The macros have a consistent naming -// convention and will pull in file and line information -// for you. - -void UnityAssertEqualNumber(const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityAssertBits(const _U_SINT mask, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualString(const char* expected, - const char* actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualStringArray( const char** expected, - const char** actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualMemory( const void* expected, - const void* actual, - const _UU32 length, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertNumbersWithin(const _U_SINT delta, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityFail(const char* message, const UNITY_LINE_TYPE line); - -void UnityIgnore(const char* message, const UNITY_LINE_TYPE line); - -#ifndef UNITY_EXCLUDE_FLOAT -void UnityAssertFloatsWithin(const _UF delta, - const _UF expected, - const _UF actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); -#endif - -//------------------------------------------------------- -// Basic Fail and Ignore -//------------------------------------------------------- - -#define UNITY_TEST_FAIL(line, message) UnityFail( (message), (UNITY_LINE_TYPE)line); -#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)line); - -//------------------------------------------------------- -// Test Asserts -//------------------------------------------------------- - -#define UNITY_TEST_ASSERT(condition, line, message) if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, message);} -#define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (UNITY_LINE_TYPE)line, message) -#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (UNITY_LINE_TYPE)line, message) - -#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line) - -#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) - -#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) -#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line) - -#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) - -#ifdef UNITY_SUPPORT_64 -#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) -#endif - -#ifdef UNITY_EXCLUDE_FLOAT -#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#else -#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message) UnityAssertFloatsWithin((_UF)(delta), (_UF)(expected), (_UF)(actual), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message) UNITY_TEST_ASSERT_FLOAT_WITHIN((_UF)(expected) * (_UF)UNITY_FLOAT_PRECISION, (_UF)expected, (_UF)actual, (UNITY_LINE_TYPE)line, message) -#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualFloatArray((_UF*)(expected), (_UF*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) -#endif - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_test_module.c b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_test_module.c deleted file mode 100644 index ba18f7f..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Skater/Unity/unity_test_module.c +++ /dev/null @@ -1,97 +0,0 @@ -#include "unity_test_module.h" -#include -#include -#include -#include "unity.h" - -void (*unity_setUp_ptr)(void) = NULL; -void (*unit_tearDown_ptr)(void) = NULL; - -#ifdef UNITY_USE_MODULE_SETUP_TEARDOWN - -void setUp() -{ - if(unity_setUp_ptr != NULL) unity_setUp_ptr(); -} - -void tearDown() -{ - if(unit_tearDown_ptr != NULL) unit_tearDown_ptr(); -} - -#endif - -void UnityRegisterSetupTearDown( void(*setUp)(void), void(*tearDown)(void) ) -{ - unity_setUp_ptr = setUp; - unit_tearDown_ptr = tearDown; -} - -void UnityUnregisterSetupTearDown(void) -{ - unity_setUp_ptr = NULL; - unit_tearDown_ptr = NULL; -} - -UnityTestModule* UnityTestModuleFind( - UnityTestModule* modules, - size_t number_of_modules, - char* wantedModule) -{ - for(size_t i = 0; i < number_of_modules; i++) { - if(strcmp(wantedModule, modules[i].name) == 0) { - return &modules[i]; - } - } - - return NULL; -} - -void UnityTestModuleRunRequestedModules( - int number_of_requested_modules, - char* requested_modules_names[], - UnityTestModule* allModules, - size_t number_of_modules ) -{ - for(int i = 0; i < number_of_requested_modules; i++) - { - UnityTestModule* module = UnityTestModuleFind(allModules, - number_of_modules, requested_modules_names[i]); - - if(module != NULL) - { - module->run_tests(); - } - else - { - printf("Ignoring: could not find requested module: %s\n", - requested_modules_names[i]); - } - } -} - -int UnityTestModuleRun( - int argc, - char * argv[], - UnityTestModule* allModules, - size_t number_of_modules) -{ - UnityBegin(); - - bool moduleRequests = (argc > 1); - - if(moduleRequests) - { - UnityTestModuleRunRequestedModules(argc-1, &argv[1], - allModules, number_of_modules); - } - else - { - for(int i = 0; i < number_of_modules; i++) - { - allModules[i].run_tests(); - } - } - - return UnityEnd(); -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.c b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.c deleted file mode 100644 index ba18f7f..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.c +++ /dev/null @@ -1,97 +0,0 @@ -#include "unity_test_module.h" -#include -#include -#include -#include "unity.h" - -void (*unity_setUp_ptr)(void) = NULL; -void (*unit_tearDown_ptr)(void) = NULL; - -#ifdef UNITY_USE_MODULE_SETUP_TEARDOWN - -void setUp() -{ - if(unity_setUp_ptr != NULL) unity_setUp_ptr(); -} - -void tearDown() -{ - if(unit_tearDown_ptr != NULL) unit_tearDown_ptr(); -} - -#endif - -void UnityRegisterSetupTearDown( void(*setUp)(void), void(*tearDown)(void) ) -{ - unity_setUp_ptr = setUp; - unit_tearDown_ptr = tearDown; -} - -void UnityUnregisterSetupTearDown(void) -{ - unity_setUp_ptr = NULL; - unit_tearDown_ptr = NULL; -} - -UnityTestModule* UnityTestModuleFind( - UnityTestModule* modules, - size_t number_of_modules, - char* wantedModule) -{ - for(size_t i = 0; i < number_of_modules; i++) { - if(strcmp(wantedModule, modules[i].name) == 0) { - return &modules[i]; - } - } - - return NULL; -} - -void UnityTestModuleRunRequestedModules( - int number_of_requested_modules, - char* requested_modules_names[], - UnityTestModule* allModules, - size_t number_of_modules ) -{ - for(int i = 0; i < number_of_requested_modules; i++) - { - UnityTestModule* module = UnityTestModuleFind(allModules, - number_of_modules, requested_modules_names[i]); - - if(module != NULL) - { - module->run_tests(); - } - else - { - printf("Ignoring: could not find requested module: %s\n", - requested_modules_names[i]); - } - } -} - -int UnityTestModuleRun( - int argc, - char * argv[], - UnityTestModule* allModules, - size_t number_of_modules) -{ - UnityBegin(); - - bool moduleRequests = (argc > 1); - - if(moduleRequests) - { - UnityTestModuleRunRequestedModules(argc-1, &argv[1], - allModules, number_of_modules); - } - else - { - for(int i = 0; i < number_of_modules; i++) - { - allModules[i].run_tests(); - } - } - - return UnityEnd(); -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.h b/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.h deleted file mode 100644 index c16ec8d..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/ExtraAssignments/Stegano/Unity/unity_test_module.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef UNITY_TEST_MODULE_H -#define UNITY_TEST_MODULE_H - -#include - -typedef struct { - char name[24]; - void(*run_tests)(void); -} UnityTestModule; - -void UnityRegisterSetupTearDown( void(*setUp)(void), void(*tearDown)(void) ); -void UnityUnregisterSetupTearDown(void); - -UnityTestModule* UnityTestModuleFind( - UnityTestModule* modules, - size_t number_of_modules, - char* wantedModule); - -void UnityTestModuleRunRequestedModules( - int number_of_requested_modules, - char* requested_modules_names[], - UnityTestModule* allModules, - size_t number_of_modules ); - -int UnityTestModuleRun( - int argc, - char * argv[], - UnityTestModule* allModules, - size_t number_of_modules); - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.c b/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.c deleted file mode 100644 index 7b10aa6..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.c +++ /dev/null @@ -1,841 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#include "unity.h" -#include -#include - -#define UNITY_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); } -#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); } -/// return prematurely if we are already in failure or ignore state -#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} } -#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); } - -struct _Unity Unity = { 0 }; - -const char* UnityStrNull = "NULL"; -const char* UnityStrSpacer = ". "; -const char* UnityStrExpected = " Expected "; -const char* UnityStrWas = " Was "; -const char* UnityStrTo = " To "; -const char* UnityStrElement = " Element "; -const char* UnityStrMemory = " Memory Mismatch"; -const char* UnityStrDelta = " Values Not Within Delta "; -const char* UnityStrPointless= " You Asked Me To Compare Nothing, Which Was Pointless."; -const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL"; -const char* UnityStrNullPointerForActual = " Actual pointer was NULL"; - -//----------------------------------------------- -// Pretty Printers & Test Result Output Handlers -//----------------------------------------------- - -void UnityPrint(const char* string) -{ - const char* pch = string; - - if (pch != NULL) - { - while (*pch) - { - // printable characters plus CR & LF are printed - if ((*pch <= 126) && (*pch >= 32)) - { - UNITY_OUTPUT_CHAR(*pch); - } - //write escaped carriage returns - else if (*pch == 13) - { - UNITY_OUTPUT_CHAR('\\'); - UNITY_OUTPUT_CHAR('r'); - } - //write escaped line feeds - else if (*pch == 10) - { - UNITY_OUTPUT_CHAR('\\'); - UNITY_OUTPUT_CHAR('n'); - } - // unprintable characters are shown as codes - else - { - UNITY_OUTPUT_CHAR('\\'); - UnityPrintNumberHex((_U_SINT)*pch, 2); - } - pch++; - } - } -} - -//----------------------------------------------- -void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style) -{ - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) - { - UnityPrintNumber(number); - } - else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT) - { - UnityPrintNumberUnsigned((_U_UINT)number); - } - else - { - UnityPrintNumberHex((_U_UINT)number, (style & 0x000F) << 1); - } -} - -//----------------------------------------------- -/// basically do an itoa using as little ram as possible -void UnityPrintNumber(const _U_SINT number_to_print) -{ - _U_SINT divisor = 1; - _U_SINT next_divisor; - _U_SINT number = number_to_print; - - if (number < 0) - { - UNITY_OUTPUT_CHAR('-'); - number = -number; - } - - // figure out initial divisor - while (number / divisor > 9) - { - next_divisor = divisor * 10; - if (next_divisor > divisor) - divisor = next_divisor; - else - break; - } - - // now mod and print, then divide divisor - do - { - UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10))); - divisor /= 10; - } - while (divisor > 0); -} - -//----------------------------------------------- -/// basically do an itoa using as little ram as possible -void UnityPrintNumberUnsigned(const _U_UINT number) -{ - _U_UINT divisor = 1; - _U_UINT next_divisor; - - // figure out initial divisor - while (number / divisor > 9) - { - next_divisor = divisor * 10; - if (next_divisor > divisor) - divisor = next_divisor; - else - break; - } - - // now mod and print, then divide divisor - do - { - UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10))); - divisor /= 10; - } - while (divisor > 0); -} - -//----------------------------------------------- -void UnityPrintNumberHex(const _U_UINT number, const char nibbles_to_print) -{ - _U_UINT nibble; - char nibbles = nibbles_to_print; - UNITY_OUTPUT_CHAR('0'); - UNITY_OUTPUT_CHAR('x'); - - while (nibbles > 0) - { - nibble = (number >> (--nibbles << 2)) & 0x0000000F; - if (nibble <= 9) - { - UNITY_OUTPUT_CHAR((char)('0' + nibble)); - } - else - { - UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble)); - } - } -} - -//----------------------------------------------- -void UnityPrintMask(const _U_UINT mask, const _U_UINT number) -{ - _U_UINT current_bit = (_U_UINT)1 << (UNITY_INT_WIDTH - 1); - _US32 i; - - for (i = 0; i < UNITY_INT_WIDTH; i++) - { - if (current_bit & mask) - { - if (current_bit & number) - { - UNITY_OUTPUT_CHAR('1'); - } - else - { - UNITY_OUTPUT_CHAR('0'); - } - } - else - { - UNITY_OUTPUT_CHAR('X'); - } - current_bit = current_bit >> 1; - } -} - -//----------------------------------------------- -#ifdef UNITY_FLOAT_VERBOSE -void UnityPrintFloat(_UF number) -{ - char TempBuffer[32]; - sprintf(TempBuffer, "%.6f", number); - UnityPrint(TempBuffer); -} -#endif - -//----------------------------------------------- -void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line) -{ - UnityPrint(file); - UNITY_OUTPUT_CHAR(':'); - UnityPrintNumber(line); - UNITY_OUTPUT_CHAR(':'); - UnityPrint(Unity.CurrentTestName); - UNITY_OUTPUT_CHAR(':'); -} - -//----------------------------------------------- -void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line) -{ - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("FAIL:"); -} - -//----------------------------------------------- -void UnityConcludeTest(void) -{ - if (Unity.CurrentTestIgnored) - { - Unity.TestIgnores++; - } - else if (!Unity.CurrentTestFailed) - { - UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber); - UnityPrint("PASS"); - UNITY_PRINT_EOL; - } - else - { - Unity.TestFailures++; - } - - Unity.CurrentTestFailed = 0; - Unity.CurrentTestIgnored = 0; -} - -//----------------------------------------------- -void UnityAddMsgIfSpecified(const char* msg) -{ - if (msg) - { - UnityPrint(UnityStrSpacer); - UnityPrint(msg); - } -} - -//----------------------------------------------- -void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual) -{ - UnityPrint(UnityStrExpected); - if (expected != NULL) - { - UNITY_OUTPUT_CHAR('\''); - UnityPrint(expected); - UNITY_OUTPUT_CHAR('\''); - } - else - { - UnityPrint(UnityStrNull); - } - UnityPrint(UnityStrWas); - if (actual != NULL) - { - UNITY_OUTPUT_CHAR('\''); - UnityPrint(actual); - UNITY_OUTPUT_CHAR('\''); - } - else - { - UnityPrint(UnityStrNull); - } -} - -//----------------------------------------------- -// Assertion & Control Helpers -//----------------------------------------------- - -int UnityCheckArraysForNull(const void* expected, const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg) -{ - //return true if they are both NULL - if ((expected == NULL) && (actual == NULL)) - return 1; - - //throw error if just expected is NULL - if (expected == NULL) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrNullPointerForExpected); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - //throw error if just actual is NULL - if (actual == NULL) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrNullPointerForActual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - //return false if neither is NULL - return 0; -} - -//----------------------------------------------- -// Assertion Functions -//----------------------------------------------- - -void UnityAssertBits(const _U_SINT mask, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - UNITY_SKIP_EXECUTION; - - if ((mask & expected) != (mask & actual)) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrExpected); - UnityPrintMask(mask, expected); - UnityPrint(UnityStrWas); - UnityPrintMask(mask, actual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualNumber(const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - UNITY_SKIP_EXECUTION; - - if (expected != actual) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - _UU32 elements = num_elements; - const _US8* ptr_exp = (_US8*)expected; - const _US8* ptr_act = (_US8*)actual; - - UNITY_SKIP_EXECUTION; - - if (elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - switch(style) - { - case UNITY_DISPLAY_STYLE_HEX8: - case UNITY_DISPLAY_STYLE_INT8: - case UNITY_DISPLAY_STYLE_UINT8: - while (elements--) - { - if (*ptr_exp != *ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 1; - ptr_act += 1; - } - break; - case UNITY_DISPLAY_STYLE_HEX16: - case UNITY_DISPLAY_STYLE_INT16: - case UNITY_DISPLAY_STYLE_UINT16: - while (elements--) - { - if (*(_US16*)ptr_exp != *(_US16*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US16*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US16*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 2; - ptr_act += 2; - } - break; -#ifdef UNITY_SUPPORT_64 - case UNITY_DISPLAY_STYLE_HEX64: - case UNITY_DISPLAY_STYLE_INT64: - case UNITY_DISPLAY_STYLE_UINT64: - while (elements--) - { - if (*(_US64*)ptr_exp != *(_US64*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US64*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US64*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 8; - ptr_act += 8; - } - break; -#endif - default: - while (elements--) - { - if (*(_US32*)ptr_exp != *(_US32*)ptr_act) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US32*)ptr_exp, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US32*)ptr_act, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_exp += 4; - ptr_act += 4; - } - break; - } -} - -//----------------------------------------------- -#ifndef UNITY_EXCLUDE_FLOAT -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 elements = num_elements; - const _UF* ptr_expected = expected; - const _UF* ptr_actual = actual; - _UF diff, tol; - - UNITY_SKIP_EXECUTION; - - if (elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - while (elements--) - { - diff = *ptr_expected - *ptr_actual; - if (diff < 0.0) - diff = 0.0 - diff; - tol = UNITY_FLOAT_PRECISION * *ptr_expected; - if (tol < 0.0) - tol = 0.0 - tol; - if (diff > tol) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); -#ifdef UNITY_FLOAT_VERBOSE - UnityPrint(UnityStrExpected); - UnityPrintFloat(*ptr_expected); - UnityPrint(UnityStrWas); - UnityPrintFloat(*ptr_actual); -#else - UnityPrint(UnityStrDelta); -#endif - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - ptr_expected++; - ptr_actual++; - } -} - -//----------------------------------------------- -void UnityAssertFloatsWithin(const _UF delta, - const _UF expected, - const _UF actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UF diff = actual - expected; - _UF pos_delta = delta; - - UNITY_SKIP_EXECUTION; - - if (diff < 0) - { - diff = 0.0f - diff; - } - if (pos_delta < 0) - { - pos_delta = 0.0f - pos_delta; - } - - if (pos_delta < diff) - { - UnityTestResultsFailBegin(lineNumber); -#ifdef UNITY_FLOAT_VERBOSE - UnityPrint(UnityStrExpected); - UnityPrintFloat(expected); - UnityPrint(UnityStrWas); - UnityPrintFloat(actual); -#else - UnityPrint(UnityStrDelta); -#endif - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} -#endif - -//----------------------------------------------- -void UnityAssertNumbersWithin( const _U_SINT delta, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) -{ - UNITY_SKIP_EXECUTION; - - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) - { - if (actual > expected) - Unity.CurrentTestFailed = ((actual - expected) > delta); - else - Unity.CurrentTestFailed = ((expected - actual) > delta); - } - else - { - if ((_U_UINT)actual > (_U_UINT)expected) - Unity.CurrentTestFailed = ((_U_UINT)(actual - expected) > (_U_UINT)delta); - else - Unity.CurrentTestFailed = ((_U_UINT)(expected - actual) > (_U_UINT)delta); - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrDelta); - UnityPrintNumberByStyle(delta, style); - UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); - UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualString(const char* expected, - const char* actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 i; - - UNITY_SKIP_EXECUTION; - - // if both pointers not null compare the strings - if (expected && actual) - { - for (i = 0; expected[i] || actual[i]; i++) - { - if (expected[i] != actual[i]) - { - Unity.CurrentTestFailed = 1; - break; - } - } - } - else - { // handle case of one pointers being null (if both null, test should pass) - if (expected != actual) - { - Unity.CurrentTestFailed = 1; - } - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrintExpectedAndActualStrings(expected, actual); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -void UnityAssertEqualStringArray( const char** expected, - const char** actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - _UU32 i, j = 0; - - UNITY_SKIP_EXECUTION; - - // if no elements, it's an error - if (num_elements == 0) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - do - { - // if both pointers not null compare the strings - if (expected[j] && actual[j]) - { - for (i = 0; expected[j][i] || actual[j][i]; i++) - { - if (expected[j][i] != actual[j][i]) - { - Unity.CurrentTestFailed = 1; - break; - } - } - } - else - { // handle case of one pointers being null (if both null, test should pass) - if (expected[j] != actual[j]) - { - Unity.CurrentTestFailed = 1; - } - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - if (num_elements > 1) - { - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - j - 1), UNITY_DISPLAY_STYLE_UINT); - } - UnityPrintExpectedAndActualStrings((const char*)(expected[j]), (const char*)(actual[j])); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - } while (++j < num_elements); -} - -//----------------------------------------------- -void UnityAssertEqualMemory( const void* expected, - const void* actual, - _UU32 length, - _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber) -{ - unsigned char* expected_ptr = (unsigned char*)expected; - unsigned char* actual_ptr = (unsigned char*)actual; - _UU32 elements = num_elements; - - UNITY_SKIP_EXECUTION; - - if ((elements == 0) || (length == 0)) - { - UnityTestResultsFailBegin(lineNumber); - UnityPrint(UnityStrPointless); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } - - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) - return; - - while (elements--) - { - if (memcmp((const void*)expected_ptr, (const void*)actual_ptr, length) != 0) - { - Unity.CurrentTestFailed = 1; - break; - } - expected_ptr += length; - actual_ptr += length; - } - - if (Unity.CurrentTestFailed) - { - UnityTestResultsFailBegin(lineNumber); - if (num_elements > 1) - { - UnityPrint(UnityStrElement); - UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); - } - UnityPrint(UnityStrMemory); - UnityAddMsgIfSpecified(msg); - UNITY_FAIL_AND_BAIL; - } -} - -//----------------------------------------------- -// Control Functions -//----------------------------------------------- - -void UnityFail(const char* msg, const UNITY_LINE_TYPE line) -{ - UNITY_SKIP_EXECUTION; - - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("FAIL"); - if (msg != NULL) - { - UNITY_OUTPUT_CHAR(':'); - if (msg[0] != ' ') - { - UNITY_OUTPUT_CHAR(' '); - } - UnityPrint(msg); - } - UNITY_FAIL_AND_BAIL; -} - -//----------------------------------------------- -void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line) -{ - UNITY_SKIP_EXECUTION; - - UnityTestResultsBegin(Unity.TestFile, line); - UnityPrint("IGNORE"); - if (msg != NULL) - { - UNITY_OUTPUT_CHAR(':'); - UNITY_OUTPUT_CHAR(' '); - UnityPrint(msg); - } - UNITY_IGNORE_AND_BAIL; -} - -//----------------------------------------------- -void setUp(void); -void tearDown(void); -void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum) -{ - Unity.CurrentTestName = FuncName; - Unity.CurrentTestLineNumber = FuncLineNum; - Unity.NumberOfTests++; - if (TEST_PROTECT()) - { - setUp(); - Func(); - } - if (TEST_PROTECT() && !(Unity.CurrentTestIgnored)) - { - tearDown(); - } - UnityConcludeTest(); -} - -//----------------------------------------------- -void UnityBegin(void) -{ - Unity.NumberOfTests = 0; -} - -//----------------------------------------------- -int UnityEnd(void) -{ - UnityPrint("-----------------------"); - UNITY_PRINT_EOL; - UnityPrintNumber(Unity.NumberOfTests); - UnityPrint(" Tests "); - UnityPrintNumber(Unity.TestFailures); - UnityPrint(" Failures "); - UnityPrintNumber(Unity.TestIgnores); - UnityPrint(" Ignored"); - UNITY_PRINT_EOL; - if (Unity.TestFailures == 0U) - { - UnityPrint("OK"); - } - else - { - UnityPrint("FAIL"); - } - UNITY_PRINT_EOL; - return Unity.TestFailures; -} diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.h b/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.h deleted file mode 100644 index 8b16111..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity.h +++ /dev/null @@ -1,209 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#ifndef UNITY_FRAMEWORK_H -#define UNITY_FRAMEWORK_H - -#define UNITY - -#include "unity_internals.h" - -//------------------------------------------------------- -// Configuration Options -//------------------------------------------------------- - -// Integers -// - Unity assumes 32 bit integers by default -// - If your compiler treats ints of a different size, define UNITY_INT_WIDTH - -// Floats -// - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons -// - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT -// - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats -// - define UNITY_FLOAT_VERBOSE to print floating point values in errors (uses sprintf) - -// Output -// - by default, Unity prints to standard out with putchar. define UNITY_OUTPUT_CHAR(a) with a different function if desired - -// Optimization -// - by default, line numbers are stored in unsigned shorts. Define UNITY_LINE_TYPE with a different type if your files are huge -// - by default, test and failure counters are unsigned shorts. Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests. - -//------------------------------------------------------- -// Test Running Macros -//------------------------------------------------------- - -#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0) - -#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);} - -#ifndef RUN_TEST -#define RUN_TEST(func, line_num) UnityDefaultTestRun(func, #func, line_num) -#endif - -#define TEST_LINE_NUM (Unity.CurrentTestLineNumber) -#define TEST_IS_IGNORED (Unity.CurrentTestIgnored) - -#define TEST_CASE(...) - -//------------------------------------------------------- -// Basic Fail and Ignore -//------------------------------------------------------- - -#define TEST_FAIL_MESSAGE(message) UNITY_TEST_FAIL(__LINE__, message) -#define TEST_FAIL() UNITY_TEST_FAIL(__LINE__, NULL) -#define TEST_IGNORE_MESSAGE(message) UNITY_TEST_IGNORE(__LINE__, message) -#define TEST_IGNORE() UNITY_TEST_IGNORE(__LINE__, NULL) -#define TEST_ONLY() - -//------------------------------------------------------- -// Test Asserts (simple) -//------------------------------------------------------- - -//Boolean -#define TEST_ASSERT(condition) UNITY_TEST_ASSERT( (condition), __LINE__, " Expression Evaluated To FALSE") -#define TEST_ASSERT_TRUE(condition) UNITY_TEST_ASSERT( (condition), __LINE__, " Expected TRUE Was FALSE") -#define TEST_ASSERT_UNLESS(condition) UNITY_TEST_ASSERT( !(condition), __LINE__, " Expression Evaluated To TRUE") -#define TEST_ASSERT_FALSE(condition) UNITY_TEST_ASSERT( !(condition), __LINE__, " Expected FALSE Was TRUE") -#define TEST_ASSERT_NULL(pointer) UNITY_TEST_ASSERT_NULL( (pointer), __LINE__, " Expected NULL") -#define TEST_ASSERT_NOT_NULL(pointer) UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL") - -//Integers (of all sizes) -#define TEST_ASSERT_EQUAL_INT(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT8(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT16(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT32(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT64(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL(expected, actual) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_NOT_EQUAL(expected, actual) UNITY_TEST_ASSERT(((expected) != (actual)), __LINE__, " Expected Not-Equal") -#define TEST_ASSERT_EQUAL_UINT(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT8(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT16(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT32(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT64(expected, actual) UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX8(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX16(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX32(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX64(expected, actual) UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS(mask, expected, actual) UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS_HIGH(mask, actual) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, NULL) -#define TEST_ASSERT_BITS_LOW(mask, actual) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, NULL) -#define TEST_ASSERT_BIT_HIGH(bit, actual) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, NULL) -#define TEST_ASSERT_BIT_LOW(bit, actual) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, NULL) - -//Integer Ranges (of all sizes) -#define TEST_ASSERT_INT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, NULL) - -//Structs and Strings -#define TEST_ASSERT_EQUAL_PTR(expected, actual) UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL) -#define TEST_ASSERT_EQUAL_STRING(expected, actual) UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len) UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, NULL) - -//Arrays -#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements) UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, NULL) - -//Floating Point (If Enabled) -#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual) UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_FLOAT(expected, actual) UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, NULL) -#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements) UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, NULL) - -//------------------------------------------------------- -// Test Asserts (with additional messages) -//------------------------------------------------------- - -//Boolean -#define TEST_ASSERT_MESSAGE(condition, message) UNITY_TEST_ASSERT( (condition), __LINE__, message) -#define TEST_ASSERT_TRUE_MESSAGE(condition, message) UNITY_TEST_ASSERT( (condition), __LINE__, message) -#define TEST_ASSERT_UNLESS_MESSAGE(condition, message) UNITY_TEST_ASSERT( !(condition), __LINE__, message) -#define TEST_ASSERT_FALSE_MESSAGE(condition, message) UNITY_TEST_ASSERT( !(condition), __LINE__, message) -#define TEST_ASSERT_NULL_MESSAGE(pointer, message) UNITY_TEST_ASSERT_NULL( (pointer), __LINE__, message) -#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message) UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, message) - -//Integers (of all sizes) -#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, message) -#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT(((expected) != (actual)), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message) UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(-1), (actual), __LINE__, message) -#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message) UNITY_TEST_ASSERT_BITS((mask), (_UU32)(0), (actual), __LINE__, message) -#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(-1), (actual), __LINE__, message) -#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message) UNITY_TEST_ASSERT_BITS(((_UU32)1 << bit), (_UU32)(0), (actual), __LINE__, message) - -//Integer Ranges (of all sizes) -#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, __LINE__, message) - -//Structs and Strings -#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message) UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, __LINE__, message) - -//Arrays -#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, __LINE__, message) -#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message) UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, __LINE__, message) - -//Floating Point (If Enabled) -#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message) UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, message) -#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message) UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, message) -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_internals.h b/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_internals.h deleted file mode 100644 index b0d0637..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_internals.h +++ /dev/null @@ -1,356 +0,0 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ - -#ifndef UNITY_INTERNALS_H -#define UNITY_INTERNALS_H - -#include -#include - -//------------------------------------------------------- -// Int Support -//------------------------------------------------------- - -#ifndef UNITY_INT_WIDTH -#define UNITY_INT_WIDTH (32) -#endif - -#ifndef UNITY_LONG_WIDTH -#define UNITY_LONG_WIDTH (32) -#endif - -#if (UNITY_INT_WIDTH == 32) - typedef unsigned char _UU8; - typedef unsigned short _UU16; - typedef unsigned int _UU32; - typedef signed char _US8; - typedef signed short _US16; - typedef signed int _US32; -#elif (UNITY_INT_WIDTH == 16) - typedef unsigned char _UU8; - typedef unsigned int _UU16; - typedef unsigned long _UU32; - typedef signed char _US8; - typedef signed int _US16; - typedef signed long _US32; -#else - #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported) -#endif - -//------------------------------------------------------- -// 64-bit Support -//------------------------------------------------------- - -#ifndef UNITY_SUPPORT_64 - -//No 64-bit Support -typedef _UU32 _U_UINT; -typedef _US32 _U_SINT; - -#else - -//64-bit Support -#if (UNITY_LONG_WIDTH == 32) - typedef unsigned long long _UU64; - typedef signed long long _US64; -#elif (UNITY_LONG_WIDTH == 64) - typedef unsigned long _UU64; - typedef signed long _US64; -#else - #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported) -#endif -typedef _UU64 _U_UINT; -typedef _US64 _U_SINT; - -#endif - -//------------------------------------------------------- -// Pointer Support -//------------------------------------------------------- - -#ifndef UNITY_POINTER_WIDTH -#define UNITY_POINTER_WIDTH (32) -#endif - -#if (UNITY_POINTER_WIDTH == 32) - typedef _UU32 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32 -#elif (UNITY_POINTER_WIDTH == 64) - typedef _UU64 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64 -#elif (UNITY_POINTER_WIDTH == 16) - typedef _UU16 _UP; -#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16 -#else - #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported) -#endif - -//------------------------------------------------------- -// Float Support -//------------------------------------------------------- - -#ifdef UNITY_EXCLUDE_FLOAT - -//No Floating Point Support -#undef UNITY_FLOAT_PRECISION -#undef UNITY_FLOAT_TYPE -#undef UNITY_FLOAT_VERBOSE - -#else - -//Floating Point Support -#ifndef UNITY_FLOAT_PRECISION -#define UNITY_FLOAT_PRECISION (0.00001f) -#endif -#ifndef UNITY_FLOAT_TYPE -#define UNITY_FLOAT_TYPE float -#endif -typedef UNITY_FLOAT_TYPE _UF; - -#endif - -//------------------------------------------------------- -// Output Method -//------------------------------------------------------- - -#ifndef UNITY_OUTPUT_CHAR -//Default to using putchar, which is defined in stdio.h above -#define UNITY_OUTPUT_CHAR(a) putchar(a) -#else -//If defined as something else, make sure we declare it here so it's ready for use -extern int UNITY_OUTPUT_CHAR(int); -#endif - -//------------------------------------------------------- -// Footprint -//------------------------------------------------------- - -#ifndef UNITY_LINE_TYPE -#define UNITY_LINE_TYPE unsigned short -#endif - -#ifndef UNITY_COUNTER_TYPE -#define UNITY_COUNTER_TYPE unsigned short -#endif - -//------------------------------------------------------- -// Internal Structs Needed -//------------------------------------------------------- - -typedef void (*UnityTestFunction)(void); - -#define UNITY_DISPLAY_RANGE_INT (0x10) -#define UNITY_DISPLAY_RANGE_UINT (0x20) -#define UNITY_DISPLAY_RANGE_HEX (0x40) -#define UNITY_DISPLAY_RANGE_AUTO (0x80) - -typedef enum -{ - UNITY_DISPLAY_STYLE_INT = 4 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO, - UNITY_DISPLAY_STYLE_INT8 = 1 + UNITY_DISPLAY_RANGE_INT, - UNITY_DISPLAY_STYLE_INT16 = 2 + UNITY_DISPLAY_RANGE_INT, - UNITY_DISPLAY_STYLE_INT32 = 4 + UNITY_DISPLAY_RANGE_INT, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_INT64 = 8 + UNITY_DISPLAY_RANGE_INT, -#endif - UNITY_DISPLAY_STYLE_UINT = 4 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO, - UNITY_DISPLAY_STYLE_UINT8 = 1 + UNITY_DISPLAY_RANGE_UINT, - UNITY_DISPLAY_STYLE_UINT16 = 2 + UNITY_DISPLAY_RANGE_UINT, - UNITY_DISPLAY_STYLE_UINT32 = 4 + UNITY_DISPLAY_RANGE_UINT, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_UINT64 = 8 + UNITY_DISPLAY_RANGE_UINT, -#endif - UNITY_DISPLAY_STYLE_HEX8 = 1 + UNITY_DISPLAY_RANGE_HEX, - UNITY_DISPLAY_STYLE_HEX16 = 2 + UNITY_DISPLAY_RANGE_HEX, - UNITY_DISPLAY_STYLE_HEX32 = 4 + UNITY_DISPLAY_RANGE_HEX, -#ifdef UNITY_SUPPORT_64 - UNITY_DISPLAY_STYLE_HEX64 = 8 + UNITY_DISPLAY_RANGE_HEX, -#endif -} UNITY_DISPLAY_STYLE_T; - -struct _Unity -{ - const char* TestFile; - const char* CurrentTestName; - _UU32 CurrentTestLineNumber; - UNITY_COUNTER_TYPE NumberOfTests; - UNITY_COUNTER_TYPE TestFailures; - UNITY_COUNTER_TYPE TestIgnores; - UNITY_COUNTER_TYPE CurrentTestFailed; - UNITY_COUNTER_TYPE CurrentTestIgnored; - jmp_buf AbortFrame; -}; - -extern struct _Unity Unity; - -//------------------------------------------------------- -// Test Suite Management -//------------------------------------------------------- - -void UnityBegin(void); -int UnityEnd(void); - -void UnityConcludeTest(void); -void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum); - -//------------------------------------------------------- -// Test Output -//------------------------------------------------------- - -void UnityPrint(const char* string); -void UnityPrintMask(const _U_UINT mask, const _U_UINT number); -void UnityPrintNumberByStyle(const _U_SINT number, const UNITY_DISPLAY_STYLE_T style); -void UnityPrintNumber(const _U_SINT number); -void UnityPrintNumberUnsigned(const _U_UINT number); -void UnityPrintNumberHex(const _U_UINT number, const char nibbles); - -#ifdef UNITY_FLOAT_VERBOSE -void UnityPrintFloat(const _UF number); -#endif - -//------------------------------------------------------- -// Test Assertion Fuctions -//------------------------------------------------------- -// Use the macros below this section instead of calling -// these directly. The macros have a consistent naming -// convention and will pull in file and line information -// for you. - -void UnityAssertEqualNumber(const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityAssertBits(const _U_SINT mask, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualString(const char* expected, - const char* actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualStringArray( const char** expected, - const char** actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualMemory( const void* expected, - const void* actual, - const _UU32 length, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertNumbersWithin(const _U_SINT delta, - const _U_SINT expected, - const _U_SINT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); - -void UnityFail(const char* message, const UNITY_LINE_TYPE line); - -void UnityIgnore(const char* message, const UNITY_LINE_TYPE line); - -#ifndef UNITY_EXCLUDE_FLOAT -void UnityAssertFloatsWithin(const _UF delta, - const _UF expected, - const _UF actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber); - -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, - const _UU32 num_elements, - const char* msg, - const UNITY_LINE_TYPE lineNumber); -#endif - -//------------------------------------------------------- -// Basic Fail and Ignore -//------------------------------------------------------- - -#define UNITY_TEST_FAIL(line, message) UnityFail( (message), (UNITY_LINE_TYPE)line); -#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)line); - -//------------------------------------------------------- -// Test Asserts -//------------------------------------------------------- - -#define UNITY_TEST_ASSERT(condition, line, message) if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, message);} -#define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (UNITY_LINE_TYPE)line, message) -#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (UNITY_LINE_TYPE)line, message) - -#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line) - -#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) - -#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) -#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line) - -#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) - -#ifdef UNITY_SUPPORT_64 -#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) -#endif - -#ifdef UNITY_EXCLUDE_FLOAT -#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message) UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Floating Point Disabled") -#else -#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message) UnityAssertFloatsWithin((_UF)(delta), (_UF)(expected), (_UF)(actual), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message) UNITY_TEST_ASSERT_FLOAT_WITHIN((_UF)(expected) * (_UF)UNITY_FLOAT_PRECISION, (_UF)expected, (_UF)actual, (UNITY_LINE_TYPE)line, message) -#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualFloatArray((_UF*)(expected), (_UF*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) -#endif - -#endif diff --git a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_test_module.h b/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_test_module.h deleted file mode 100644 index c16ec8d..0000000 --- a/C/t-oer-prc2-cbdb-main/Assignments/Watch/Unity/unity_test_module.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef UNITY_TEST_MODULE_H -#define UNITY_TEST_MODULE_H - -#include - -typedef struct { - char name[24]; - void(*run_tests)(void); -} UnityTestModule; - -void UnityRegisterSetupTearDown( void(*setUp)(void), void(*tearDown)(void) ); -void UnityUnregisterSetupTearDown(void); - -UnityTestModule* UnityTestModuleFind( - UnityTestModule* modules, - size_t number_of_modules, - char* wantedModule); - -void UnityTestModuleRunRequestedModules( - int number_of_requested_modules, - char* requested_modules_names[], - UnityTestModule* allModules, - size_t number_of_modules ); - -int UnityTestModuleRun( - int argc, - char * argv[], - UnityTestModule* allModules, - size_t number_of_modules); - -#endif