diff --git a/src/test/java/org/apache/commons/net/examples/MainTest.java b/src/test/java/org/apache/commons/net/examples/MainTest.java index d2caabb9a..0f8e00d4f 100644 --- a/src/test/java/org/apache/commons/net/examples/MainTest.java +++ b/src/test/java/org/apache/commons/net/examples/MainTest.java @@ -17,7 +17,7 @@ package org.apache.commons.net.examples; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.IOException; @@ -30,7 +30,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MainTest { diff --git a/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java b/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java index f8cd66f58..c41f7b73a 100644 --- a/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java +++ b/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java @@ -17,14 +17,17 @@ package org.apache.commons.net.ftp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; import java.net.SocketException; import java.net.URL; import java.time.Duration; +import java.time.Instant; +import java.util.Calendar; import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.NullOutputStream; @@ -38,7 +41,9 @@ import org.apache.ftpserver.ssl.SslConfigurationFactory; import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; import org.apache.ftpserver.usermanager.impl.BaseUser; -import org.junit.Assert; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; /** * Tests {@link FTPSClient}. @@ -62,6 +67,10 @@ public abstract class AbstractFtpsTest { private static final boolean TRACE_CALLS = Boolean.parseBoolean(System.getenv("TRACE_CALLS")); private static final boolean ADD_LISTENER = Boolean.parseBoolean(System.getenv("ADD_LISTENER")); private static final long startTime = System.nanoTime(); + private static final String USER_PROPS_RES = "org/apache/commons/net/ftpsserver/users.properties"; + private static final String SERVER_JKS_RES = "org/apache/commons/net/ftpsserver/ftpserver.jks"; + + private final boolean endpointCheckingEnabled; /** * Returns the test directory as a String. @@ -92,7 +101,7 @@ protected synchronized static void setupServer(final boolean implicit, final Str final FtpServerFactory serverFactory = new FtpServerFactory(); final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory(); final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(userPropertiesResource); - Assert.assertNotNull(userPropertiesResource, userPropsResource); + assertNotNull(userPropsResource, userPropertiesResource); propertiesUserManagerFactory.setUrl(userPropsResource); final UserManager userManager = propertiesUserManagerFactory.createUserManager(); final BaseUser user = (BaseUser) userManager.getUserByName("test"); @@ -105,11 +114,11 @@ protected synchronized static void setupServer(final boolean implicit, final Str // define SSL configuration final URL serverJksResource = ClassLoader.getSystemClassLoader().getResource(serverJksResourceResource); - Assert.assertNotNull(serverJksResourceResource, serverJksResource); + assertNotNull(serverJksResource, serverJksResourceResource); // System.out.println("Loading " + serverJksResource); final SslConfigurationFactory sllConfigFactory = new SslConfigurationFactory(); final File keyStoreFile = FileUtils.toFile(serverJksResource); - Assert.assertTrue(keyStoreFile.toString(), keyStoreFile.exists()); + assertTrue(keyStoreFile.exists(), keyStoreFile.toString()); sllConfigFactory.setKeystoreFile(keyStoreFile); sllConfigFactory.setKeystorePassword("password"); @@ -136,9 +145,12 @@ protected static void trace(final String msg) { } } - private final boolean endpointCheckingEnabled; + @BeforeAll + public static void setupServer() throws Exception { + AbstractFtpsTest.setupServer(AbstractFtpsTest.IMPLICIT, USER_PROPS_RES, SERVER_JKS_RES, "target/test-classes/org/apache/commons/net/test-data"); + } - public AbstractFtpsTest(final boolean endpointCheckingEnabled, final String userPropertiesResource, final String serverJksResource) { + public AbstractFtpsTest(final boolean endpointCheckingEnabled) { this.endpointCheckingEnabled = endpointCheckingEnabled; } @@ -202,10 +214,150 @@ protected void retrieveFile(final String pathname) throws SocketException, IOExc try { // Do it twice. // Just testing that we are not getting an SSL error (the file MUST be present). - assertTrue(pathname, client.retrieveFile(pathname, NullOutputStream.INSTANCE)); - assertTrue(pathname, client.retrieveFile(pathname, NullOutputStream.INSTANCE)); + assertTrue(client.retrieveFile(pathname, NullOutputStream.INSTANCE), pathname); + assertTrue(client.retrieveFile(pathname, NullOutputStream.INSTANCE), pathname); + } finally { + client.disconnect(); + } + } + + + @Test + @Timeout(TEST_TIMEOUT) + public void testHasFeature() throws SocketException, IOException { + trace(">>testHasFeature"); + loginClient().disconnect(); + trace("<>testListFilesPathNameEmpty"); + testListFiles(""); + trace("<>testListFilesPathNameJunk"); + testListFiles(" Junk "); + trace("<>testListFilesPathNameNull"); + testListFiles(null); + trace("<>testListFilesPathNameRoot"); + testListFiles("/"); + trace("<>testMdtmCalendar"); + testMdtmCalendar("/file.txt"); + trace("<>testMdtmFile"); + testMdtmFile("/file.txt"); + trace("<>testMdtmInstant"); + testMdtmInstant("/file.txt"); + trace("<>testOpenClose"); + final FTPSClient ftpsClient = loginClient(); + try { + assertTrue(ftpsClient.hasFeature("MODE")); + assertTrue(ftpsClient.hasFeature(FTPCmd.MODE)); + } finally { + ftpsClient.disconnect(); + } + trace("<>testRetrieveFilePathNameRoot"); + retrieveFile("/file.txt"); + trace("< */ -@RunWith(Parameterized.class) -public class FTPSClientTest extends AbstractFtpsTest { - - private static final String USER_PROPS_RES = "org/apache/commons/net/ftpsserver/users.properties"; - - private static final String SERVER_JKS_RES = "org/apache/commons/net/ftpsserver/ftpserver.jks"; - - @BeforeClass - public static void setupServer() throws Exception { - setupServer(IMPLICIT, USER_PROPS_RES, SERVER_JKS_RES, "target/test-classes/org/apache/commons/net/test-data"); - } - - @Parameters(name = "endpointCheckingEnabled={0}") - public static Boolean[] testConstructurData() { - return new Boolean[] { Boolean.FALSE, Boolean.TRUE }; - } - - public FTPSClientTest(final boolean endpointCheckingEnabled) { - super(endpointCheckingEnabled, null, null); - } - - @Test(timeout = TEST_TIMEOUT) - public void testHasFeature() throws SocketException, IOException { - trace(">>testHasFeature"); - loginClient().disconnect(); - trace("<>testListFilesPathNameEmpty"); - testListFiles(""); - trace("<>testListFilesPathNameJunk"); - testListFiles(" Junk "); - trace("<>testListFilesPathNameNull"); - testListFiles(null); - trace("<>testListFilesPathNameRoot"); - testListFiles("/"); - trace("<>testMdtmCalendar"); - testMdtmCalendar("/file.txt"); - trace("<>testMdtmFile"); - testMdtmFile("/file.txt"); - trace("<>testMdtmInstant"); - testMdtmInstant("/file.txt"); - trace("<>testOpenClose"); - final FTPSClient ftpsClient = loginClient(); - try { - assertTrue(ftpsClient.hasFeature("MODE")); - assertTrue(ftpsClient.hasFeature(FTPCmd.MODE)); - } finally { - ftpsClient.disconnect(); - } - trace("<>testRetrieveFilePathNameRoot"); - retrieveFile("/file.txt"); - trace("< asList = Arrays.asList(messages); - Assert.assertNull(t.thread(asList)); + assertNull(t.thread(asList)); } @Test @@ -51,7 +52,7 @@ public void testEmptyList() { // NET-539 final Threader t = new Threader(); final Threadable[] messages = EMPTY_THREADABLE_ARRAY; final List asList = Arrays.asList(messages); - Assert.assertNull(t.thread(asList)); + assertNull(t.thread(asList)); } @Test @@ -59,21 +60,21 @@ public void testEmptyList() { // NET-539 public void testNullArray() { // NET-539 final Threader t = new Threader(); final Threadable[] messages = null; - Assert.assertNull(t.thread(messages)); + assertNull(t.thread(messages)); } @Test public void testNullIterable() { final Threader t = new Threader(); final Iterable messages = null; - Assert.assertNull(t.thread(messages)); + assertNull(t.thread(messages)); } @Test public void testNullList() { final Threader t = new Threader(); final List messages = null; - Assert.assertNull(t.thread(messages)); + assertNull(t.thread(messages)); } } diff --git a/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java b/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java index d7cc2371d..4cdc8145c 100644 --- a/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java +++ b/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java @@ -16,15 +16,19 @@ */ package org.apache.commons.net.ntp; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.IOException; import java.net.InetAddress; import java.time.Duration; import org.apache.commons.net.examples.ntp.SimpleNTPServer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * JUnit test class for NtpClient using SimpleNTPServer @@ -33,7 +37,7 @@ public class TestNtpClient { private static SimpleNTPServer server; - @BeforeClass + @BeforeAll public static void oneTimeSetUp() throws IOException { // one-time initialization code server = new SimpleNTPServer(0); @@ -42,9 +46,9 @@ public static void oneTimeSetUp() throws IOException { try { server.start(); } catch (final IOException e) { - Assert.fail("failed to start NTP server: " + e); + fail("failed to start NTP server: " + e); } - Assert.assertTrue(server.isStarted()); + assertTrue(server.isStarted()); // System.out.println("XXX: time server started"); boolean running = false; for (int retries = 0; retries < 5; retries++) { @@ -59,10 +63,10 @@ public static void oneTimeSetUp() throws IOException { // ignore } } - Assert.assertTrue(running); + assertTrue(running); } - @AfterClass + @AfterAll public static void oneTimeTearDown() { // one-time cleanup code if (server != null) { @@ -81,31 +85,31 @@ public void testGetTime() throws IOException { // Java 1.7: use InetAddress.getLoopbackAddress() instead final InetAddress addr = InetAddress.getByAddress("loopback", new byte[] { 127, 0, 0, 1 }); final TimeInfo timeInfo = client.getTime(addr, server.getPort()); - Assert.assertNotNull(timeInfo); - Assert.assertTrue(timeInfo.getReturnTime() >= currentTimeMillis); + assertNotNull(timeInfo); + assertTrue(timeInfo.getReturnTime() >= currentTimeMillis); final NtpV3Packet message = timeInfo.getMessage(); - Assert.assertNotNull(message); + assertNotNull(message); final TimeStamp rcvTimeStamp = message.getReceiveTimeStamp(); final TimeStamp xmitTimeStamp = message.getTransmitTimeStamp(); - Assert.assertTrue(xmitTimeStamp.compareTo(rcvTimeStamp) >= 0); + assertTrue(xmitTimeStamp.compareTo(rcvTimeStamp) >= 0); final TimeStamp originateTimeStamp = message.getOriginateTimeStamp(); - Assert.assertNotNull(originateTimeStamp); - Assert.assertTrue(originateTimeStamp.getTime() >= currentTimeMillis); + assertNotNull(originateTimeStamp); + assertTrue(originateTimeStamp.getTime() >= currentTimeMillis); - Assert.assertEquals(NtpV3Packet.MODE_SERVER, message.getMode()); + assertEquals(NtpV3Packet.MODE_SERVER, message.getMode()); // following assertions are specific to the SimpleNTPServer final TimeStamp referenceTimeStamp = message.getReferenceTimeStamp(); - Assert.assertNotNull(referenceTimeStamp); - Assert.assertTrue(referenceTimeStamp.getTime() >= currentTimeMillis); + assertNotNull(referenceTimeStamp); + assertTrue(referenceTimeStamp.getTime() >= currentTimeMillis); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(1, message.getStratum()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(1, message.getStratum()); - Assert.assertEquals("LCL", NtpUtils.getReferenceClock(message)); + assertEquals("LCL", NtpUtils.getReferenceClock(message)); } finally { client.close(); } diff --git a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java index d1aa75eb1..46753fdca 100644 --- a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java +++ b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java @@ -16,12 +16,15 @@ */ package org.apache.commons.net.ntp; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.DatagramPacket; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestNtpPacket { @@ -56,29 +59,29 @@ public void testCreate() { message.setReceiveTimeStamp(new TimeStamp(0xd55247194b6d9000L)); message.setTransmitTime(new TimeStamp(0xd55247194b797000L)); - Assert.assertEquals(-17, message.getPrecision()); - Assert.assertEquals(4, message.getPoll()); - Assert.assertEquals(100, message.getRootDelay()); - Assert.assertEquals(3382, message.getRootDispersion()); - Assert.assertEquals(0x81531472, message.getReferenceId()); - Assert.assertNotNull(message.getReferenceTimeStamp()); - Assert.assertEquals("NTP", message.getType()); - Assert.assertEquals("Server", message.getModeName()); - Assert.assertEquals("129.83.20.114", message.getReferenceIdString()); - Assert.assertEquals(51, message.getRootDispersionInMillis()); - Assert.assertEquals(message.getRootDelay() / 65.536, message.getRootDelayInMillisDouble(), 1e-13); + assertEquals(-17, message.getPrecision()); + assertEquals(4, message.getPoll()); + assertEquals(100, message.getRootDelay()); + assertEquals(3382, message.getRootDispersion()); + assertEquals(0x81531472, message.getReferenceId()); + assertNotNull(message.getReferenceTimeStamp()); + assertEquals("NTP", message.getType()); + assertEquals("Server", message.getModeName()); + assertEquals("129.83.20.114", message.getReferenceIdString()); + assertEquals(51, message.getRootDispersionInMillis()); + assertEquals(message.getRootDelay() / 65.536, message.getRootDelayInMillisDouble(), 1e-13); final DatagramPacket dp = message.getDatagramPacket(); // this creates a new datagram - Assert.assertNotNull(dp); - Assert.assertEquals(48, dp.getLength()); // fixed 48-byte length + assertNotNull(dp); + assertEquals(48, dp.getLength()); // fixed 48-byte length final NtpV3Packet message2 = new NtpV3Impl(); final DatagramPacket dp2 = new DatagramPacket(ntpPacket, ntpPacket.length); message2.setDatagramPacket(dp2); - Assert.assertEquals(message2, message); - Assert.assertEquals(message2.hashCode(), message.hashCode()); - Assert.assertEquals(message2.toString(), message.toString()); + assertEquals(message2, message); + assertEquals(message2.hashCode(), message.hashCode()); + assertEquals(message2.toString(), message.toString()); } @Test @@ -90,49 +93,49 @@ public void testCreateAndSetByte0() { message.setMode(4); message.setVersion(NtpV3Packet.VERSION_3); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); message.setLeapIndicator(2); message.setVersion(NtpV3Packet.VERSION_3); message.setMode(4); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); message.setMode(4); message.setLeapIndicator(2); message.setVersion(NtpV3Packet.VERSION_3); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); message.setMode(4); message.setVersion(NtpV3Packet.VERSION_3); message.setLeapIndicator(2); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); message.setVersion(NtpV3Packet.VERSION_3); message.setMode(4); message.setLeapIndicator(2); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); message.setVersion(NtpV3Packet.VERSION_3); message.setLeapIndicator(2); message.setMode(4); - Assert.assertEquals(4, message.getMode()); - Assert.assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); - Assert.assertEquals(2, message.getLeapIndicator()); + assertEquals(4, message.getMode()); + assertEquals(NtpV3Packet.VERSION_3, message.getVersion()); + assertEquals(2, message.getLeapIndicator()); } @Test @@ -147,7 +150,7 @@ public void testCreateFromBytes() { final NtpV3Packet message = new NtpV3Impl(); final DatagramPacket dp = new DatagramPacket(ntpPacket, ntpPacket.length); message.setDatagramPacket(dp); - Assert.assertEquals(4, message.getMode()); + assertEquals(4, message.getMode()); } @Test @@ -163,16 +166,16 @@ public void testCreateNtpV4() { message.setStratum(3); message.setReferenceId(0x81531472); // force hex-string reference id string - Assert.assertEquals("81531472", message.getReferenceIdString()); + assertEquals("81531472", message.getReferenceIdString()); message.setVersion(NtpV3Packet.VERSION_4); message.setStratum(1); message.setReferenceId(0x55534E4F); // USNO // force raw-string reference id string - Assert.assertEquals("USNO", message.getReferenceIdString()); + assertEquals("USNO", message.getReferenceIdString()); message.setReferenceId(0x47505300); // GPS - Assert.assertEquals("GPS", message.getReferenceIdString()); + assertEquals("GPS", message.getReferenceIdString()); } @Test @@ -182,16 +185,16 @@ public void testEquals() { message1.setDatagramPacket(dp); final NtpV3Packet message2 = new NtpV3Impl(); message2.setDatagramPacket(dp); - Assert.assertEquals("hashCode", message1.hashCode(), message2.hashCode()); - Assert.assertEquals(message1, message2); + assertEquals(message1.hashCode(), message2.hashCode(), "hashCode"); + assertEquals(message1, message2); // now change the packet to force equals() => false message2.setMode(2); - Assert.assertTrue(message1.getMode() != message2.getMode()); - Assert.assertNotEquals(message1, message2); + assertTrue(message1.getMode() != message2.getMode()); + assertNotEquals(message1, message2); final NtpV3Packet message3 = null; - Assert.assertNotEquals(message3, message1); + assertNotEquals(message3, message1); } } diff --git a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java index 86f7273ae..fbe79479e 100644 --- a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java +++ b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java @@ -16,15 +16,20 @@ */ package org.apache.commons.net.ntp; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestTimeInfo { @@ -32,9 +37,9 @@ public class TestTimeInfo { public void testAddress() throws UnknownHostException { final NtpV3Packet packet = new NtpV3Impl(); final TimeInfo info = new TimeInfo(packet, System.currentTimeMillis()); - Assert.assertNull(info.getAddress()); + assertNull(info.getAddress()); packet.getDatagramPacket().setAddress(InetAddress.getByAddress("loopback", new byte[] { 127, 0, 0, 1 })); - Assert.assertNotNull(info.getAddress()); + assertNotNull(info.getAddress()); } @Test @@ -62,13 +67,13 @@ public void testComputeDetails() { final TimeInfo info = new TimeInfo(packet, returnTimeMillis); info.computeDetails(); - Assert.assertSame(packet, info.getMessage()); - Assert.assertEquals(returnTimeMillis, info.getReturnTime()); - Assert.assertEquals(Long.valueOf(500), info.getOffset()); - Assert.assertEquals(Long.valueOf(-1000), info.getDelay()); + assertSame(packet, info.getMessage()); + assertEquals(returnTimeMillis, info.getReturnTime()); + assertEquals(Long.valueOf(500), info.getOffset()); + assertEquals(Long.valueOf(-1000), info.getDelay()); // comments: [Warning: processing time > total network time, Error: OrigTime > DestRcvTime] - Assert.assertEquals(2, info.getComments().size()); + assertEquals(2, info.getComments().size()); } @Test @@ -79,13 +84,13 @@ public void testEquals() { info.addComment("this is a comment"); final TimeInfo other = new TimeInfo(packet, returnTime); other.addComment("this is a comment"); - Assert.assertEquals(info, other); // fails - Assert.assertEquals(info.hashCode(), other.hashCode()); + assertEquals(info, other); // fails + assertEquals(info.hashCode(), other.hashCode()); other.addComment("another comment"); - // Assert.assertFalse(info.equals(other)); // comments not used for equality + // assertFalse(info.equals(other)); // comments not used for equality final TimeInfo another = new TimeInfo(packet, returnTime, new ArrayList<>()); - Assert.assertEquals(info, another); + assertEquals(info, another); } @Test @@ -102,23 +107,23 @@ public void testNotEquals() { // 1. different return time final NtpV3Packet packet2 = new NtpV3Impl(); - Assert.assertEquals(packet, packet2); + assertEquals(packet, packet2); final TimeInfo info2 = new TimeInfo(packet2, returnTime + 1); - Assert.assertNotEquals(info, info2); + assertNotEquals(info, info2); // 2. different message / same time packet2.setStratum(3); packet2.setRootDelay(25); final TimeInfo info3 = new TimeInfo(packet2, returnTime); - Assert.assertNotEquals(info, info3); + assertNotEquals(info, info3); // 3. different class Object other = this; - Assert.assertNotEquals(info, other); + assertNotEquals(info, other); // 4. null comparison other = null; - Assert.assertNotEquals(info, other); + assertNotEquals(info, other); } @Test @@ -126,13 +131,13 @@ public void testZeroTime() { final NtpV3Packet packet = new NtpV3Impl(); final TimeInfo info = new TimeInfo(packet, 0); info.computeDetails(); - Assert.assertNull(info.getDelay()); - Assert.assertNull(info.getOffset()); - Assert.assertEquals(0L, info.getReturnTime()); + assertNull(info.getDelay()); + assertNull(info.getOffset()); + assertEquals(0L, info.getReturnTime()); // comments: Error: zero orig time -- cannot compute delay/offset final List comments = info.getComments(); - Assert.assertEquals(1, comments.size()); - Assert.assertTrue(comments.get(0).contains("zero orig time")); + assertEquals(1, comments.size()); + assertTrue(comments.get(0).contains("zero orig time")); } } diff --git a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java index 0cec31427..094b12e3b 100644 --- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java +++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.net.smtp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -28,8 +28,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SimpleSMTPHeaderTestCase { @@ -72,7 +72,7 @@ private String checkDate(final String msg) { return null; } - @Before + @BeforeEach public void setUp() { beforeDate = new Date(); header = new SimpleSMTPHeader("from@here.invalid", "to@there.invalid", "Test email"); diff --git a/src/test/java/org/apache/commons/net/util/Base64Test.java b/src/test/java/org/apache/commons/net/util/Base64Test.java index 576fe00f5..21dca02cd 100644 --- a/src/test/java/org/apache/commons/net/util/Base64Test.java +++ b/src/test/java/org/apache/commons/net/util/Base64Test.java @@ -17,19 +17,19 @@ package org.apache.commons.net.util; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.nio.charset.StandardCharsets; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class Base64Test { @@ -108,7 +108,7 @@ public void testDecodeByteArrayNull() { } @Test - @Ignore + @Disabled public void testDecodeInteger() { fail("Not yet implemented"); } @@ -120,7 +120,7 @@ public void testDecodeNullString() { } @Test - @Ignore + @Disabled public void testDecodeObject() { fail("Not yet implemented"); } @@ -139,13 +139,13 @@ public void testEncodeBase64ByteArray() { } @Test - @Ignore + @Disabled public void testEncodeBase64ByteArrayBoolean() { fail("Not yet implemented"); } @Test - @Ignore + @Disabled public void testEncodeBase64ByteArrayBooleanBoolean() { fail("Not yet implemented"); } @@ -201,31 +201,31 @@ public void testEncodeBase64StringUnChunked() { } @Test - @Ignore + @Disabled public void testEncodeBase64URLSafe() { fail("Not yet implemented"); } @Test - @Ignore + @Disabled public void testEncodeBase64URLSafeString() { fail("Not yet implemented"); } @Test - @Ignore + @Disabled public void testEncodeByteArray() { fail("Not yet implemented"); } @Test - @Ignore + @Disabled public void testEncodeInteger() { fail("Not yet implemented"); } @Test - @Ignore + @Disabled public void testEncodeObject() { fail("Not yet implemented"); } @@ -250,7 +250,7 @@ public void testIsBase64() { } @Test - @Ignore + @Disabled public void testToIntegerBytes() { fail("Not yet implemented"); } diff --git a/src/test/java/org/apache/commons/net/util/UtilTest.java b/src/test/java/org/apache/commons/net/util/UtilTest.java index 8b09f90d9..889ebc4c4 100644 --- a/src/test/java/org/apache/commons/net/util/UtilTest.java +++ b/src/test/java/org/apache/commons/net/util/UtilTest.java @@ -17,6 +17,8 @@ package org.apache.commons.net.util; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.CharArrayReader; @@ -31,8 +33,7 @@ import org.apache.commons.net.io.CopyStreamEvent; import org.apache.commons.net.io.CopyStreamListener; import org.apache.commons.net.io.Util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UtilTest { @@ -54,9 +55,9 @@ public void bytesTransferred(final CopyStreamEvent event) { @Override public void bytesTransferred(final long totalBytesTransferred, final int bytesTransferred, final long streamSize) { - Assert.assertEquals("Wrong total", expectedTotal, totalBytesTransferred); - Assert.assertEquals("Wrong streamSize", expectedSize, streamSize); - Assert.assertEquals("Wrong bytes", expectedBytes, bytesTransferred); + assertEquals(expectedTotal, totalBytesTransferred, "Wrong total"); + assertEquals(expectedSize, streamSize, "Wrong streamSize"); + assertEquals(expectedBytes, bytesTransferred, "Wrong bytes"); } } @@ -80,14 +81,14 @@ public void bytesTransferred(final CopyStreamEvent event) { @Override public void bytesTransferred(final long totalBytesTransferred, final int bytesTransferred, final long streamSize) { - Assert.assertEquals("Wrong bytes", expectedBytes, bytesTransferred); + assertEquals(expectedBytes, bytesTransferred, "Wrong bytes"); this.totalBytesTransferredTotal = totalBytesTransferred; this.bytesTransferredTotal += bytesTransferred; } void checkExpected() { - Assert.assertEquals("Wrong totalBytesTransferred total", expectedTotal, totalBytesTransferredTotal); - Assert.assertEquals("Total should equal sum of parts", totalBytesTransferredTotal, bytesTransferredTotal); + assertEquals(expectedTotal, totalBytesTransferredTotal, "Wrong totalBytesTransferred total"); + assertEquals(totalBytesTransferredTotal, bytesTransferredTotal, "Total should equal sum of parts"); } }