From e9625b3cd87274fe7c22b29376466ed0dee5c9fa Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 15 Mar 2022 13:57:40 -0400 Subject: [PATCH] JNI for test coverage #3965 --- .../io/src/test/java/com/rusefi/native_/JniUnitTest.java | 7 +++++-- unit_tests/native/native_impl.cpp | 2 ++ unit_tests/tests/test_util.cpp | 2 +- 3 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 999228abd8..815431a926 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 @@ -5,6 +5,9 @@ import org.junit.Test; import java.nio.ByteBuffer; +import static com.rusefi.config.generated.Fields.TS_FILE_VERSION; +import static com.rusefi.shared.FileUtil.littleEndianWrap; +import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; public class JniUnitTest { @@ -21,8 +24,8 @@ public class JniUnitTest { byte[] outputs = engineLogic.getOutputs(); Sensor sensor = Sensor.FIRMWARE_VERSION; - ByteBuffer bb = ByteBuffer.wrap(outputs, sensor.getOffset(), 4); + ByteBuffer bb = littleEndianWrap(outputs, sensor.getOffset(), 4); double value = sensor.getValueForChannel(bb); - System.out.println(value); + assertEquals(TS_FILE_VERSION, (int)value); } } diff --git a/unit_tests/native/native_impl.cpp b/unit_tests/native/native_impl.cpp index 1dc59bb97d..c1acb19e76 100644 --- a/unit_tests/native/native_impl.cpp +++ b/unit_tests/native/native_impl.cpp @@ -8,6 +8,7 @@ #include "pch.h" #include "com_rusefi_native__EngineLogic.h" #include "auto_generated_sensor.h" +#include "tunerstudio.h" #include @@ -64,6 +65,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_rusefi_native_1_EngineLogic_getOutputs(JNI jbyteArray retVal = env->NewByteArray(sizeof(TunerStudioOutputChannels)); jbyte *buf = env->GetByteArrayElements(retVal, NULL); EngineTestHelper* eth = getEth(); + updateTunerStudioState(); memcpy(buf, (const void*)ð->engine.outputChannels, sizeof(TunerStudioOutputChannels)); env->ReleaseByteArrayElements(retVal, buf, 0); diff --git a/unit_tests/tests/test_util.cpp b/unit_tests/tests/test_util.cpp index f582878b6d..5d9fd79d72 100644 --- a/unit_tests/tests/test_util.cpp +++ b/unit_tests/tests/test_util.cpp @@ -497,7 +497,7 @@ TEST(misc, testMenuTree) { } int getRusEfiVersion(void) { - return 776655; + return TS_FILE_VERSION; } TEST(util, PeakDetect) {