From 12cf2dad13043450ae26700d9d9f784f5729bce5 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Fri, 15 Dec 2023 09:51:08 -0500
Subject: [PATCH] only:junit5

---
 java_tools/build.gradle                                   | 6 ++++--
 java_tools/configuration_definition_base/build.gradle     | 8 +++++++-
 .../test/java/com/rusefi/ldmp/LiveDataProcessorTest.java  | 2 +-
 .../com/rusefi/ldmp/StateDictionaryGeneratorTest.java     | 2 +-
 java_tools/dependencies.gradle                            | 5 +++--
 java_tools/gradle.properties                              | 3 ++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java_tools/build.gradle b/java_tools/build.gradle
index c31991e4de..8be78425ad 100644
--- a/java_tools/build.gradle
+++ b/java_tools/build.gradle
@@ -10,6 +10,8 @@ allprojects {
         dependencies {
             implementation global_libs.annotations
             testImplementation global_libs.junit
+            testImplementation global_libs.junit5
+            testImplementation global_libs.junit5engine
         }
     }
 
@@ -31,7 +33,7 @@ tasks.named('wrapper') {
     distributionType = Wrapper.DistributionType.ALL
 }
 
-// gradlew allDeps 
+// gradlew allDeps
 subprojects {
     task allDeps(type: DependencyReportTask) {}
-}
\ No newline at end of file
+}
diff --git a/java_tools/configuration_definition_base/build.gradle b/java_tools/configuration_definition_base/build.gradle
index be9d40f536..5dcbbf9b5e 100644
--- a/java_tools/configuration_definition_base/build.gradle
+++ b/java_tools/configuration_definition_base/build.gradle
@@ -18,4 +18,10 @@ dependencies {
 shadowJar {
     dependsOn(':enum_to_string:shadowJar')
     archiveClassifier = ''
-}
\ No newline at end of file
+}
+
+test {
+  // todo: move into global once junit5 migration is over!
+  // Enable JUnit 5
+  useJUnitPlatform()
+}
diff --git a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java
index b9eb6a0f8f..11bfb5d19c 100644
--- a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java
+++ b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java
@@ -1,7 +1,7 @@
 package com.rusefi.ldmp;
 
 import com.rusefi.ReaderProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.*;
 import java.util.Map;
diff --git a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java
index 51256273dc..28d33d9749 100644
--- a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java
+++ b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java
@@ -1,6 +1,6 @@
 package com.rusefi.ldmp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/java_tools/dependencies.gradle b/java_tools/dependencies.gradle
index c1d9f41339..8c1d6e65c7 100644
--- a/java_tools/dependencies.gradle
+++ b/java_tools/dependencies.gradle
@@ -1,7 +1,8 @@
 ext {
   global_libs = [
           junit          : "junit:junit:4.13.2",
-          junit5         : 'org.junit.jupiter:junit-jupiter-api:5.10.1',
+          junit5         : "org.junit.jupiter:junit-jupiter-api:$junit5Version",
+          junit5engine   : "org.junit.jupiter:junit-jupiter-engine:$junit5Version",
           annotations    : "org.jetbrains:annotations:16.0.1",
           jsr305         : "com.google.code.findbugs:jsr305:3.0.2",
           antlr          : "org.antlr:antlr4:4.13.0",
@@ -20,4 +21,4 @@ ext {
           httpmime    : "org.apache.httpcomponents:httpmime:4.5.12",
           launcher_api: fileTree( dir: "lib", include: "TunerStudioPluginAPI.jar" )
   ]
-}
\ No newline at end of file
+}
diff --git a/java_tools/gradle.properties b/java_tools/gradle.properties
index 4496367e2f..c4f151138c 100644
--- a/java_tools/gradle.properties
+++ b/java_tools/gradle.properties
@@ -2,5 +2,6 @@
 
 shadowVersion=8.1.1
 javaCanVersion=3.2.4
+junit5Version=5.10.1
 
-org.gradle.warning.mode=all
\ No newline at end of file
+org.gradle.warning.mode=all