diff --git a/build/test/cache/defines_dependency.yml b/build/test/cache/defines_dependency.yml index ec28db2..49576f8 100644 --- a/build/test/cache/defines_dependency.yml +++ b/build/test/cache/defines_dependency.yml @@ -1,3 +1,5 @@ --- src/main/c/Calculator/calculator.c: - TEST +src/main/c/Template/game100.c: +- TEST diff --git a/build/test/cache/test_cbrt.c b/build/test/cache/test_cbrt.c new file mode 100644 index 0000000..c7daba2 --- /dev/null +++ b/build/test/cache/test_cbrt.c @@ -0,0 +1,47 @@ +#include "src/main/c/Calculator/calculator.h" +#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" + + + + + + +void setUp(void){ + + + +} + +void tearDown(void){ + +} + + + + + +void test_cbrt(void){ + + + + double result; + + double a = 4; + + + + + + result = cbrt(4); + + + + + + UnityAssertEqualNumber((UNITY_INT)((1.587401052)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/cache/test_multiply.c b/build/test/cache/test_multiply.c new file mode 100644 index 0000000..817c4c7 --- /dev/null +++ b/build/test/cache/test_multiply.c @@ -0,0 +1,47 @@ +#include "src/main/c/Template/game100.h" +#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" + + + + + + +void setUp(void){ + + + +} + +void tearDown(void){ + +} + + + + + +void test_mulitply(void){ + + + + int num1=5; + + int num2=5; + + int product = num1 * num2; + + + + int result = product; + + + + + + UnityAssertEqualNumber((UNITY_INT)((25)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/cache/test_sqrt.c b/build/test/cache/test_sqrt.c index 2fc2a2d..10dde0b 100644 --- a/build/test/cache/test_sqrt.c +++ b/build/test/cache/test_sqrt.c @@ -26,7 +26,7 @@ void test_sqrt(void){ double result; - double a = 25; + int a = 25; diff --git a/build/test/dependencies/game100.d b/build/test/dependencies/game100.d new file mode 100644 index 0000000..e3fe8d5 --- /dev/null +++ b/build/test/dependencies/game100.d @@ -0,0 +1 @@ +build/test/out/c/game100.o: src/main/c/Template/game100.c diff --git a/build/test/dependencies/test_cbrt.d b/build/test/dependencies/test_cbrt.d new file mode 100644 index 0000000..e0d7702 --- /dev/null +++ b/build/test/dependencies/test_cbrt.d @@ -0,0 +1,4 @@ +build/test/out/c/test_cbrt.o: test/Calculator/test_cbrt.c \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h \ + src/main/c/Calculator/calculator.h diff --git a/build/test/dependencies/test_cbrt_runner.d b/build/test/dependencies/test_cbrt_runner.d new file mode 100644 index 0000000..85b6e36 --- /dev/null +++ b/build/test/dependencies/test_cbrt_runner.d @@ -0,0 +1,4 @@ +build/test/out/c/test_cbrt_runner.o: \ + build/test/runners/test_cbrt_runner.c \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/dependencies/test_multiply.d b/build/test/dependencies/test_multiply.d new file mode 100644 index 0000000..6af8f63 --- /dev/null +++ b/build/test/dependencies/test_multiply.d @@ -0,0 +1,4 @@ +build/test/out/c/test_multiply.o: test/Calculator/test_multiply.c \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h \ + src/main/c/Template/game100.h diff --git a/build/test/dependencies/test_multiply_runner.d b/build/test/dependencies/test_multiply_runner.d new file mode 100644 index 0000000..38d0719 --- /dev/null +++ b/build/test/dependencies/test_multiply_runner.d @@ -0,0 +1,4 @@ +build/test/out/c/test_multiply_runner.o: \ + build/test/runners/test_multiply_runner.c \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h \ + /var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity_internals.h diff --git a/build/test/out/c/calculator.o b/build/test/out/c/calculator.o index fe6dc14..a5f276f 100644 Binary files a/build/test/out/c/calculator.o and b/build/test/out/c/calculator.o differ diff --git a/build/test/out/c/game100.o b/build/test/out/c/game100.o new file mode 100644 index 0000000..e5e9330 Binary files /dev/null and b/build/test/out/c/game100.o differ diff --git a/build/test/out/c/test_cbrt.o b/build/test/out/c/test_cbrt.o new file mode 100644 index 0000000..d438809 Binary files /dev/null and b/build/test/out/c/test_cbrt.o differ diff --git a/build/test/out/c/test_cbrt_runner.o b/build/test/out/c/test_cbrt_runner.o new file mode 100644 index 0000000..dac5b90 Binary files /dev/null and b/build/test/out/c/test_cbrt_runner.o differ diff --git a/build/test/out/c/test_multiply.o b/build/test/out/c/test_multiply.o new file mode 100644 index 0000000..df9603a Binary files /dev/null and b/build/test/out/c/test_multiply.o differ diff --git a/build/test/out/c/test_multiply_runner.o b/build/test/out/c/test_multiply_runner.o new file mode 100644 index 0000000..2651296 Binary files /dev/null and b/build/test/out/c/test_multiply_runner.o differ diff --git a/build/test/out/c/test_sqrt.o b/build/test/out/c/test_sqrt.o index 04d17ed..81128f8 100644 Binary files a/build/test/out/c/test_sqrt.o and b/build/test/out/c/test_sqrt.o differ diff --git a/build/test/out/test_cbrt.out b/build/test/out/test_cbrt.out new file mode 100755 index 0000000..3cb78e6 Binary files /dev/null and b/build/test/out/test_cbrt.out differ diff --git a/build/test/out/test_factorial.out b/build/test/out/test_factorial.out index ca8671c..8a59acf 100755 Binary files a/build/test/out/test_factorial.out and b/build/test/out/test_factorial.out differ diff --git a/build/test/out/test_log.out b/build/test/out/test_log.out index aa8b46f..7bdd3bb 100755 Binary files a/build/test/out/test_log.out and b/build/test/out/test_log.out differ diff --git a/build/test/out/test_mod.out b/build/test/out/test_mod.out index 9d2af7c..b37fa74 100755 Binary files a/build/test/out/test_mod.out and b/build/test/out/test_mod.out differ diff --git a/build/test/out/test_multiply.out b/build/test/out/test_multiply.out new file mode 100755 index 0000000..a40b483 Binary files /dev/null and b/build/test/out/test_multiply.out differ diff --git a/build/test/out/test_pow.out b/build/test/out/test_pow.out index 5e6864d..d7d206f 100755 Binary files a/build/test/out/test_pow.out and b/build/test/out/test_pow.out differ diff --git a/build/test/out/test_sqrt.out b/build/test/out/test_sqrt.out index c404a3f..b6627c7 100755 Binary files a/build/test/out/test_sqrt.out and b/build/test/out/test_sqrt.out differ diff --git a/build/test/preprocess/files/test_cbrt.c b/build/test/preprocess/files/test_cbrt.c new file mode 100644 index 0000000..c7daba2 --- /dev/null +++ b/build/test/preprocess/files/test_cbrt.c @@ -0,0 +1,47 @@ +#include "src/main/c/Calculator/calculator.h" +#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" + + + + + + +void setUp(void){ + + + +} + +void tearDown(void){ + +} + + + + + +void test_cbrt(void){ + + + + double result; + + double a = 4; + + + + + + result = cbrt(4); + + + + + + UnityAssertEqualNumber((UNITY_INT)((1.587401052)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/preprocess/files/test_multiply.c b/build/test/preprocess/files/test_multiply.c new file mode 100644 index 0000000..817c4c7 --- /dev/null +++ b/build/test/preprocess/files/test_multiply.c @@ -0,0 +1,47 @@ +#include "src/main/c/Template/game100.h" +#include "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" + + + + + + +void setUp(void){ + + + +} + +void tearDown(void){ + +} + + + + + +void test_mulitply(void){ + + + + int num1=5; + + int num2=5; + + int product = num1 * num2; + + + + int result = product; + + + + + + UnityAssertEqualNumber((UNITY_INT)((25)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/preprocess/files/test_sqrt.c b/build/test/preprocess/files/test_sqrt.c index 2fc2a2d..10dde0b 100644 --- a/build/test/preprocess/files/test_sqrt.c +++ b/build/test/preprocess/files/test_sqrt.c @@ -26,7 +26,7 @@ void test_sqrt(void){ double result; - double a = 25; + int a = 25; diff --git a/build/test/preprocess/includes/test_cbrt.c b/build/test/preprocess/includes/test_cbrt.c new file mode 100644 index 0000000..f2efae7 --- /dev/null +++ b/build/test/preprocess/includes/test_cbrt.c @@ -0,0 +1,3 @@ +--- +- "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" +- src/main/c/Calculator/calculator.h diff --git a/build/test/preprocess/includes/test_multiply.c b/build/test/preprocess/includes/test_multiply.c new file mode 100644 index 0000000..e60bf2a --- /dev/null +++ b/build/test/preprocess/includes/test_multiply.c @@ -0,0 +1,3 @@ +--- +- "/var/lib/gems/3.0.0/gems/ceedling-0.31.1/vendor/unity/src/unity.h" +- src/main/c/Template/game100.h diff --git a/build/test/results/test_cbrt.pass b/build/test/results/test_cbrt.pass new file mode 100644 index 0000000..b51bba7 --- /dev/null +++ b/build/test/results/test_cbrt.pass @@ -0,0 +1,18 @@ +--- +:source: + :path: test/Calculator + :file: test_cbrt.c +:successes: +- :test: test_cbrt + :line: 13 + :message: '' + :unity_test_time: 0 +:failures: [] +:ignores: [] +:counts: + :total: 1 + :passed: 1 + :failed: 0 + :ignored: 0 +:stdout: [] +:time: 0.002984535996802151 diff --git a/build/test/results/test_factorial.pass b/build/test/results/test_factorial.pass index 02ae297..2836ba0 100644 --- a/build/test/results/test_factorial.pass +++ b/build/test/results/test_factorial.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0031587159901391715 +:time: 0.004264043003786355 diff --git a/build/test/results/test_log.pass b/build/test/results/test_log.pass index 97ef84f..fea15b6 100644 --- a/build/test/results/test_log.pass +++ b/build/test/results/test_log.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0032496520143467933 +:time: 0.0032400870113633573 diff --git a/build/test/results/test_mod.pass b/build/test/results/test_mod.pass index dc4c287..bf8198a 100644 --- a/build/test/results/test_mod.pass +++ b/build/test/results/test_mod.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.003375619009602815 +:time: 0.0043334150104783475 diff --git a/build/test/results/test_multiply.pass b/build/test/results/test_multiply.pass new file mode 100644 index 0000000..1384372 --- /dev/null +++ b/build/test/results/test_multiply.pass @@ -0,0 +1,18 @@ +--- +:source: + :path: test/Calculator + :file: test_multiply.c +:successes: +- :test: test_mulitply + :line: 13 + :message: '' + :unity_test_time: 0 +:failures: [] +:ignores: [] +:counts: + :total: 1 + :passed: 1 + :failed: 0 + :ignored: 0 +:stdout: [] +:time: 0.00700880799558945 diff --git a/build/test/results/test_pow.pass b/build/test/results/test_pow.pass index e491e88..7059cd5 100644 --- a/build/test/results/test_pow.pass +++ b/build/test/results/test_pow.pass @@ -19,4 +19,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.0032642479927744716 +:time: 0.006334579986287281 diff --git a/build/test/results/test_sqrt.pass b/build/test/results/test_sqrt.pass index 4d5a622..b70f106 100644 --- a/build/test/results/test_sqrt.pass +++ b/build/test/results/test_sqrt.pass @@ -15,4 +15,4 @@ :failed: 0 :ignored: 0 :stdout: [] -:time: 0.003228487999876961 +:time: 0.0062521169893443584 diff --git a/build/test/runners/test_cbrt_runner.c b/build/test/runners/test_cbrt_runner.c new file mode 100644 index 0000000..497b150 --- /dev/null +++ b/build/test/runners/test_cbrt_runner.c @@ -0,0 +1,81 @@ +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +/*=======Automagically Detected Files To Include=====*/ +#include "unity.h" + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +/*=======External Functions This Runner Calls=====*/ +extern void setUp(void); +extern void tearDown(void); +extern void test_cbrt(void); + + +/*=======Mock Management=====*/ +static void CMock_Init(void) +{ + GlobalExpectCount = 0; + GlobalVerifyOrder = 0; + GlobalOrderError = NULL; +} +static void CMock_Verify(void) +{ +} +static void CMock_Destroy(void) +{ +} + +/*=======Test Reset Options=====*/ +void resetTest(void); +void resetTest(void) +{ + tearDown(); + CMock_Verify(); + CMock_Destroy(); + CMock_Init(); + setUp(); +} +void verifyTest(void); +void verifyTest(void) +{ + CMock_Verify(); +} + +/*=======Test Runner Used To Run Each Test=====*/ +static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num) +{ + Unity.CurrentTestName = name; + Unity.CurrentTestLineNumber = line_num; +#ifdef UNITY_USE_COMMAND_LINE_ARGS + if (!UnityTestMatches()) + return; +#endif + Unity.NumberOfTests++; + UNITY_CLR_DETAILS(); + UNITY_EXEC_TIME_START(); + CMock_Init(); + if (TEST_PROTECT()) + { + setUp(); + func(); + } + if (TEST_PROTECT()) + { + tearDown(); + CMock_Verify(); + } + CMock_Destroy(); + UNITY_EXEC_TIME_STOP(); + UnityConcludeTest(); +} + +/*=======MAIN=====*/ +int main(void) +{ + UnityBegin("test_cbrt.c"); + run_test(test_cbrt, "test_cbrt", 13); + + return UnityEnd(); +} diff --git a/build/test/runners/test_multiply_runner.c b/build/test/runners/test_multiply_runner.c new file mode 100644 index 0000000..fca956b --- /dev/null +++ b/build/test/runners/test_multiply_runner.c @@ -0,0 +1,81 @@ +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +/*=======Automagically Detected Files To Include=====*/ +#include "unity.h" + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +/*=======External Functions This Runner Calls=====*/ +extern void setUp(void); +extern void tearDown(void); +extern void test_mulitply(void); + + +/*=======Mock Management=====*/ +static void CMock_Init(void) +{ + GlobalExpectCount = 0; + GlobalVerifyOrder = 0; + GlobalOrderError = NULL; +} +static void CMock_Verify(void) +{ +} +static void CMock_Destroy(void) +{ +} + +/*=======Test Reset Options=====*/ +void resetTest(void); +void resetTest(void) +{ + tearDown(); + CMock_Verify(); + CMock_Destroy(); + CMock_Init(); + setUp(); +} +void verifyTest(void); +void verifyTest(void) +{ + CMock_Verify(); +} + +/*=======Test Runner Used To Run Each Test=====*/ +static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num) +{ + Unity.CurrentTestName = name; + Unity.CurrentTestLineNumber = line_num; +#ifdef UNITY_USE_COMMAND_LINE_ARGS + if (!UnityTestMatches()) + return; +#endif + Unity.NumberOfTests++; + UNITY_CLR_DETAILS(); + UNITY_EXEC_TIME_START(); + CMock_Init(); + if (TEST_PROTECT()) + { + setUp(); + func(); + } + if (TEST_PROTECT()) + { + tearDown(); + CMock_Verify(); + } + CMock_Destroy(); + UNITY_EXEC_TIME_STOP(); + UnityConcludeTest(); +} + +/*=======MAIN=====*/ +int main(void) +{ + UnityBegin("test_multiply.c"); + run_test(test_mulitply, "test_mulitply", 13); + + return UnityEnd(); +} diff --git a/src/main/c/Calculator/calculator.c b/src/main/c/Calculator/calculator.c index 55a8841..3589de7 100644 --- a/src/main/c/Calculator/calculator.c +++ b/src/main/c/Calculator/calculator.c @@ -14,7 +14,10 @@ double combination(int n, int r); double pow(double num1, double num2); int mod(int num1,int num2); double log(num1); -double sqrt(num1); +double sqrt(double num1); +double cbrt(num1); +int multiply (int num1,int num2); + int calculator() { @@ -102,7 +105,7 @@ double sqrt(num1); case 11: return num1 * num1 * num1; case 12: - return 0;// cbrt(num1); + return 0; cbrt(num1); case 13: return factorial(num1); case 14: @@ -170,6 +173,14 @@ double log(double num1){ return result; } double sqrt(double num1){ - double result = num1; + double result = num1; return result; } +double cbrt(double num1){ + double result = num1; + return result; +} +int multiply(int num1,int num2){ + int product = num1 * num2; + return product; +} diff --git a/src/main/c/Calculator/calculator.h b/src/main/c/Calculator/calculator.h index 8c16e13..73ab918 100644 --- a/src/main/c/Calculator/calculator.h +++ b/src/main/c/Calculator/calculator.h @@ -6,6 +6,7 @@ double pow(double num1, double num2); double factorial(double num); int mod(int num1, int num2); double log(double num1); -double sqrt(double num1); - +double sqrt(double num1); +double cbrt(double num1); +int multiply(int num1,int num2); #endif diff --git a/test/Calculator/test_cbrt.c b/test/Calculator/test_cbrt.c new file mode 100644 index 0000000..c64d19c --- /dev/null +++ b/test/Calculator/test_cbrt.c @@ -0,0 +1,26 @@ +#ifdef TEST +#include "unity.h" +#include "calculator.h" + + +void setUp(void){ + //Wenn Funktion Vorraussetzungen braucht +} +void tearDown(void){ +} + + +void test_cbrt(void){ + /* arrange */ + double result; + double a = 4; + + /* act */ + result = cbrt(4); + + /* assert */ + TEST_ASSERT_EQUAL_INT(1.587401052,result);//cbrt(4) = 1.587401052 +} + + +#endif // TEST diff --git a/test/Calculator/test_multiply.c b/test/Calculator/test_multiply.c new file mode 100644 index 0000000..21a1e11 --- /dev/null +++ b/test/Calculator/test_multiply.c @@ -0,0 +1,25 @@ +#ifdef TEST +#include "unity.h" +#include "game100.h" + + +void setUp(void){ + //Wenn Funktion Vorraussetzungen braucht +} +void tearDown(void){ +} + + +void test_mulitply(void){ + /* arrange */ + int num1=5; + int num2=5; + int product = num1 * num2; + /* act */ + int result = product; + + /* assert */ + TEST_ASSERT_EQUAL_INT(25, result);// 5 * 5 = 25 +} + +#endif // TEST diff --git a/test/Calculator/test_sqrt.c b/test/Calculator/test_sqrt.c index f89126c..291b070 100644 --- a/test/Calculator/test_sqrt.c +++ b/test/Calculator/test_sqrt.c @@ -13,7 +13,7 @@ void tearDown(void){ void test_sqrt(void){ /* arrange */ double result; - double a = 25; + int a = 25; /* act */ result = sqrt(25);