This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 713c302d Replace assert by simpler but equivalent calls.
new 1590b727 Merge pull request #87 from
arturobernalg/feature/simplify_assert
713c302d is described below
commit 713c302dfab749f55cb034fe5b70a3883a04dacb
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Aug 29 13:18:37 2021 +0200
Replace assert by simpler but equivalent calls.
---
.../commons/net/ftp/ListingFunctionalTest.java | 4 ++-
.../parser/EnterpriseUnixFTPEntryParserTest.java | 36 +++++++++----------
.../ftp/parser/MacOsPeterFTPEntryParserTest.java | 4 +--
.../net/ftp/parser/UnixFTPEntryParserTest.java | 4 +--
.../net/ftp/parser/VMSFTPEntryParserTest.java | 42 +++++++++++-----------
.../org/apache/commons/net/ntp/TestNtpPacket.java | 4 +--
.../org/apache/commons/net/ntp/TestTimeInfo.java | 8 ++---
.../org/apache/commons/net/ntp/TimeStampTest.java | 4 +--
.../commons/net/telnet/EchoOptionHandlerTest.java | 6 ++--
.../net/telnet/SimpleOptionHandlerTest.java | 6 ++--
.../net/telnet/SuppressGAOptionHandlerTest.java | 6 ++--
.../commons/net/telnet/TelnetClientTest.java | 34 +++++++++---------
.../telnet/TelnetOptionHandlerTestAbstract.java | 24 ++++++-------
.../commons/net/telnet/TelnetOptionTest.java | 2 +-
.../net/telnet/TerminalTypeOptionHandlerTest.java | 4 +--
.../commons/net/tftp/TFTPServerPathTest.java | 4 +--
.../java/org/apache/commons/net/tftp/TFTPTest.java | 4 +--
.../org/apache/commons/net/util/Base64Test.java | 8 ++---
18 files changed, 102 insertions(+), 102 deletions(-)
diff --git
a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
index 6e93a19c..618155c1 100644
--- a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
@@ -25,6 +25,8 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import static org.junit.Assert.assertArrayEquals;
+
/**
* A functional test suite for checking that site listings work.
*/
@@ -280,7 +282,7 @@ public class ListingFunctionalTest extends TestCase
assertNotNull(files);
// This may well fail, e.g. window parser for VMS listing
- assertTrue("Expected empty array: "+Arrays.toString(files),
Arrays.equals(new FTPFile[]{}, files));
+ assertArrayEquals("Expected empty array: " + Arrays.toString(files),
new FTPFile[]{}, files);
}
/*
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
index 5ee60b9b..f60fb1d4 100644
---
a/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
@@ -86,32 +86,32 @@ public class EnterpriseUnixFTPEntryParserTest extends
FTPParseTestFramework
*/
private void checkPermisions(final FTPFile dir)
{
- assertTrue("Owner should not have read permission.",
- !dir.hasPermission(FTPFile.USER_ACCESS,
+ assertFalse("Owner should not have read permission.",
+ dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.READ_PERMISSION));
- assertTrue("Owner should not have write permission.",
- !dir.hasPermission(FTPFile.USER_ACCESS,
+ assertFalse("Owner should not have write permission.",
+ dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.WRITE_PERMISSION));
- assertTrue("Owner should not have execute permission.",
- !dir.hasPermission(FTPFile.USER_ACCESS,
+ assertFalse("Owner should not have execute permission.",
+ dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.EXECUTE_PERMISSION));
- assertTrue("Group should not have read permission.",
- !dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertFalse("Group should not have read permission.",
+ dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.READ_PERMISSION));
- assertTrue("Group should not have write permission.",
- !dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertFalse("Group should not have write permission.",
+ dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.WRITE_PERMISSION));
- assertTrue("Group should not have execute permission.",
- !dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertFalse("Group should not have execute permission.",
+ dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.EXECUTE_PERMISSION));
- assertTrue("World should not have read permission.",
- !dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertFalse("World should not have read permission.",
+ dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.READ_PERMISSION));
- assertTrue("World should not have write permission.",
- !dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertFalse("World should not have write permission.",
+ dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.WRITE_PERMISSION));
- assertTrue("World should not have execute permission.",
- !dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertFalse("World should not have execute permission.",
+ dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.EXECUTE_PERMISSION));
}
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
index ed9b8a1c..90f6f48c 100644
---
a/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java
@@ -60,13 +60,13 @@ public class MacOsPeterFTPEntryParserTest extends
FTPParseTestFramework {
FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION));
assertTrue("Should have group read permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION));
- assertTrue("Should NOT have group write permission.", !f.hasPermission(
+ assertFalse("Should NOT have group write permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION));
assertTrue("Should have group execute permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION));
assertTrue("Should have world read permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION));
- assertTrue("Should NOT have world write permission.", !f.hasPermission(
+ assertFalse("Should NOT have world write permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION));
assertTrue("Should have world execute permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION));
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
index d148d986..9e0dc634 100644
---
a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
@@ -95,13 +95,13 @@ public class UnixFTPEntryParserTest extends
FTPParseTestFramework {
FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION));
assertTrue("Should have group read permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION));
- assertTrue("Should NOT have group write permission.", !f.hasPermission(
+ assertFalse("Should NOT have group write permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION));
assertTrue("Should have group execute permission.", f.hasPermission(
FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION));
assertTrue("Should have world read permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION));
- assertTrue("Should NOT have world write permission.", !f.hasPermission(
+ assertFalse("Should NOT have world write permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION));
assertTrue("Should have world execute permission.", f.hasPermission(
FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION));
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
index 8c2950c0..c8f8d397 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
@@ -110,40 +110,40 @@ public class VMSFTPEntryParserTest extends
FTPParseTestFramework
private void checkPermisions(final FTPFile dir, final int octalPerm)
{
int permMask = 1<<8;
- assertTrue("Owner should not have read permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.USER_ACCESS,
+ assertEquals("Owner should not have read permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.READ_PERMISSION));
permMask >>= 1;
- assertTrue("Owner should not have write permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.USER_ACCESS,
+ assertEquals("Owner should not have write permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.WRITE_PERMISSION));
permMask >>= 1;
- assertTrue("Owner should not have execute permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.USER_ACCESS,
+ assertEquals("Owner should not have execute permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.USER_ACCESS,
FTPFile.EXECUTE_PERMISSION));
permMask >>= 1;
- assertTrue("Group should not have read permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertEquals("Group should not have read permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.READ_PERMISSION));
permMask >>= 1;
- assertTrue("Group should not have write permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertEquals("Group should not have write permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.WRITE_PERMISSION));
permMask >>= 1;
- assertTrue("Group should not have execute permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.GROUP_ACCESS,
+ assertEquals("Group should not have execute permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.GROUP_ACCESS,
FTPFile.EXECUTE_PERMISSION));
permMask >>= 1;
- assertTrue("World should not have read permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertEquals("World should not have read permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.READ_PERMISSION));
permMask >>= 1;
- assertTrue("World should not have write permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertEquals("World should not have write permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.WRITE_PERMISSION));
permMask >>= 1;
- assertTrue("World should not have execute permission.",
- (permMask & octalPerm) != 0 ==
dir.hasPermission(FTPFile.WORLD_ACCESS,
+ assertEquals("World should not have execute permission.",
+ (permMask & octalPerm) != 0,
dir.hasPermission(FTPFile.WORLD_ACCESS,
FTPFile.EXECUTE_PERMISSION));
}
@Override
@@ -214,8 +214,7 @@ public class VMSFTPEntryParserTest extends
FTPParseTestFramework
dir.getSize());
assertEquals("Tue Jun 02 07:32:04 1998",
df.format(dir.getTimestamp().getTime()));
- assertEquals(null,
- dir.getGroup());
+ assertNull(dir.getGroup());
assertEquals("TRANSLATED",
dir.getUser());
checkPermisions(dir, 0705);
@@ -250,8 +249,7 @@ public class VMSFTPEntryParserTest extends
FTPParseTestFramework
file.getSize());
assertEquals("Tue Jun 02 07:32:04 1998",
df.format(file.getTimestamp().getTime()));
- assertEquals(null,
- file.getGroup());
+ assertNull(file.getGroup());
assertEquals("TRANSLATED",
file.getUser());
checkPermisions(file, 0400);
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 9a617916..9fc2bf42 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
@@ -188,10 +188,10 @@ public class TestNtpPacket {
// now change the packet to force equals() => false
message2.setMode(2);
Assert.assertTrue(message1.getMode() != message2.getMode());
- Assert.assertFalse(message1.equals(message2));
+ Assert.assertNotEquals(message1, message2);
final NtpV3Packet message3 = null;
- Assert.assertFalse(message1.equals(message3));
+ Assert.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 30b8713b..9a075fbc 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
@@ -102,21 +102,21 @@ public class TestTimeInfo {
final NtpV3Packet packet2 = new NtpV3Impl();
Assert.assertEquals(packet, packet2);
final TimeInfo info2 = new TimeInfo(packet2, returnTime + 1);
- Assert.assertFalse(info.equals(info2));
+ Assert.assertNotEquals(info, info2);
// 2. different message / same time
packet2.setStratum(3);
packet2.setRootDelay(25);
final TimeInfo info3 = new TimeInfo(packet2, returnTime);
- Assert.assertFalse(info.equals(info3));
+ Assert.assertNotEquals(info, info3);
// 3. different class
Object other = this;
- Assert.assertFalse(info.equals(other));
+ Assert.assertNotEquals(info, other);
// 4. null comparison
other = null;
- Assert.assertFalse(info.equals(other));
+ Assert.assertNotEquals(info, other);
}
@Test
diff --git a/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
b/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
index 4ee6b28b..07dd4f9a 100644
--- a/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
+++ b/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
@@ -47,7 +47,7 @@ public class TimeStampTest extends TestCase {
// timestamps in ts1 (TIME1) and ts3 (TIME2) are only off by the
smallest
// fraction of a second (~200 picoseconds) so the times are not equal
but
// when converted to Java dates (in milliseconds) they will be equal.
- assertTrue("ts1 != ts3", !ts1.equals(ts3));
+ assertFalse("ts1 != ts3", ts1.equals(ts3));
assertEquals("compareTo(1,3)", -1, ts1.compareTo(ts3));
assertEquals("seconds", ts1.getSeconds(), ts3.getSeconds());
assertTrue("fraction", ts1.getFraction() != ts3.getFraction());
@@ -57,7 +57,7 @@ public class TimeStampTest extends TestCase {
final long time3 = ts3.getTime();
assertEquals("equals(time1,3)", time1, time3); // ntpTime1 != ntpTime3
but JavaTime(t1) == JavaTime(t3)...
- assertTrue("ts3 != ts4", !ts3.equals(ts4));
+ assertFalse("ts3 != ts4", ts3.equals(ts4));
assertTrue("time3 != ts4.time", time3 != ts4.getTime());
}
diff --git
a/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
b/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
index af1cd748..6d4ac053 100644
--- a/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
@@ -48,7 +48,7 @@ public class EchoOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.answerSubnegotiation(subn, subn.length);
- assertEquals(resp1, null);
+ assertNull(resp1);
}
/**
@@ -71,7 +71,7 @@ public class EchoOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.startSubnegotiationLocal();
final int resp2[] = opthand1.startSubnegotiationRemote();
- assertEquals(resp1, null);
- assertEquals(resp2, null);
+ assertNull(resp1);
+ assertNull(resp2);
}
}
diff --git
a/src/test/java/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
b/src/test/java/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
index 8ee3f79f..848afaa4 100644
--- a/src/test/java/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
@@ -47,7 +47,7 @@ public class SimpleOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.answerSubnegotiation(subn, subn.length);
- assertEquals(resp1, null);
+ assertNull(resp1);
}
/**
@@ -73,7 +73,7 @@ public class SimpleOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.startSubnegotiationLocal();
final int resp2[] = opthand1.startSubnegotiationRemote();
- assertEquals(resp1, null);
- assertEquals(resp2, null);
+ assertNull(resp1);
+ assertNull(resp2);
}
}
diff --git
a/src/test/java/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
b/src/test/java/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
index 89aa0746..fb806eef 100644
---
a/src/test/java/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
+++
b/src/test/java/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
@@ -48,7 +48,7 @@ public class SuppressGAOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.answerSubnegotiation(subn, subn.length);
- assertEquals(resp1, null);
+ assertNull(resp1);
}
/**
@@ -72,7 +72,7 @@ public class SuppressGAOptionHandlerTest extends
TelnetOptionHandlerTestAbstract
final int resp1[] = opthand1.startSubnegotiationLocal();
final int resp2[] = opthand1.startSubnegotiationRemote();
- assertEquals(resp1, null);
- assertEquals(resp2, null);
+ assertNull(resp1);
+ assertNull(resp2);
}
}
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
index b42d5141..0bde36c5 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -352,8 +352,8 @@ extends TestCase implements TelnetNotificationHandler
assertTrue(remove_invalid_ok1);
assertTrue(remove_invalid_ok2);
assertTrue(OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
-
assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
-
assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
+
assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
+
assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
}
@@ -428,12 +428,12 @@ extends TestCase implements TelnetNotificationHandler
assertTrue(connect1_ok);
assertTrue(connect2_ok);
assertTrue(connect3_ok);
- assertTrue(!STANDARD.client.getLocalOptionState(TelnetOption.ECHO));
- assertTrue(!STANDARD.client.getRemoteOptionState(TelnetOption.ECHO));
- assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
- assertTrue(!OPTIONS.client.getRemoteOptionState(TelnetOption.ECHO));
-
assertTrue(!ANSI.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
-
assertTrue(!ANSI.client.getRemoteOptionState(TelnetOption.TERMINAL_TYPE));
+ assertFalse(STANDARD.client.getLocalOptionState(TelnetOption.ECHO));
+ assertFalse(STANDARD.client.getRemoteOptionState(TelnetOption.ECHO));
+ assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
+ assertFalse(OPTIONS.client.getRemoteOptionState(TelnetOption.ECHO));
+
assertFalse(ANSI.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
+
assertFalse(ANSI.client.getRemoteOptionState(TelnetOption.TERMINAL_TYPE));
assertTrue(init2_ok);
assertTrue(add_invalid_ok1);
assertTrue(add_invalid_ok2);
@@ -730,16 +730,16 @@ extends TestCase implements TelnetNotificationHandler
assertTrue(negotiation1_ok);
assertTrue(negotiation2_ok);
assertTrue(negotiation3_ok);
- assertTrue(!STANDARD.client.getLocalOptionState(15));
- assertTrue(!STANDARD.client.getRemoteOptionState(15));
-
assertTrue(!STANDARD.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
- assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
- assertTrue(!OPTIONS.client.getRemoteOptionState(TelnetOption.ECHO));
+ assertFalse(STANDARD.client.getLocalOptionState(15));
+ assertFalse(STANDARD.client.getRemoteOptionState(15));
+
assertFalse(STANDARD.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
+ assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
+ assertFalse(OPTIONS.client.getRemoteOptionState(TelnetOption.ECHO));
assertTrue(OPTIONS.client.getLocalOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
-
assertTrue(!OPTIONS.client.getRemoteOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
+
assertFalse(OPTIONS.client.getRemoteOptionState(TelnetOption.SUPPRESS_GO_AHEAD));
assertTrue(OPTIONS.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
assertTrue(ANSI.client.getLocalOptionState(TelnetOption.TERMINAL_TYPE));
- assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
+ assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
}
/*
@@ -812,7 +812,7 @@ extends TestCase implements TelnetNotificationHandler
}
assertTrue(negotiation1_ok);
- assertTrue(!OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
+ assertFalse(OPTIONS.client.getLocalOptionState(TelnetOption.ECHO));
}
@@ -895,7 +895,7 @@ extends TestCase implements TelnetNotificationHandler
//}
}
- assertTrue(!NOREAD.client.getReaderThread());
+ assertFalse(NOREAD.client.getReaderThread());
assertTrue(STANDARD.client.getReaderThread());
assertTrue("Expected read_ok to be true, got " + read_ok, read_ok);
assertTrue("Expected negotiation1_ok to be true, got " +
negotiation1_ok, negotiation1_ok);
diff --git
a/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
b/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
index 3d4470dd..acf8622c 100644
---
a/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
+++
b/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
@@ -56,20 +56,20 @@ public abstract class TelnetOptionHandlerTestAbstract
extends TestCase
public void testConstructors()
{
// add test of the option code
- assertTrue(!opthand1.getInitLocal());
- assertTrue(!opthand1.getInitRemote());
- assertTrue(!opthand1.getAcceptLocal());
- assertTrue(!opthand1.getAcceptRemote());
+ assertFalse(opthand1.getInitLocal());
+ assertFalse(opthand1.getInitRemote());
+ assertFalse(opthand1.getAcceptLocal());
+ assertFalse(opthand1.getAcceptRemote());
assertTrue(opthand2.getInitLocal());
assertTrue(opthand2.getInitRemote());
assertTrue(opthand2.getAcceptLocal());
assertTrue(opthand2.getAcceptRemote());
- assertTrue(!opthand3.getInitLocal());
- assertTrue(!opthand3.getInitRemote());
- assertTrue(!opthand3.getAcceptLocal());
- assertTrue(!opthand3.getAcceptRemote());
+ assertFalse(opthand3.getInitLocal());
+ assertFalse(opthand3.getInitRemote());
+ assertFalse(opthand3.getAcceptLocal());
+ assertFalse(opthand3.getAcceptRemote());
}
/**
@@ -80,9 +80,9 @@ public abstract class TelnetOptionHandlerTestAbstract extends
TestCase
opthand2.setDo(true);
opthand3.setDo(false);
- assertTrue(!opthand1.getDo());
+ assertFalse(opthand1.getDo());
assertTrue(opthand2.getDo());
- assertTrue(!opthand3.getDo());
+ assertFalse(opthand3.getDo());
}
/**
@@ -99,8 +99,8 @@ public abstract class TelnetOptionHandlerTestAbstract extends
TestCase
opthand2.setWill(true);
opthand3.setWill(false);
- assertTrue(!opthand1.getWill());
+ assertFalse(opthand1.getWill());
assertTrue(opthand2.getWill());
- assertTrue(!opthand3.getWill());
+ assertFalse(opthand3.getWill());
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetOptionTest.java
b/src/test/java/org/apache/commons/net/telnet/TelnetOptionTest.java
index 2c4194e1..04dbdce7 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetOptionTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetOptionTest.java
@@ -41,6 +41,6 @@ public class TelnetOptionTest extends TestCase
assertTrue(TelnetOption.isValidOption(0));
assertTrue(TelnetOption.isValidOption(91));
assertTrue(TelnetOption.isValidOption(255));
- assertTrue(!TelnetOption.isValidOption(256));
+ assertFalse(TelnetOption.isValidOption(256));
}
}
\ No newline at end of file
diff --git
a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
index 0cb91d34..efa5f6c3 100644
---
a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
+++
b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
@@ -94,7 +94,7 @@ public class TerminalTypeOptionHandlerTest extends
TelnetOptionHandlerTestAbstra
final int resp1[] = opthand1.startSubnegotiationLocal();
final int resp2[] = opthand1.startSubnegotiationRemote();
- assertEquals(resp1, null);
- assertEquals(resp2, null);
+ assertNull(resp1);
+ assertNull(resp2);
}
}
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
index 464f56d8..6272f920 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
@@ -55,7 +55,7 @@ public class TFTPServerPathTest extends TestCase
// cleanup old failed runs
out.delete();
- assertTrue("Couldn't clear output location", !out.exists());
+ assertFalse("Couldn't clear output location", out.exists());
try (final FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output,
"localhost", SERVER_PORT);
@@ -94,7 +94,7 @@ public class TFTPServerPathTest extends TestCase
// cleanup old failed runs
out.delete();
- assertTrue("Couldn't clear output location", !out.exists());
+ assertFalse("Couldn't clear output location", out.exists());
try (final FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output,
"localhost", SERVER_PORT);
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
index 6443ffb5..b41200af 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -165,7 +165,7 @@ public class TFTPTest extends TestCase
// cleanup old failed runs
out.delete();
- assertTrue("Couldn't clear output location", !out.exists());
+ assertFalse("Couldn't clear output location", out.exists());
try (final FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), mode, output, "localhost",
SERVER_PORT);
@@ -223,7 +223,7 @@ public class TFTPTest extends TestCase
final File in = new File(serverDirectory, filePrefix + "upload");
// cleanup old failed runs
in.delete();
- assertTrue("Couldn't clear output location", !in.exists());
+ assertFalse("Couldn't clear output location", in.exists());
try (final FileInputStream fis = new FileInputStream(file)) {
tftp.sendFile(in.getName(), mode, fis, "localhost", SERVER_PORT);
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 bb39dfd6..01e87b75 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -18,13 +18,13 @@
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.assertTrue;
import static org.junit.Assert.fail;
-import java.util.Arrays;
import org.junit.Ignore;
import org.junit.Test;
@@ -41,7 +41,7 @@ public class Base64Test {
public void testBase64Boolean() {
final Base64 b64 = new Base64(true);
assertTrue(b64.isUrlSafe());
- assertTrue(Arrays.equals(new byte[]{'\r','\n'},
b64.getLineSeparator()));
+ assertArrayEquals(new byte[]{'\r', '\n'}, b64.getLineSeparator());
}
@Test
@@ -59,7 +59,7 @@ public class Base64Test {
final Base64 b64;
b64 = new Base64(8, new byte[]{});
assertFalse(b64.isUrlSafe());
- assertTrue(Arrays.equals(new byte[]{}, b64.getLineSeparator()));
+ assertArrayEquals(new byte[]{}, b64.getLineSeparator());
}
@Test
@@ -104,7 +104,7 @@ public class Base64Test {
@Test
public void testEncodeBase64ByteArray() {
final byte[] binaryData=null;
- assertTrue(Arrays.equals(binaryData, Base64.encodeBase64(binaryData)));
+ assertArrayEquals(binaryData, Base64.encodeBase64(binaryData));
}
@Test @Ignore
