diff --git a/build.gradle b/build.gradle index b24dabe..f6c0791 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ repositories { dependencies { implementation 'org.ow2.asm:asm:9.3' - testImplementation 'junit:junit:4.13.2' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' } sourceCompatibility = 8 @@ -46,6 +46,10 @@ processResources { } } +test { + useJUnitPlatform() +} + shadowJar { classifier = null diff --git a/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/ChunkedInputStreamTest.java b/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/ChunkedInputStreamTest.java index e0cdd82..8398665 100644 --- a/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/ChunkedInputStreamTest.java +++ b/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/ChunkedInputStreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -18,15 +18,14 @@ package moe.yushi.authlibinjector.internal.fi.iki.elonen; import static java.nio.charset.StandardCharsets.US_ASCII; import static moe.yushi.authlibinjector.util.IOUtils.asBytes; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.ByteArrayInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; - -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("resource") public class ChunkedInputStreamTest { @@ -76,99 +75,99 @@ public class ChunkedInputStreamTest { assertEquals(underlying.read(), -1); } - @Test(expected = EOFException.class) + @Test public void testReadEOF1() throws IOException { byte[] data = ("a").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF2() throws IOException { byte[] data = ("a\r").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF3() throws IOException { byte[] data = ("a\r\n").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF4() throws IOException { byte[] data = ("a\r\nabc").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF5() throws IOException { byte[] data = ("a\r\n123456789a\r").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF6() throws IOException { byte[] data = ("a\r\n123456789a\r\n").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = EOFException.class) + @Test public void testReadEOF7() throws IOException { byte[] data = ("a\r\n123456789a\r\n0\r\n\r").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } - @Test(expected = IOException.class) + @Test public void testBadIn1() throws IOException { byte[] data = ("-1").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(IOException.class, () -> asBytes(in)); } - @Test(expected = IOException.class) + @Test public void testBadIn2() throws IOException { byte[] data = ("a\ra").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(IOException.class, () -> asBytes(in)); } - @Test(expected = IOException.class) + @Test public void testBadIn3() throws IOException { byte[] data = ("a\r\n123456789aa").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(IOException.class, () -> asBytes(in)); } - @Test(expected = IOException.class) + @Test public void testBadIn4() throws IOException { byte[] data = ("a\r\n123456789a\ra").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(IOException.class, () -> asBytes(in)); } - @Test(expected = IOException.class) + @Test public void testBadIn5() throws IOException { byte[] data = ("a\r\n123456789a\r\n0\r\n\r-").getBytes(US_ASCII); ByteArrayInputStream underlying = new ByteArrayInputStream(data); InputStream in = new ChunkedInputStream(underlying); - asBytes(in); + assertThrows(IOException.class, () -> asBytes(in)); } } diff --git a/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/FixedLengthInputStreamTest.java b/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/FixedLengthInputStreamTest.java index 1fe4d72..4186718 100644 --- a/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/FixedLengthInputStreamTest.java +++ b/src/test/java/moe/yushi/authlibinjector/internal/fi/iki/elonen/FixedLengthInputStreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,16 +17,15 @@ package moe.yushi.authlibinjector.internal.fi.iki.elonen; import static moe.yushi.authlibinjector.util.IOUtils.asBytes; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.ByteArrayInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; - -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("resource") public class FixedLengthInputStreamTest { @@ -58,10 +57,10 @@ public class FixedLengthInputStreamTest { assertEquals(underlying.read(), 0x11); } - @Test(expected = EOFException.class) + @Test public void testReadEOF() throws IOException { byte[] data = new byte[] { 0x11, 0x22, 0x33, 0x44, 0x55 }; InputStream in = new FixedLengthInputStream(new ByteArrayInputStream(data), 6); - asBytes(in); + assertThrows(EOFException.class, () -> asBytes(in)); } } diff --git a/src/test/java/moe/yushi/authlibinjector/test/DefaultURLRedirectorTest.java b/src/test/java/moe/yushi/authlibinjector/test/DefaultURLRedirectorTest.java index 74df8d0..86ba6ec 100644 --- a/src/test/java/moe/yushi/authlibinjector/test/DefaultURLRedirectorTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/DefaultURLRedirectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -18,9 +18,9 @@ package moe.yushi.authlibinjector.test; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import moe.yushi.authlibinjector.APIMetadata; import moe.yushi.authlibinjector.httpd.DefaultURLRedirector; diff --git a/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java b/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java index 5fcdb0b..319b106 100644 --- a/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,8 +17,9 @@ package moe.yushi.authlibinjector.test; import static moe.yushi.authlibinjector.util.KeyUtils.decodePEMPublicKey; -import static org.junit.Assert.assertArrayEquals; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; public class KeyUtilsTest { @@ -34,14 +35,16 @@ public class KeyUtilsTest { decodePEMPublicKey("-----BEGIN PUBLIC KEY-----\nf\n39/fw==\n-----END PUBLIC KEY-----\n")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testDecodePublicKey3() { - decodePEMPublicKey("-----BEGIN PUBLIC KEY----- f39/fw== -----END PUBLIC KEY-----"); + assertThrows(IllegalArgumentException.class, + () -> decodePEMPublicKey("-----BEGIN PUBLIC KEY----- f39/fw== -----END PUBLIC KEY-----")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testDecodePublicKey4() { - decodePEMPublicKey("-----BEGIN PUBLIC KEY-----f39/fw==-----END NOT A PUBLIC KEY-----"); + assertThrows(IllegalArgumentException.class, + () -> decodePEMPublicKey("-----BEGIN PUBLIC KEY-----f39/fw==-----END NOT A PUBLIC KEY-----")); } } diff --git a/src/test/java/moe/yushi/authlibinjector/test/SkinWhitelistTest.java b/src/test/java/moe/yushi/authlibinjector/test/SkinWhitelistTest.java index 6e3cfca..2d350e2 100644 --- a/src/test/java/moe/yushi/authlibinjector/test/SkinWhitelistTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/SkinWhitelistTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,9 +17,9 @@ package moe.yushi.authlibinjector.test; import static moe.yushi.authlibinjector.transform.support.SkinWhitelistTransformUnit.domainMatches; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; public class SkinWhitelistTest { diff --git a/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java b/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java index 97e76c4..43dfce8 100644 --- a/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Haowei Wen and contributors + * Copyright (C) 2022 Haowei Wen and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,11 +17,9 @@ package moe.yushi.authlibinjector.test; import static moe.yushi.authlibinjector.transform.support.MainArgumentsTransformer.inferVersionSeries; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Optional; - -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VersionSeriesDetectTest {