diff --git a/build/test/cache/test_log.c b/build/test/cache/test_log.c new file mode 100644 index 0000000..e09d97d --- /dev/null +++ b/build/test/cache/test_log.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_log(void){ + + + + double result; + + double a=4; + + + + + + result = log(a); + + + + + + UnityAssertEqualNumber((UNITY_INT)((4)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/dependencies/test_log.d b/build/test/dependencies/test_log.d new file mode 100644 index 0000000..9c71ca1 --- /dev/null +++ b/build/test/dependencies/test_log.d @@ -0,0 +1,4 @@ +build/test/out/c/test_log.o: test/Calculator/test_log.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_log_runner.d b/build/test/dependencies/test_log_runner.d new file mode 100644 index 0000000..f6e9b8a --- /dev/null +++ b/build/test/dependencies/test_log_runner.d @@ -0,0 +1,3 @@ +build/test/out/c/test_log_runner.o: build/test/runners/test_log_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 dd0432c..a125ff4 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/test_log.o b/build/test/out/c/test_log.o new file mode 100644 index 0000000..4ec5869 Binary files /dev/null and b/build/test/out/c/test_log.o differ diff --git a/build/test/out/c/test_log_runner.o b/build/test/out/c/test_log_runner.o new file mode 100644 index 0000000..fd686d7 Binary files /dev/null and b/build/test/out/c/test_log_runner.o differ diff --git a/build/test/out/test_factorial.out b/build/test/out/test_factorial.out index 4d75a66..2c6920e 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 new file mode 100755 index 0000000..537fdff Binary files /dev/null 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 2e2b3f2..d525312 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_pow.out b/build/test/out/test_pow.out index e0ea990..6dffc28 100755 Binary files a/build/test/out/test_pow.out and b/build/test/out/test_pow.out differ diff --git a/build/test/preprocess/files/test_log.c b/build/test/preprocess/files/test_log.c new file mode 100644 index 0000000..e09d97d --- /dev/null +++ b/build/test/preprocess/files/test_log.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_log(void){ + + + + double result; + + double a=4; + + + + + + result = log(a); + + + + + + UnityAssertEqualNumber((UNITY_INT)((4)), (UNITY_INT)((result)), ( + + ((void *)0) + + ), (UNITY_UINT)(22), UNITY_DISPLAY_STYLE_INT); + +} diff --git a/build/test/preprocess/includes/test_log.c b/build/test/preprocess/includes/test_log.c new file mode 100644 index 0000000..f2efae7 --- /dev/null +++ b/build/test/preprocess/includes/test_log.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/results/test_factorial.pass b/build/test/results/test_factorial.pass index 6e5b8bf..05c31d3 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.0007209489995148033 +:time: 0.004361564002465457 diff --git a/build/test/results/test_log.pass b/build/test/results/test_log.pass new file mode 100644 index 0000000..dbc8bdc --- /dev/null +++ b/build/test/results/test_log.pass @@ -0,0 +1,18 @@ +--- +:source: + :path: test/Calculator + :file: test_log.c +:successes: +- :test: test_log + :line: 13 + :message: '' + :unity_test_time: 0 +:failures: [] +:ignores: [] +:counts: + :total: 1 + :passed: 1 + :failed: 0 + :ignored: 0 +:stdout: [] +:time: 0.0030175010033417493 diff --git a/build/test/results/test_mod.pass b/build/test/results/test_mod.pass index 2ed760f..5a1e2e8 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.0008472290064673871 +:time: 0.0026945919962599874 diff --git a/build/test/results/test_pow.pass b/build/test/results/test_pow.pass index 6277ae2..c0d42b3 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.0008012789767235518 +:time: 0.0063727759988978505 diff --git a/build/test/runners/test_log_runner.c b/build/test/runners/test_log_runner.c new file mode 100644 index 0000000..19ae41c --- /dev/null +++ b/build/test/runners/test_log_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_log(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_log.c"); + run_test(test_log, "test_log", 13); + + return UnityEnd(); +} diff --git a/nano.20128.save b/nano.20128.save new file mode 100644 index 0000000..92c01a5 --- /dev/null +++ b/nano.20128.save @@ -0,0 +1,27 @@ +#ifdef TEST +#include "unity.h" +#include "game100.h" + + +void setUp(void){ + //Wenn Funktion Vorraussetzungen braucht +} +void tearDown(void){ +} + + +void test_log(void){ + /* arrange */ + int result; + double a = 4; + + /* act */ + result = log(4); + + /* assert */ + TEST_ASSERT_EQUAL_INT(4, result);//log(4)= 0.60205991 +} + + + +#endif // TEST diff --git a/src/main/c/Calculator/calculator.c b/src/main/c/Calculator/calculator.c index 2243f86..27984a6 100644 --- a/src/main/c/Calculator/calculator.c +++ b/src/main/c/Calculator/calculator.c @@ -13,7 +13,7 @@ double permutation(int n, int r); double combination(int n, int r); double pow(double num1, double num2); int mod(int num1,int num2); - +double log(num1); int calculator() { int choice; double num1, num2, result; @@ -89,7 +89,7 @@ int mod(int num1,int num2); case 6: return 0; fmod(num1, num2); case 7: - return 0;// log(num1); + return 0; log(num1); case 8: return pow(num1, num2); case 9: @@ -162,3 +162,7 @@ int mod(int num1, int num2){ int result = num1%num2; return result; } +double log(double num1){ + double result = num1; + return result; +} diff --git a/src/main/c/Calculator/calculator.h b/src/main/c/Calculator/calculator.h index 5ca9657..d86c05d 100644 --- a/src/main/c/Calculator/calculator.h +++ b/src/main/c/Calculator/calculator.h @@ -5,5 +5,6 @@ int calculator(); double pow(double num1, double num2); double factorial(double num); int mod(int num1, int num2); +double log(double num1); #endif diff --git a/test/Calculator/test_log.c b/test/Calculator/test_log.c new file mode 100644 index 0000000..4916f10 --- /dev/null +++ b/test/Calculator/test_log.c @@ -0,0 +1,25 @@ +#ifdef TEST +#include "unity.h" +#include "calculator.h" + + +void setUp(void){ + //Wenn Funktion Vorraussetzungen braucht +} +void tearDown(void){ +} + + +void test_log(void){ + /* arrange */ + double result; + double a=4; + + /* act */ + result = log(a); + + /* assert */ + TEST_ASSERT_EQUAL_INT(4, result);//log(4) =0.602059991 +} + +#endif // TEST