You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/02/06 15:55:46 UTC
[commons-net] 02/03: Organize imports.
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 2d10eed54ad0b46382893a9757e9e7d2d55ea6a3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 6 10:51:20 2021 -0500
Organize imports.
---
.../org/apache/commons/net/SocketClientFunctionalTest.java | 4 ++--
src/test/java/org/apache/commons/net/SocketClientTest.java | 4 ++--
.../net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java | 4 ++--
.../commons/net/ftp/parser/FTPConfigEntryParserTest.java | 4 ++--
.../apache/commons/net/ftp/parser/FTPParseTestFramework.java | 5 +++--
.../org/apache/commons/net/ftp/parser/MLSDComparison.java | 1 -
.../net/ftp/parser/OS400FTPEntryParserAdditionalTest.java | 4 ++--
.../commons/net/ftp/parser/OS400FTPEntryParserTest.java | 4 ++--
src/test/java/org/apache/commons/net/imap/IMAPTest.java | 1 -
.../org/apache/commons/net/io/ToNetASCIIInputStreamTest.java | 1 +
src/test/java/org/apache/commons/net/ntp/TestNtpClient.java | 11 +++++------
src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java | 6 +++---
src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java | 6 +++---
src/test/java/org/apache/commons/net/ntp/TimeStampTest.java | 3 ++-
.../org/apache/commons/net/pop3/POP3ClientCommandsTest.java | 6 +++---
src/test/java/org/apache/commons/net/pop3/POP3ClientTest.java | 6 +++---
.../java/org/apache/commons/net/pop3/POP3ConstructorTest.java | 3 ++-
.../org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java | 4 +++-
.../apache/commons/net/telnet/TelnetClientFunctionalTest.java | 3 ++-
.../java/org/apache/commons/net/telnet/TelnetClientTest.java | 4 ++--
.../org/apache/commons/net/telnet/TelnetTestSimpleServer.java | 6 +++---
src/test/java/org/apache/commons/net/tftp/TFTPServer.java | 2 +-
.../java/org/apache/commons/net/time/TimeTCPClientTest.java | 2 +-
src/test/java/org/apache/commons/net/util/Base64Test.java | 6 +++++-
24 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/src/test/java/org/apache/commons/net/SocketClientFunctionalTest.java b/src/test/java/org/apache/commons/net/SocketClientFunctionalTest.java
index c2e8665..dc3506c 100644
--- a/src/test/java/org/apache/commons/net/SocketClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/SocketClientFunctionalTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.net;
-import junit.framework.TestCase;
-
import java.net.InetSocketAddress;
import java.net.Proxy;
import org.apache.commons.net.ftp.FTPClient;
+import junit.framework.TestCase;
+
/**
* A simple functional test class for SocketClients.
*
diff --git a/src/test/java/org/apache/commons/net/SocketClientTest.java b/src/test/java/org/apache/commons/net/SocketClientTest.java
index 1256426..52ad587 100644
--- a/src/test/java/org/apache/commons/net/SocketClientTest.java
+++ b/src/test/java/org/apache/commons/net/SocketClientTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.net;
-import junit.framework.TestCase;
-
import java.net.InetSocketAddress;
import java.net.Proxy;
import org.apache.commons.net.ftp.FTPClient;
+import junit.framework.TestCase;
+
/**
* A simple test class for SocketClient settings.
*
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 3665635..112a7f9 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
@@ -15,11 +15,11 @@
* limitations under the License.
*/
package org.apache.commons.net.ftp.parser;
-import junit.framework.TestCase;
-
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFileEntryParser;
+import junit.framework.TestCase;
+
public class DefaultFTPFileEntryParserFactoryTest extends TestCase
{
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
index 50595cb..49da04d 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
@@ -19,11 +19,11 @@ package org.apache.commons.net.ftp.parser;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import junit.framework.TestCase;
-
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
+import junit.framework.TestCase;
+
/**
* This is a simple TestCase that tests entry parsing using the new FTPClientConfig
* mechanism. The normal FTPClient cannot handle the different date formats in these
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java b/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
index 7b58d95..9cab8fc 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
package org.apache.commons.net.ftp.parser;
-import junit.framework.TestCase;
-
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
+
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileEntryParser;
+import junit.framework.TestCase;
+
/**
*/
public abstract class FTPParseTestFramework extends TestCase
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index cade6f5..bbdedb4 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -32,7 +32,6 @@ import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileFilters;
import org.apache.commons.net.ftp.FTPListParseEngine;
-
import org.junit.Test;
/**
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java b/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
index 37b2be9..4334471 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserAdditionalTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.util.Calendar;
+
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileEntryParser;
-import java.util.Calendar;
-
/**
*/
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
index c2a9247..b17bc10 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.util.Calendar;
+
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileEntryParser;
-import java.util.Calendar;
-
/**
*/
diff --git a/src/test/java/org/apache/commons/net/imap/IMAPTest.java b/src/test/java/org/apache/commons/net/imap/IMAPTest.java
index 497a33c..bb93aff 100644
--- a/src/test/java/org/apache/commons/net/imap/IMAPTest.java
+++ b/src/test/java/org/apache/commons/net/imap/IMAPTest.java
@@ -19,7 +19,6 @@
package org.apache.commons.net.imap;
import org.junit.Assert;
-
import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
index 551aeb7..0249696 100644
--- a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
+++ b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+
//import java.nio.charset.Charset;
import org.junit.Assert;
import org.junit.Test;
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 4d5e388..c9764a5 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestNtpClient.java
@@ -16,16 +16,15 @@
*/
package org.apache.commons.net.ntp;
+import java.io.IOException;
+import java.net.InetAddress;
+
+import org.apache.commons.net.examples.ntp.SimpleNTPServer;
import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.commons.net.examples.ntp.SimpleNTPServer;
-
-import java.io.IOException;
-import java.net.InetAddress;
-
/**
* JUnit test class for NtpClient using SimpleNTPServer
*/
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 7768b24..14b7336 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.net.ntp;
-import org.junit.Test;
-import org.junit.Assert;
-
import java.net.DatagramPacket;
+import org.junit.Assert;
+import org.junit.Test;
+
public class TestNtpPacket {
// pre-canned NTP packet
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 fc780d5..32dd806 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.net.ntp;
-import org.junit.Test;
-import org.junit.Assert;
-
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
public class TestTimeInfo {
@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 4ba1f08..38f7d35 100644
--- a/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
+++ b/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.net.ntp;
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
+
import junit.framework.TestCase;
/**
diff --git a/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java b/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java
index 9aeb041..7795f1b 100644
--- a/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java
+++ b/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.net.pop3;
-import junit.framework.TestCase;
-
-import java.net.InetAddress;
import java.io.IOException;
import java.io.Reader;
+import java.net.InetAddress;
+
+import junit.framework.TestCase;
/**
*
diff --git a/src/test/java/org/apache/commons/net/pop3/POP3ClientTest.java b/src/test/java/org/apache/commons/net/pop3/POP3ClientTest.java
index 470a35d..8f23a3d 100644
--- a/src/test/java/org/apache/commons/net/pop3/POP3ClientTest.java
+++ b/src/test/java/org/apache/commons/net/pop3/POP3ClientTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.net.pop3;
-import junit.framework.TestCase;
-
-import java.net.InetAddress;
import java.io.IOException;
+import java.net.InetAddress;
+
+import junit.framework.TestCase;
/**
diff --git a/src/test/java/org/apache/commons/net/pop3/POP3ConstructorTest.java b/src/test/java/org/apache/commons/net/pop3/POP3ConstructorTest.java
index 726fa85..7844a82 100644
--- a/src/test/java/org/apache/commons/net/pop3/POP3ConstructorTest.java
+++ b/src/test/java/org/apache/commons/net/pop3/POP3ConstructorTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.commons.net.pop3;
-import junit.framework.TestCase;
import java.io.Reader;
+import junit.framework.TestCase;
+
/**
* The POP3* tests all presume the existence of the following parameters:
* mailserver: localhost (running on the default port 110)
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 135e96d..55c6720 100644
--- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
+++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.net.smtp;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
index 4e19079..de0c19d 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.net.telnet;
-import junit.framework.TestCase;
import java.io.InputStream;
import java.io.OutputStream;
+import junit.framework.TestCase;
+
/**
* JUnit functional test for TelnetClient.
* Connects to the weather forecast service
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 fbf772c..7fa3842 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.apache.commons.net.telnet;
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import junit.framework.TestCase;
+
/**
* JUnit test class for TelnetClient.s
* Implements protocol compliance tests
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
index 84e25ee..70a4ee7 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.net.telnet;
-import java.net.ServerSocket;
-import java.net.Socket;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
/**
* Simple TCP server.
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 6ae40f3..a4d5f42 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -30,8 +30,8 @@ import java.io.PrintStream;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketTimeoutException;
-import java.util.HashSet;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Iterator;
import org.apache.commons.net.io.FromNetASCIIOutputStream;
diff --git a/src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java b/src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
index c06fa00..9fe529a 100644
--- a/src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
+++ b/src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.net.time;
+import java.io.IOException;
import java.net.InetAddress;
import java.util.Calendar;
-import java.io.IOException;
import java.util.TimeZone;
import junit.framework.TestCase;
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 31ba7a7..de5cc6e 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -18,7 +18,11 @@
package org.apache.commons.net.util;
-import static org.junit.Assert.*;
+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;