From de2a196dbceacea6bbee3015cada9d022aba506f Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 14 Jan 2019 23:40:13 -0500 Subject: [PATCH] migrating to googletest --- unit_tests/engine_test_helper.cpp | 2 +- unit_tests/unit_test_framework.cpp | 4 ---- unit_tests/unit_test_framework.h | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 13f66afe16..80859fbba2 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -153,7 +153,7 @@ void EngineTestHelper::assertInjectorDownEvent(const char *msg, int eventIndex, } scheduling_s * EngineTestHelper::assertEvent5(TestExecutor *executor, const char *msg, int index, void *callback, efitime_t start, efitime_t momentX) { - assertTrueM(msg, executor->size() > index); + EXPECT_TRUE(executor->size() > index) << msg; scheduling_s *event = executor->getForUnitTest(index); assertEqualsM4(msg, " up/down", (void*)event->callback == (void*) callback, 1); assertEqualsM(msg, momentX, event->momentX - start); diff --git a/unit_tests/unit_test_framework.cpp b/unit_tests/unit_test_framework.cpp index 6c267d9eb2..d67d3a3207 100644 --- a/unit_tests/unit_test_framework.cpp +++ b/unit_tests/unit_test_framework.cpp @@ -45,10 +45,6 @@ void assertEqualsM(const char *msg, float expected, float actual) { assertEqualsM2(msg, expected, actual, 0.0001); } -void assertTrueM(const char *msg, float actual) { - assertEqualsM(msg, TRUE, actual); -} - void chDbgAssert(int c, char *msg, void *arg) { if (!c) { printf("assert failed: %s\r\n", msg); diff --git a/unit_tests/unit_test_framework.h b/unit_tests/unit_test_framework.h index eecdd631ca..d5b257e5d7 100644 --- a/unit_tests/unit_test_framework.h +++ b/unit_tests/unit_test_framework.h @@ -18,11 +18,11 @@ #define EPS4D 0.0001 #define EPS5D 0.00001 +// todo: migrate to googletest, use EXPECT_* and ASSERT_* void assertEqualsM2(const char *msg, float expected, float actual, float EPS); void assertEqualsM(const char *msg, float expected, float actual); void assertEqualsLM(const char *msg, long expected, long 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 assertTrueM(const char *msg, float actual); #endif /* UNIT_TEST_FRAMEWORK_H_ */