This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 46c51e0ea8d296da79075acb7df45924e70f7a82
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue May 28 17:53:33 2024 -0400
Sort members
---
src/main/java/org/apache/commons/net/util/Base64.java | 16 ++++++++--------
.../apache/commons/net/daytime/DaytimeUDPClientTest.java | 12 ++++++------
.../org/apache/commons/net/tftp/TFTPAckPacketTest.java | 8 ++++----
.../org/apache/commons/net/tftp/TFTPDataPacketTest.java | 8 ++++----
.../org/apache/commons/net/tftp/TFTPErrorPacketTest.java | 8 ++++----
src/test/java/org/apache/commons/net/tftp/TFTPTest.java | 14 +++++++-------
.../java/org/apache/commons/net/util/CharsetsTest.java | 10 +++++-----
.../org/apache/commons/net/whois/WhoisClientTest.java | 10 +++++-----
8 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/util/Base64.java
b/src/main/java/org/apache/commons/net/util/Base64.java
index 0d76809c..9880ac0e 100644
--- a/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/src/main/java/org/apache/commons/net/util/Base64.java
@@ -137,6 +137,14 @@ public class Base64 {
return new BigInteger(1, decodeBase64(source));
}
+ private static byte[] encode(final byte[] binaryData, final int
lineLength, final byte[] lineSeparator, final boolean urlSafe) {
+ if (isEmpty(binaryData)) {
+ return binaryData;
+ }
+ return lineLength > 0 ? encodeBase64Chunked(binaryData, lineLength,
lineSeparator)
+ : urlSafe ? encodeBase64URLSafe(binaryData) :
encodeBase64(binaryData);
+ }
+
/**
* Encodes binary data using the base64 algorithm but does not chunk the
output.
*
@@ -196,14 +204,6 @@ public class Base64 {
return chunked ? encodeBase64Chunked(binaryData) : urlSafe ?
encodeBase64URLSafe(binaryData) : encodeBase64(binaryData);
}
- private static byte[] encode(final byte[] binaryData, final int
lineLength, final byte[] lineSeparator, final boolean urlSafe) {
- if (isEmpty(binaryData)) {
- return binaryData;
- }
- return lineLength > 0 ? encodeBase64Chunked(binaryData, lineLength,
lineSeparator)
- : urlSafe ? encodeBase64URLSafe(binaryData) :
encodeBase64(binaryData);
- }
-
/**
* Encodes binary data using the base64 algorithm and chunks the encoded
output into 76 character blocks separated by CR-LF.
* <p>
diff --git
a/src/test/java/org/apache/commons/net/daytime/DaytimeUDPClientTest.java
b/src/test/java/org/apache/commons/net/daytime/DaytimeUDPClientTest.java
index 8cfaa9f0..ba4e06a6 100644
--- a/src/test/java/org/apache/commons/net/daytime/DaytimeUDPClientTest.java
+++ b/src/test/java/org/apache/commons/net/daytime/DaytimeUDPClientTest.java
@@ -29,12 +29,6 @@ import org.junit.jupiter.api.Test;
*/
public class DaytimeUDPClientTest {
- @SuppressWarnings("resource")
- @Test
- public void testConstructor() {
- assertDoesNotThrow(DaytimeUDPClient::new);
- }
-
@Test
public void testClose() {
try (DaytimeUDPClient client = new DaytimeUDPClient()) {
@@ -42,6 +36,12 @@ public class DaytimeUDPClientTest {
}
}
+ @SuppressWarnings("resource")
+ @Test
+ public void testConstructor() {
+ assertDoesNotThrow(DaytimeUDPClient::new);
+ }
+
@Test
public void testGetTime() {
try (DaytimeUDPClient client = new DaytimeUDPClient()) {
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPAckPacketTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPAckPacketTest.java
index 64267b2a..b728a3fe 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPAckPacketTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPAckPacketTest.java
@@ -30,12 +30,12 @@ import org.junit.jupiter.api.Test;
public class TFTPAckPacketTest {
@Test
- public void testToString() throws UnknownHostException {
- assertNotNull(new TFTPAckPacket(InetAddress.getLocalHost(), 0,
0).toString());
+ public void testNewDatagram() throws UnknownHostException {
+ assertNotNull(new TFTPAckPacket(InetAddress.getLocalHost(), 0,
0).newDatagram());
}
@Test
- public void testNewDatagram() throws UnknownHostException {
- assertNotNull(new TFTPAckPacket(InetAddress.getLocalHost(), 0,
0).newDatagram());
+ public void testToString() throws UnknownHostException {
+ assertNotNull(new TFTPAckPacket(InetAddress.getLocalHost(), 0,
0).toString());
}
}
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPDataPacketTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPDataPacketTest.java
index 8ec62fa5..4438c370 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPDataPacketTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPDataPacketTest.java
@@ -30,12 +30,12 @@ import org.junit.jupiter.api.Test;
public class TFTPDataPacketTest {
@Test
- public void testToString() throws UnknownHostException {
- assertNotNull(new TFTPDataPacket(InetAddress.getLocalHost(), 0, 0, new
byte[0]).toString());
+ public void testNewDatagram() throws UnknownHostException {
+ assertNotNull(new TFTPDataPacket(InetAddress.getLocalHost(), 0, 0, new
byte[0]).newDatagram());
}
@Test
- public void testNewDatagram() throws UnknownHostException {
- assertNotNull(new TFTPDataPacket(InetAddress.getLocalHost(), 0, 0, new
byte[0]).newDatagram());
+ public void testToString() throws UnknownHostException {
+ assertNotNull(new TFTPDataPacket(InetAddress.getLocalHost(), 0, 0, new
byte[0]).toString());
}
}
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPErrorPacketTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPErrorPacketTest.java
index de604d16..50b59f65 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPErrorPacketTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPErrorPacketTest.java
@@ -30,12 +30,12 @@ import org.junit.jupiter.api.Test;
public class TFTPErrorPacketTest {
@Test
- public void testToString() throws UnknownHostException {
- assertNotNull(new TFTPErrorPacket(InetAddress.getLocalHost(), 0, 0,
"").toString());
+ public void testNewDatagram() throws UnknownHostException {
+ assertNotNull(new TFTPErrorPacket(InetAddress.getLocalHost(), 0, 0,
"").newDatagram());
}
@Test
- public void testNewDatagram() throws UnknownHostException {
- assertNotNull(new TFTPErrorPacket(InetAddress.getLocalHost(), 0, 0,
"").newDatagram());
+ public void testToString() throws UnknownHostException {
+ assertNotNull(new TFTPErrorPacket(InetAddress.getLocalHost(), 0, 0,
"").toString());
}
}
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 d9826775..d734670e 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -122,13 +122,6 @@ public class TFTPTest extends TestCase {
}
}
- public void testSend() throws IOException {
- try (TFTP tftp = new TFTP()) {
- tftp.open();
- tftp.send(new TFTPDataPacket(InetAddress.getLocalHost(),
tftp.getLocalPort(), 0, new byte[10]));
- }
- }
-
private void testDownload(final int mode, final File file) throws
IOException {
// Create our TFTP instance to handle the file transfer.
try (TFTPClient tftp = new TFTPClient()) {
@@ -171,6 +164,13 @@ public class TFTPTest extends TestCase {
}
}
+ public void testSend() throws IOException {
+ try (TFTP tftp = new TFTP()) {
+ tftp.open();
+ tftp.send(new TFTPDataPacket(InetAddress.getLocalHost(),
tftp.getLocalPort(), 0, new byte[10]));
+ }
+ }
+
public void testTFTPBinaryDownloads() throws Exception {
// test with the smaller FILES
for (int i = 0; i < 6; i++) {
diff --git a/src/test/java/org/apache/commons/net/util/CharsetsTest.java
b/src/test/java/org/apache/commons/net/util/CharsetsTest.java
index 3f9b9df9..431c0b98 100644
--- a/src/test/java/org/apache/commons/net/util/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/net/util/CharsetsTest.java
@@ -34,14 +34,14 @@ public class CharsetsTest {
assertEquals(StandardCharsets.UTF_8,
Charsets.toCharset(StandardCharsets.UTF_8.name()));
}
- @SuppressWarnings("deprecation")
@Test
- public void testToConstructor() {
- assertDoesNotThrow(Charsets::new);
+ public void testToCharsetDefault() {
+ assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(null,
StandardCharsets.UTF_8.name()));
}
+ @SuppressWarnings("deprecation")
@Test
- public void testToCharsetDefault() {
- assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(null,
StandardCharsets.UTF_8.name()));
+ public void testToConstructor() {
+ assertDoesNotThrow(Charsets::new);
}
}
diff --git a/src/test/java/org/apache/commons/net/whois/WhoisClientTest.java
b/src/test/java/org/apache/commons/net/whois/WhoisClientTest.java
index 1339e767..7aab2743 100644
--- a/src/test/java/org/apache/commons/net/whois/WhoisClientTest.java
+++ b/src/test/java/org/apache/commons/net/whois/WhoisClientTest.java
@@ -29,6 +29,11 @@ import org.junit.jupiter.api.Test;
*/
public class WhoisClientTest {
+ @Test
+ public void testConstructor() {
+ assertDoesNotThrow(WhoisClient::new);
+ }
+
@Test
public void testDefaultPort() {
assertEquals(WhoisClient.DEFAULT_PORT, new
WhoisClient().getDefaultPort());
@@ -39,9 +44,4 @@ public class WhoisClientTest {
new WhoisClient().disconnect();
}
- @Test
- public void testConstructor() {
- assertDoesNotThrow(WhoisClient::new);
- }
-
}
