From 05e8f7f6d4a6008b79074d1ac8559f5173218a70 Mon Sep 17 00:00:00 2001 From: rusefillc <48498823+rusefillc@users.noreply.github.com> Date: Mon, 14 Mar 2022 22:15:21 -0400 Subject: [PATCH] gtest in library is hard (#3998) * Revert "Revert "JNI for test coverage #3965"" This reverts commit 756632881689d6c148c23163173e0d3bf17e78f7. * JNI for test coverage #3965 Co-authored-by: rusefillc --- .../io/src/test/java/com/rusefi/native_/JniUnitTest.java | 2 ++ unit_tests/engine_test_helper.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java index 9326ed4d74..e15d5bc27d 100644 --- a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java +++ b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java @@ -12,5 +12,7 @@ public class JniUnitTest { EngineLogic engineLogic = new EngineLogic(); String version = engineLogic.getVersion(); assertTrue("Got " + version, version.contains("Hello")); + + engineLogic.invokePeriodicCallback(); } } diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index bf25f5d1e8..93160dafc3 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -135,9 +135,12 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb EngineTestHelper::~EngineTestHelper() { // Write history to file - std::stringstream filePath; - filePath << "unittest_" << ::testing::UnitTest::GetInstance()->current_test_info()->name() << ".logicdata"; - writeEvents(filePath.str().c_str()); + extern bool hasInitGtest; + if (hasInitGtest) { + std::stringstream filePath; + filePath << "unittest_" << ::testing::UnitTest::GetInstance()->current_test_info()->name() << ".logicdata"; + writeEvents(filePath.str().c_str()); + } // Cleanup enginePins.reset();