From 94d46269db004f17afe8c7a454dbf4aca61ebb76 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 1 Sep 2024 19:03:12 -0400 Subject: [PATCH] Use Assertions.assertInstanceOf() --- .../DefaultFTPFileEntryParserFactoryTest.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java b/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java index 8908f62cd..591ed4154 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java @@ -16,6 +16,7 @@ */ package org.apache.commons.net.ftp.parser; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import junit.framework.TestCase; @@ -35,26 +36,26 @@ public void testDefaultParserFactory() { final DefaultFTPFileEntryParserFactory factory = new DefaultFTPFileEntryParserFactory(); FTPFileEntryParser parser = factory.createFileEntryParser("unix"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); parser = factory.createFileEntryParser("UNIX"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); assertFalse(((UnixFTPEntryParser) parser).trimLeadingSpaces); parser = factory.createFileEntryParser("UNIX_LTRIM"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); assertTrue(((UnixFTPEntryParser) parser).trimLeadingSpaces); parser = factory.createFileEntryParser("Unix"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); parser = factory.createFileEntryParser("EnterpriseUnix"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); assertFalse(parser instanceof EnterpriseUnixFTPEntryParser); // works because contains the expression "Unix" parser = factory.createFileEntryParser("UnixFTPEntryParser"); - assertTrue(parser instanceof UnixFTPEntryParser); + assertInstanceOf(UnixFTPEntryParser.class, parser); try { parser = factory.createFileEntryParser("NT"); @@ -65,19 +66,19 @@ public void testDefaultParserFactory() { } parser = factory.createFileEntryParser("WindowsNT"); - assertTrue(parser instanceof CompositeFileEntryParser); + assertInstanceOf(CompositeFileEntryParser.class, parser); parser = factory.createFileEntryParser("ThigaVMSaMaJig"); - assertTrue(parser instanceof VMSFTPEntryParser); + assertInstanceOf(VMSFTPEntryParser.class, parser); parser = factory.createFileEntryParser("OS/2"); - assertTrue(parser instanceof OS2FTPEntryParser); + assertInstanceOf(OS2FTPEntryParser.class, parser); parser = factory.createFileEntryParser("OS/400"); - assertTrue(parser instanceof CompositeFileEntryParser); + assertInstanceOf(CompositeFileEntryParser.class, parser); parser = factory.createFileEntryParser("AS/400"); - assertTrue(parser instanceof CompositeFileEntryParser); + assertInstanceOf(CompositeFileEntryParser.class, parser); // Added test to make sure it handles the UNIX systems that were // compiled with OS as "UNKNOWN". This test validates that the @@ -92,7 +93,7 @@ public void testDefaultParserFactory() { } parser = factory.createFileEntryParser("org.apache.commons.net.ftp.parser.OS2FTPEntryParser"); - assertTrue(parser instanceof OS2FTPEntryParser); + assertInstanceOf(OS2FTPEntryParser.class, parser); try { factory.createFileEntryParser("org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory");