Browse Source

Fix syntax error in main_calculator.c and test_calculator.c

remotes/origin/kabrel
fdai7782 11 months ago
parent
commit
d1a8cc1a30
  1. 16
      src/main/c/main_calculator.c
  2. 10
      src/test/c/test_calculator.c

16
src/main/c/main_calculator.c

@ -300,7 +300,7 @@ double ConMeterToFoot(double distance, int startingUnit, int endingUnit) {
break; break;
case 1: //feet/inch to meter case 1: //feet/inch to meter
return distance / 3. 28084;
return distance / 3.28084;
break; break;
default: default:
@ -311,7 +311,7 @@ double ConMeterToFoot(double distance, int startingUnit, int endingUnit) {
switch (endingUnit) switch (endingUnit)
{ {
case 0: //meter to feet/inch case 0: //meter to feet/inch
return distance * 3. 28084;
return distance * 3.28084;
break; break;
case 1: //feet/inch to feet/inch case 1: //feet/inch to feet/inch
@ -338,7 +338,7 @@ double ConKilometerToMiles(double distance, int startingUnit, int endingUnit) {
break; break;
case 1: //miles to kilometer case 1: //miles to kilometer
return distance * 1. 60934;
return distance * 1.60934;
break; break;
default: default:
@ -349,7 +349,7 @@ double ConKilometerToMiles(double distance, int startingUnit, int endingUnit) {
switch (endingUnit) switch (endingUnit)
{ {
case 0: //kilometer to miles case 0: //kilometer to miles
return distance / 1. 60934;
return distance / 1.60934;
break; break;
case 1: //kilometer to kilometer case 1: //kilometer to kilometer
@ -804,7 +804,7 @@ double ConData(double data, int startingUnit, int endingUnit) {
break; break;
case 4: //1 case 4: //1
return;
return data;
break; break;
case 5: //0.001 case 5: //0.001
@ -964,7 +964,7 @@ double ConClock(double time, int startingUnit, int endingUnit) {
} }
else { else {
return time
return time;
} }
break; break;
@ -1105,7 +1105,7 @@ double ConTime(double time, int startingUnit, int endingUnit) {
break; break;
case 7: //y case 7: //y
return time / 60 * 24 * 7 * 4 * 12);
return time / (60 * 24 * 7 * 4 * 12);
break; break;
default: default:
@ -1296,7 +1296,7 @@ double ConTime(double time, int startingUnit, int endingUnit) {
break; break;
case 6: //mon case 6: //mon
return time * 12);
return time * 12;
break; break;
case 7: //y case 7: //y

10
src/test/c/test_calculator.c

@ -14,28 +14,28 @@ void tearDown(void)
void test_addition(void) void test_addition(void)
{ {
doulbe result = add(1, 2);
double result = add(1, 2);
TEST_ASSERT_EQUAL(3, result); TEST_ASSERT_EQUAL(3, result);
} }
void test_minus(void) void test_minus(void)
{ {
doulbe result = minus(3, 1);
double result = minus(3, 1);
TEST_ASSERT_EQUAL(2, result); TEST_ASSERT_EQUAL(2, result);
} }
void test_multiply(void) void test_multiply(void)
{ {
doulbe result = multiply(1, 2);
double result = multiply(1, 2);
TEST_ASSERT_EQUAL(2, result); TEST_ASSERT_EQUAL(2, result);
} }
void test_divide(void) void test_divide(void)
{ {
doulbe result = divide(4, 2);
double result = divide(4, 2);
TEST_ASSERT_EQUAL(2, result); TEST_ASSERT_EQUAL(2, result);
doulbe result1 = divide(4, 0);
double result1 = divide(4, 0);
TEST_ASSERT_EQUAL(0, result1); TEST_ASSERT_EQUAL(0, result1);
} }

Loading…
Cancel
Save