From 2c13af332420eb8a88f4e59c029f1970551d9244 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 29 Nov 2022 09:58:35 -0500 Subject: [PATCH] ETB JNI test progress --- .../io/src/main/java/com/rusefi/native_/EngineLogic.java | 3 +++ .../io/src/test/java/com/rusefi/native_/JniUnitTest.java | 6 ++++++ unit_tests/native/com_rusefi_native__EngineLogic.h | 8 ++++++++ unit_tests/native/native_impl.cpp | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/java_console/io/src/main/java/com/rusefi/native_/EngineLogic.java b/java_console/io/src/main/java/com/rusefi/native_/EngineLogic.java index f7b156beb5..639419638e 100644 --- a/java_console/io/src/main/java/com/rusefi/native_/EngineLogic.java +++ b/java_console/io/src/main/java/com/rusefi/native_/EngineLogic.java @@ -9,6 +9,9 @@ package com.rusefi.native_; public class EngineLogic { public native String getVersion(); + // huh? I am having trouble making this method static? + public native void resetTest(); + public native void setSensor(String sensorTypeName, double value); public native byte[] getConfiguration(); 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 619cc0b334..38b883e1a3 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,7 @@ import com.rusefi.config.Field; import com.rusefi.config.generated.Fields; import com.rusefi.core.Sensor; import com.rusefi.enums.SensorType; +import org.junit.Before; import org.junit.Test; import java.nio.ByteBuffer; @@ -15,6 +16,11 @@ import static com.rusefi.core.FileUtil.littleEndianWrap; import static junit.framework.Assert.*; public class JniUnitTest { + @Before + public void reset() { + new EngineLogic().resetTest(); + } + @Test public void run() { JniSandbox.loadLibrary(); diff --git a/unit_tests/native/com_rusefi_native__EngineLogic.h b/unit_tests/native/com_rusefi_native__EngineLogic.h index b7d92fa91c..f6b1603b12 100644 --- a/unit_tests/native/com_rusefi_native__EngineLogic.h +++ b/unit_tests/native/com_rusefi_native__EngineLogic.h @@ -15,6 +15,14 @@ extern "C" { JNIEXPORT jstring JNICALL Java_com_rusefi_native_1_EngineLogic_getVersion (JNIEnv *, jobject); +/* + * Class: com_rusefi_native__EngineLogic + * Method: resetTest + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_rusefi_native_1_EngineLogic_resetTest + (JNIEnv *, jobject); + /* * Class: com_rusefi_native__EngineLogic * Method: setSensor diff --git a/unit_tests/native/native_impl.cpp b/unit_tests/native/native_impl.cpp index fbfc89c112..7038a024b8 100644 --- a/unit_tests/native/native_impl.cpp +++ b/unit_tests/native/native_impl.cpp @@ -24,6 +24,11 @@ static EngineTestHelper* getEth() { return ethPtr.get(); } +JNIEXPORT void JNICALL Java_com_rusefi_native_1_EngineLogic_resetTest + (JNIEnv *, jobject) { + ethPtr = nullptr; +} + JNIEXPORT jstring JNICALL Java_com_rusefi_native_1_EngineLogic_getVersion(JNIEnv * env, jobject) { const char msg[60] = "Hello from unit tests"; const char* fileName = msg;