FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrating to googletest

This commit is contained in:
rusefi 2019-01-14 18:22:31 -05:00
parent 2f3d5b7829
commit fa61f63ef4
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/tests/test_fuel_map.cpp
View File

@ -155,7 +155,7 @@ static void confgiureFordAspireTriggerShape(TriggerShape * s) {
assertEqualsM("expecting 0", 0, s->wave.findAngleMatch(53.747 / 720.0, s->getSize())); assertEqualsM("expecting 0", 0, s->wave.findAngleMatch(53.747 / 720.0, s->getSize()));
assertEqualsM("expecting not found", -1, s->wave.findAngleMatch(53 / 720.0, s->getSize())); assertEqualsM("expecting not found", -1, s->wave.findAngleMatch(53 / 720.0, s->getSize()));
assertEquals(7, s->wave.findAngleMatch(588.045 / 720.0, s->getSize())); ASSERT_EQ(7, s->wave.findAngleMatch(588.045 / 720.0, s->getSize()));
assertEqualsM("expecting 0", 0, s->wave.findInsertionAngle(23.747 / 720.0, s->getSize())); assertEqualsM("expecting 0", 0, s->wave.findInsertionAngle(23.747 / 720.0, s->getSize()));
assertEqualsM("expecting 1", 1, s->wave.findInsertionAngle(63.747 / 720.0, s->getSize())); assertEqualsM("expecting 1", 1, s->wave.findInsertionAngle(63.747 / 720.0, s->getSize()));

2
unit_tests/tests/test_sensors.cpp
View File

@ -36,7 +36,7 @@ TEST(sensors, tps) {
engineConfiguration->tpsMax = 193; engineConfiguration->tpsMax = 193;
engineConfiguration->tpsMin = 43; engineConfiguration->tpsMin = 43;
assertEquals(49.3333, getTpsValue(4 * 117 PASS_ENGINE_PARAMETER_SUFFIX)); ASSERT_NEAR(49.3333, getTpsValue(4 * 117 PASS_ENGINE_PARAMETER_SUFFIX), EPS4D);
engineConfiguration->tpsMax = 43; engineConfiguration->tpsMax = 43;

2
unit_tests/tests/test_util.cpp
View File

@ -29,7 +29,7 @@
TEST(util, crc) { TEST(util, crc) {
ASSERT_EQ(4, efiRound(4.4, 1)); ASSERT_EQ(4, efiRound(4.4, 1));
assertEquals(1.2, efiRound(1.2345, 0.1)); ASSERT_FLOAT_EQ(1.2, efiRound(1.2345, 0.1));
print("*************************************** testCrc\r\n"); print("*************************************** testCrc\r\n");

4
unit_tests/unit_test_framework.cpp
View File

@ -45,10 +45,6 @@ void assertEqualsM(const char *msg, float expected, float actual) {
assertEqualsM2(msg, expected, actual, 0.0001); assertEqualsM2(msg, expected, actual, 0.0001);
} }
void assertEquals(float expected, float actual) {
assertEqualsM("", expected, actual);
}
void assertTrueM(const char *msg, float actual) { void assertTrueM(const char *msg, float actual) {
assertEqualsM(msg, TRUE, actual); assertEqualsM(msg, TRUE, actual);
} }

1
unit_tests/unit_test_framework.h
View File

@ -23,7 +23,6 @@ void assertEqualsM(const char *msg, float expected, float actual);
void assertEqualsLM(const char *msg, long expected, long actual); void assertEqualsLM(const char *msg, long expected, long actual);
void assertEqualsM4(const char *prefix, const char *msg, float expected, float actual); void assertEqualsM4(const char *prefix, const char *msg, float expected, float actual);
void assertEqualsM5(const char *prefix, const char *message, float expected, float actual, float EPS); void assertEqualsM5(const char *prefix, const char *message, float expected, float actual, float EPS);
void assertEquals(float expected, float actual);
void assertTrueM(const char *msg, float actual); void assertTrueM(const char *msg, float actual);
void assertFalseM(const char *msg, float actual); void assertFalseM(const char *msg, float actual);