From 0f1a135d91b021360b41672e0453236658099db9 Mon Sep 17 00:00:00 2001 From: Doc <nachito94@msn.com> Date: Tue, 23 Jul 2024 15:02:43 -0400 Subject: [PATCH] Fix more JUnit migration in tests --- .../java/discord4j/store/api/service/StoreTests.java | 11 +++++------ .../discord4j/store/api/util/LongObjTuple2Test.java | 11 ++++++----- .../discord4j/store/api/util/MappingIterableTest.java | 4 ++-- .../discord4j/store/crypto/EncryptDecryptTest.java | 7 +++---- .../java/discord4j/store/redis/SerializerTests.java | 4 ++-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/api/src/test/java/discord4j/store/api/service/StoreTests.java b/api/src/test/java/discord4j/store/api/service/StoreTests.java index d0f2a57..4e0c541 100644 --- a/api/src/test/java/discord4j/store/api/service/StoreTests.java +++ b/api/src/test/java/discord4j/store/api/service/StoreTests.java @@ -19,8 +19,7 @@ import discord4j.store.api.Store; import discord4j.store.api.noop.NoOpStoreService; import discord4j.store.api.primitive.ForwardingStoreService; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -28,7 +27,7 @@ import java.util.*; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class StoreTests { @@ -41,7 +40,7 @@ private Store<String, String> newStore() { @Test public void testServiceDiscovery() { assertTrue(provider.getStoreService() instanceof ForwardingStoreService); - Assert.assertEquals(TestService.class, + assertEquals(TestService.class, ((ForwardingStoreService) provider.getStoreService()).getOriginal().getClass()); } @@ -49,7 +48,7 @@ public void testServiceDiscovery() { public void testGenericFallback() { assertTrue(provider.getStoreService() instanceof ForwardingStoreService); assertTrue(provider.getStoreService().hasLongObjStores()); - Assert.assertEquals(TestService.class, + assertEquals(TestService.class, ((ForwardingStoreService) provider.getStoreService()).getOriginal().getClass()); } @@ -59,7 +58,7 @@ public void testOrder() { override.put(TestService.class, Integer.MAX_VALUE); override.put(NoOpStoreService.class, Integer.MIN_VALUE); StoreServiceLoader overridden = new StoreServiceLoader(override); - Assert.assertEquals(TestService.class, + assertEquals(TestService.class, ((ForwardingStoreService) provider.getStoreService()).getOriginal().getClass()); assertEquals(NoOpStoreService.class, overridden.getStoreService().getClass()); } diff --git a/api/src/test/java/discord4j/store/api/util/LongObjTuple2Test.java b/api/src/test/java/discord4j/store/api/util/LongObjTuple2Test.java index 74f9231..d223a52 100644 --- a/api/src/test/java/discord4j/store/api/util/LongObjTuple2Test.java +++ b/api/src/test/java/discord4j/store/api/util/LongObjTuple2Test.java @@ -16,12 +16,13 @@ */ package discord4j.store.api.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.util.function.Tuple2; import reactor.util.function.Tuples; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class LongObjTuple2Test { @@ -36,9 +37,9 @@ public void testConstruction() { assertEquals(obj, tuple.getT2()); } - @Test(expected = NullPointerException.class) + @Test public void testNullObj() { - LongObjTuple2.of(key, null); + assertThrows(NullPointerException.class, () -> LongObjTuple2.of(key, null)); } @Test diff --git a/api/src/test/java/discord4j/store/api/util/MappingIterableTest.java b/api/src/test/java/discord4j/store/api/util/MappingIterableTest.java index b8d5944..adf932c 100644 --- a/api/src/test/java/discord4j/store/api/util/MappingIterableTest.java +++ b/api/src/test/java/discord4j/store/api/util/MappingIterableTest.java @@ -16,11 +16,11 @@ */ package discord4j.store.api.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MappingIterableTest { diff --git a/redis/src/test/java/discord4j/store/crypto/EncryptDecryptTest.java b/redis/src/test/java/discord4j/store/crypto/EncryptDecryptTest.java index 05529af..e6856a2 100644 --- a/redis/src/test/java/discord4j/store/crypto/EncryptDecryptTest.java +++ b/redis/src/test/java/discord4j/store/crypto/EncryptDecryptTest.java @@ -17,15 +17,14 @@ package discord4j.store.crypto; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.crypto.*; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import static org.junit.Assert.assertEquals; - public class EncryptDecryptTest { @Test @@ -48,6 +47,6 @@ public void testEncryptDecryptStringUsingAES() throws NoSuchAlgorithmException, " `8888> `888 \n" + " \"8888 8% \n" + " `\"888x:-\" "; - assertEquals(input, new String(AES.decrypt(AES.encrypt(input.getBytes(), skey), skey))); + Assertions.assertEquals(input, new String(AES.decrypt(AES.encrypt(input.getBytes(), skey), skey))); } } diff --git a/redis/src/test/java/discord4j/store/redis/SerializerTests.java b/redis/src/test/java/discord4j/store/redis/SerializerTests.java index 27461b5..72b76bc 100644 --- a/redis/src/test/java/discord4j/store/redis/SerializerTests.java +++ b/redis/src/test/java/discord4j/store/redis/SerializerTests.java @@ -20,12 +20,12 @@ import discord4j.discordjson.Id; import discord4j.store.api.util.LongLongTuple2; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SerializerTests {