Upgrade junit

felldo · Nov 16, 2024 · b64db11 · b64db11
1 parent 099c371
commit b64db11
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/jemoji-languages/build.gradle.kts b/jemoji-languages/build.gradle.kts
@@ -48,8 +48,6 @@ repositories {
 
 dependencies {
     compileOnly(project(":jemoji"))
-    //testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    //testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation(project(":jemoji"))
 }
 
@@ -70,7 +68,7 @@ testing {
         // Configure the built-in test suite
         val test by getting(JvmTestSuite::class) {
             // Use JUnit4 test framework
-            useJUnit("4.13.2")
+            useJUnitJupiter("5.11.3")
         }
     }
 }

diff --git a/...rc/test/java/jemoji/EmojiManagerTest.java → ...um/jemoji/languages/EmojiManagerTest.java b/...rc/test/java/jemoji/EmojiManagerTest.java → ...um/jemoji/languages/EmojiManagerTest.java
@@ -1,10 +1,10 @@
-package jemoji;
+package net.fellbaum.jemoji.languages;
 
 import net.fellbaum.jemoji.EmojiLanguage;
 import net.fellbaum.jemoji.Emojis;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EmojiManagerTest {
 

diff --git a/jemoji/build.gradle.kts b/jemoji/build.gradle.kts
@@ -61,7 +61,7 @@ testing {
         // Configure the built-in test suite
         val test by getting(JvmTestSuite::class) {
             // Use JUnit4 test framework
-            useJUnit("4.13.2")
+            useJUnitJupiter("5.11.3")
         }
     }
 }

diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java
@@ -1,14 +1,14 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EmojiManagerTest {
 

diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EmojiTest {
 

diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FitzpatrickTest {
 

diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class HairStyleTest {