From fb234fa50e339f6beb9d520f7702597494104ce4 Mon Sep 17 00:00:00 2001
From: Andreas Billmann <andreas@billmann.de>
Date: Fri, 10 Dec 2021 00:51:38 +0100
Subject: [PATCH] fix tests

---
 build.gradle                                               | 7 ++++---
 .../ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java | 3 ++-
 .../ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java   | 3 ++-
 .../javafx/smartcsv/validation/HeaderValidationTest.java   | 5 +++--
 .../ninja/javafx/smartcsv/validation/ValidatorTest.java    | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 13fefad..32a8255 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,13 @@ javafx {
 
 dependencies {
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
-    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
+    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
+    testRuntimeOnly  group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
+    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2'
     testImplementation  group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
     testImplementation  group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
     implementation  group: 'org.apache.groovy', name: 'groovy', version: '4.0.0-rc-1'
-    implementation  (group: 'org.springframework', name:'spring-context', version: '5.3.13')
+    implementation  group: 'org.springframework', name:'spring-context', version: '5.3.13'
     implementation  group: 'de.siegmar', name: 'fastcsv', version: '2.1.0'
     implementation  group: 'commons-validator', name: 'commons-validator', version: '1.7'
     implementation  group: 'de.jensd', name: 'fontawesomefx-commons', version: '11.0'
diff --git a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
index a175ab2..4f64a7f 100644
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
@@ -28,8 +28,9 @@ package ninja.javafx.smartcsv.fx.table.model;
 
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+
 
 /**
  * unit test for the csv model
diff --git a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
index 1fef7c0..73345b9 100644
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
@@ -2,9 +2,10 @@ package ninja.javafx.smartcsv.fx.table.model;
 
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+
 
 /**
  * unit test for row class
diff --git a/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java b/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
index e92fe89..bc52069 100644
--- a/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
@@ -38,9 +38,10 @@ import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 /**
  * unit test for header validator
diff --git a/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java b/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
index 2ee9605..b33694b 100644
--- a/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
@@ -12,9 +12,9 @@ import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 /**
  * unit test for validator