From 05f4749fb8fcd2ff0f9c47765aaaed45a0c24dd5 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Wed, 18 Aug 2021 14:59:33 +0300
Subject: [PATCH] mybatis tests improved

---
 pom.xml                                       | 43 +++++++++++++++++++
 redisson-mybatis/pom.xml                      | 23 ++++------
 .../redisson/mybatis/RedissonCacheTest.java   |  9 ++--
 redisson/pom.xml                              | 14 ------
 4 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8e19e93b..f6bba0b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,49 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.18.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>4.0.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.jmockit</groupId>
+               <artifactId>jmockit</artifactId>
+               <version>1.49</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.jooq</groupId>
+               <artifactId>joor-java-8</artifactId>
+               <version>0.9.12</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>5.7.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>5.7.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.3</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
diff --git a/redisson-mybatis/pom.xml b/redisson-mybatis/pom.xml
index bcf186e77..def0de9d1 100644
--- a/redisson-mybatis/pom.xml
+++ b/redisson-mybatis/pom.xml
@@ -51,6 +51,15 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
@@ -63,20 +72,6 @@
             <artifactId>redisson</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.13.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/redisson-mybatis/src/test/java/org/redisson/mybatis/RedissonCacheTest.java b/redisson-mybatis/src/test/java/org/redisson/mybatis/RedissonCacheTest.java
index b7dde8d81..b3fcc0436 100644
--- a/redisson-mybatis/src/test/java/org/redisson/mybatis/RedissonCacheTest.java
+++ b/redisson-mybatis/src/test/java/org/redisson/mybatis/RedissonCacheTest.java
@@ -1,8 +1,9 @@
 package org.redisson.mybatis;
 
-import static org.assertj.core.api.Assertions.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
@@ -13,7 +14,7 @@ public class RedissonCacheTest {
 
     private RedissonCache cache;
 
-    @Before
+    @BeforeEach
     public void before() {
         cache = new RedissonCache("redisson");
         cache.setTimeToLive(1000);
diff --git a/redisson/pom.xml b/redisson/pom.xml
index 4671875e7..2b5da0916 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -85,44 +85,30 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.18.1</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
            <groupId>org.jmockit</groupId>
            <artifactId>jmockit</artifactId>
-           <version>1.49</version>
-           <scope>test</scope>
         </dependency>
         <dependency>
            <groupId>org.jooq</groupId>
            <artifactId>joor-java-8</artifactId>
-           <version>0.9.12</version>
-           <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.1</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.7.1</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>