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 2020/09/22 00:08:52 UTC
[commons-net] branch master updated: Use try-with-resources.
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
The following commit(s) were added to refs/heads/master by this push:
new dac3936 Use try-with-resources.
dac3936 is described below
commit dac3936aed2256d76d1c80888b6282ff5c892944
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 20:08:47 2020 -0400
Use try-with-resources.
---
.../org/apache/commons/net/examples/MainTest.java | 19 ++-
.../commons/net/ftp/parser/MLSDComparison.java | 36 +++--
.../commons/net/io/ToNetASCIIInputStreamTest.java | 16 +-
.../commons/net/pop3/POP3ClientCommandsTest.java | 170 ++++++++++-----------
.../net/telnet/TelnetClientFunctionalTest.java | 53 +++----
.../commons/net/telnet/TelnetClientTest.java | 81 +++++-----
.../commons/net/tftp/TFTPServerPathTest.java | 43 ++----
.../java/org/apache/commons/net/tftp/TFTPTest.java | 59 ++++---
8 files changed, 219 insertions(+), 258 deletions(-)
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 c2cb601..e09ac74 100644
--- a/src/test/java/org/apache/commons/net/examples/MainTest.java
+++ b/src/test/java/org/apache/commons/net/examples/MainTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URLDecoder;
import java.security.CodeSource;
import java.util.Enumeration;
@@ -36,7 +37,9 @@ public class MainTest {
public void checkExamplesPropertiesIsComplete() throws Exception {
final Properties cp = scanClasses();
final Properties fp = new Properties();
- fp.load(this.getClass().getResourceAsStream("examples.properties"));
+ try (final InputStream inputStream = this.getClass().getResourceAsStream("examples.properties")) {
+ fp.load(inputStream);
+ }
@SuppressWarnings("unchecked") // OK
final Enumeration<String> propertyNames = (Enumeration<String>) cp.propertyNames();
while(propertyNames.hasMoreElements()){
@@ -57,14 +60,14 @@ public class MainTest {
final String sourceFile = URLDecoder.decode(codeSource.getLocation().getFile(),"UTF-8");
final Properties p = new Properties();
if (sourceFile.endsWith(".jar")) {
- final JarFile jf = new JarFile(sourceFile);
- final Enumeration<JarEntry> e = jf.entries();
- while (e.hasMoreElements()) {
- final JarEntry je = e.nextElement();
- final String name = je.getName();
- processFileName(name, p);
+ try (final JarFile jf = new JarFile(sourceFile)) {
+ final Enumeration<JarEntry> e = jf.entries();
+ while (e.hasMoreElements()) {
+ final JarEntry je = e.nextElement();
+ final String name = je.getName();
+ processFileName(name, p);
+ }
}
- jf.close();
} else {
final File examples = new File(sourceFile, "org/apache/commons/net/examples"); // must match top level examples package name
if (examples.exists()) {
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 cf9c3c4..a2e3b66 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
@@ -52,34 +52,32 @@ public class MLSDComparison {
};
@Test
- public void testFile() throws Exception{
+ public void testFile() throws Exception {
final File path = new File(DownloadListings.DOWNLOAD_DIR);
- final FilenameFilter filter = new FilenameFilter(){
+ final FilenameFilter filter = new FilenameFilter() {
@Override
public boolean accept(final File dir, final String name) {
return name.endsWith("_mlsd.txt");
}
};
- for (final File mlsd : path.listFiles(filter)){
+ for (final File mlsd : path.listFiles(filter)) {
System.out.println(mlsd);
- InputStream is = new FileInputStream(mlsd);
FTPListParseEngine engine = new FTPListParseEngine(MLSxEntryParser.getInstance());
- engine.readServerList(is, FTP.DEFAULT_CONTROL_ENCODING);
- final FTPFile [] mlsds = engine.getFiles(FTPFileFilters.ALL);
- is.close();
- final File list = new File(mlsd.getParentFile(),mlsd.getName().replace("_mlsd", "_list"));
-
- System.out.println(list);
- is = new FileInputStream(list);
- final FTPClientConfig cfg = new FTPClientConfig();
- cfg.setServerTimeZoneId("GMT");
- final UnixFTPEntryParser parser = new UnixFTPEntryParser(cfg);
- engine = new FTPListParseEngine(parser);
- engine.readServerList(is, FTP.DEFAULT_CONTROL_ENCODING);
- final FTPFile [] lists = engine.getFiles(FTPFileFilters.ALL);
- is.close();
- compareSortedLists(mlsds, lists);
+ try (InputStream is = new FileInputStream(mlsd)) {
+ engine.readServerList(is, FTP.DEFAULT_CONTROL_ENCODING);
+ }
+ final FTPFile[] mlsds = engine.getFiles(FTPFileFilters.ALL);
+ final File listFile = new File(mlsd.getParentFile(), mlsd.getName().replace("_mlsd", "_list"));
+ try (InputStream inputStream = new FileInputStream(listFile)) {
+ final FTPClientConfig cfg = new FTPClientConfig();
+ cfg.setServerTimeZoneId("GMT");
+ final UnixFTPEntryParser parser = new UnixFTPEntryParser(cfg);
+ engine = new FTPListParseEngine(parser);
+ engine.readServerList(inputStream, FTP.DEFAULT_CONTROL_ENCODING);
+ final FTPFile[] lists = engine.getFiles(FTPFileFilters.ALL);
+ compareSortedLists(mlsds, lists);
+ }
}
}
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 3936aea..98a9b35 100644
--- a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
+++ b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
@@ -61,17 +61,15 @@ public class ToNetASCIIInputStreamTest {
final byte[] data = input.getBytes(ASCII);
final byte[] expected = expect.getBytes(ASCII);
final InputStream source = new ByteArrayInputStream(data);
- final ToNetASCIIInputStream toNetASCII = new ToNetASCIIInputStream(source);
- final byte[] output = new byte[data.length*2]; // cannot be longer than twice the input
+ try (final ToNetASCIIInputStream toNetASCII = new ToNetASCIIInputStream(source)) {
+ final byte[] output = new byte[data.length * 2]; // cannot be longer than twice the input
- final int length = byByte ?
- getSingleBytes(toNetASCII, output) :
- getBuffer(toNetASCII, output);
+ final int length = byByte ? getSingleBytes(toNetASCII, output) : getBuffer(toNetASCII, output);
- final byte[] result = new byte[length];
- System.arraycopy(output, 0, result, 0, length);
- Assert.assertArrayEquals("Failed converting "+input,expected, result);
- toNetASCII.close();
+ final byte[] result = new byte[length];
+ System.arraycopy(output, 0, result, 0, length);
+ Assert.assertArrayEquals("Failed converting " + input, expected, result);
+ }
}
private int getSingleBytes(final ToNetASCIIInputStream toNetASCII, final byte[] output)
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 bef4e9a..6997a62 100644
--- a/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java
+++ b/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java
@@ -40,7 +40,7 @@ import java.io.Reader;
*/
public class POP3ClientCommandsTest extends TestCase
{
- POP3Client p = null;
+ POP3Client pop3Client;
String user = POP3Constants.user;
String emptyUser = POP3Constants.emptyuser;
@@ -55,29 +55,29 @@ public class POP3ClientCommandsTest extends TestCase
private void reset() throws IOException
{
//Case where this is the first time reset is called
- if (p == null)
+ if (pop3Client == null)
{
//Do nothing
}
- else if (p.isConnected())
+ else if (pop3Client.isConnected())
{
- p.disconnect();
+ pop3Client.disconnect();
}
- p = null;
- p = new POP3Client();
+ pop3Client = null;
+ pop3Client = new POP3Client();
}
private void connect() throws Exception
{
- p.connect(InetAddress.getByName(mailhost));
- assertTrue(p.isConnected());
- assertEquals(POP3.AUTHORIZATION_STATE, p.getState());
+ pop3Client.connect(InetAddress.getByName(mailhost));
+ assertTrue(pop3Client.isConnected());
+ assertEquals(POP3.AUTHORIZATION_STATE, pop3Client.getState());
}
private void login() throws Exception
{
- assertTrue(p.login(user, password));
- assertEquals(POP3.TRANSACTION_STATE, p.getState());
+ assertTrue(pop3Client.login(user, password));
+ assertEquals(POP3.TRANSACTION_STATE, pop3Client.getState());
}
public void testNoopCommand() throws Exception
@@ -86,15 +86,15 @@ public class POP3ClientCommandsTest extends TestCase
connect();
//Should fail before authorization
- assertFalse(p.noop());
+ assertFalse(pop3Client.noop());
//Should pass in transaction state
login();
- assertTrue(p.noop());
+ assertTrue(pop3Client.noop());
//Should fail in update state
- p.setState(POP3.UPDATE_STATE);
- assertFalse(p.noop());
+ pop3Client.setState(POP3.UPDATE_STATE);
+ assertFalse(pop3Client.noop());
}
public void testStatus() throws Exception
@@ -103,32 +103,32 @@ public class POP3ClientCommandsTest extends TestCase
connect();
//Should fail in authorization state
- assertNull(p.status());
+ assertNull(pop3Client.status());
//Should pass on a mailbox with mail in it
login();
- final POP3MessageInfo msg = p.status();
+ final POP3MessageInfo msg = pop3Client.status();
assertTrue(msg.number > 0);
assertTrue(msg.size > 0);
assertNull(msg.identifier);
- p.logout();
+ pop3Client.logout();
//Should also pass on a mailbox with no mail in it
reset();
connect();
- assertTrue(p.login(emptyUser, password));
- final POP3MessageInfo msg2 = p.status();
+ assertTrue(pop3Client.login(emptyUser, password));
+ final POP3MessageInfo msg2 = pop3Client.status();
assertEquals(0, msg2.number);
assertEquals(0, msg2.size);
assertNull(msg2.identifier);
- p.logout();
+ pop3Client.logout();
//Should fail in the 'update' state
reset();
connect();
login();
- p.setState(POP3.UPDATE_STATE);
- assertNull(p.status());
+ pop3Client.setState(POP3.UPDATE_STATE);
+ assertNull(pop3Client.status());
}
public void testListMessagesOnFullMailbox() throws Exception
@@ -137,7 +137,7 @@ public class POP3ClientCommandsTest extends TestCase
connect();
login();
- POP3MessageInfo[] msg = p.listMessages();
+ POP3MessageInfo[] msg = pop3Client.listMessages();
assertTrue(msg.length > 0);
for(int i = 0; i < msg.length; i++)
@@ -149,8 +149,8 @@ public class POP3ClientCommandsTest extends TestCase
}
//Now test from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listMessages();
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listMessages();
assertNull(msg);
}
@@ -161,27 +161,27 @@ public class POP3ClientCommandsTest extends TestCase
login();
//The first message is always at index 1
- POP3MessageInfo msg = p.listMessage(1);
+ POP3MessageInfo msg = pop3Client.listMessage(1);
assertNotNull(msg);
assertEquals(1, msg.number);
assertTrue(msg.size > 0);
assertNull(msg.identifier);
//Now retrieve a message from index 0
- msg = p.listMessage(0);
+ msg = pop3Client.listMessage(0);
assertNull(msg);
//Now retrieve a msg that is not there
- msg = p.listMessage(100000);
+ msg = pop3Client.listMessage(100000);
assertNull(msg);
//Now retrieve a msg with a negative index
- msg = p.listMessage(-2);
+ msg = pop3Client.listMessage(-2);
assertNull(msg);
//Now try to get a valid message from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listMessage(1);
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listMessage(1);
assertNull(msg);
}
@@ -189,14 +189,14 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
+ assertTrue(pop3Client.login(emptyUser, password));
- POP3MessageInfo[] msg = p.listMessages();
+ POP3MessageInfo[] msg = pop3Client.listMessages();
assertEquals(0, msg.length);
//Now test from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listMessages();
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listMessages();
assertNull(msg);
}
@@ -204,10 +204,10 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
+ assertTrue(pop3Client.login(emptyUser, password));
//The first message is always at index 1
- final POP3MessageInfo msg = p.listMessage(1);
+ final POP3MessageInfo msg = pop3Client.listMessage(1);
assertNull(msg);
}
@@ -217,7 +217,7 @@ public class POP3ClientCommandsTest extends TestCase
connect();
login();
- POP3MessageInfo[] msg = p.listUniqueIdentifiers();
+ POP3MessageInfo[] msg = pop3Client.listUniqueIdentifiers();
assertTrue(msg.length > 0);
for(int i = 0; i < msg.length; i++)
@@ -228,8 +228,8 @@ public class POP3ClientCommandsTest extends TestCase
}
//Now test from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listUniqueIdentifiers();
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listUniqueIdentifiers();
assertNull(msg);
}
@@ -240,26 +240,26 @@ public class POP3ClientCommandsTest extends TestCase
login();
//The first message is always at index 1
- POP3MessageInfo msg = p.listUniqueIdentifier(1);
+ POP3MessageInfo msg = pop3Client.listUniqueIdentifier(1);
assertNotNull(msg);
assertEquals(1, msg.number);
assertNotNull(msg.identifier);
//Now retrieve a message from index 0
- msg = p.listUniqueIdentifier(0);
+ msg = pop3Client.listUniqueIdentifier(0);
assertNull(msg);
//Now retrieve a msg that is not there
- msg = p.listUniqueIdentifier(100000);
+ msg = pop3Client.listUniqueIdentifier(100000);
assertNull(msg);
//Now retrieve a msg with a negative index
- msg = p.listUniqueIdentifier(-2);
+ msg = pop3Client.listUniqueIdentifier(-2);
assertNull(msg);
//Now try to get a valid message from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listUniqueIdentifier(1);
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listUniqueIdentifier(1);
assertNull(msg);
}
@@ -267,14 +267,14 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
+ assertTrue(pop3Client.login(emptyUser, password));
- POP3MessageInfo[] msg = p.listUniqueIdentifiers();
+ POP3MessageInfo[] msg = pop3Client.listUniqueIdentifiers();
assertEquals(0, msg.length);
//Now test from the update state
- p.setState(POP3.UPDATE_STATE);
- msg = p.listUniqueIdentifiers();
+ pop3Client.setState(POP3.UPDATE_STATE);
+ msg = pop3Client.listUniqueIdentifiers();
assertNull(msg);
}
@@ -282,10 +282,10 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
+ assertTrue(pop3Client.login(emptyUser, password));
//The first message is always at index 1
- final POP3MessageInfo msg = p.listUniqueIdentifier(1);
+ final POP3MessageInfo msg = pop3Client.listUniqueIdentifier(1);
assertNull(msg);
}
@@ -297,13 +297,13 @@ public class POP3ClientCommandsTest extends TestCase
int reportedSize = 0;
int actualSize = 0;
- final POP3MessageInfo[] msg = p.listMessages();
+ final POP3MessageInfo[] msg = pop3Client.listMessages();
assertTrue(msg.length > 0);
for (int i = msg.length; i > 0; i--)
{
reportedSize = msg[i - 1].size;
- final Reader r = p.retrieveMessage(i);
+ final Reader r = pop3Client.retrieveMessage(i);
assertNotNull(r);
int delaycount = 0;
@@ -337,8 +337,8 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
- assertNull(p.retrieveMessage(1));
+ assertTrue(pop3Client.login(emptyUser, password));
+ assertNull(pop3Client.retrieveMessage(1));
}
public void testRetrieveMessageShouldFails() throws Exception
@@ -348,17 +348,17 @@ public class POP3ClientCommandsTest extends TestCase
login();
//Try to get message 0
- assertNull(p.retrieveMessage(0));
+ assertNull(pop3Client.retrieveMessage(0));
//Try to get a negative message
- assertNull(p.retrieveMessage(-2));
+ assertNull(pop3Client.retrieveMessage(-2));
//Try to get a message that is not there
- assertNull(p.retrieveMessage(100000));
+ assertNull(pop3Client.retrieveMessage(100000));
//Change states and try to get a valid message
- p.setState(POP3.UPDATE_STATE);
- assertNull(p.retrieveMessage(1));
+ pop3Client.setState(POP3.UPDATE_STATE);
+ assertNull(pop3Client.retrieveMessage(1));
}
public void testRetrieveMessageTopOnFullMailbox() throws Exception
@@ -368,12 +368,12 @@ public class POP3ClientCommandsTest extends TestCase
login();
final int numLines = 10;
- final POP3MessageInfo[] msg = p.listMessages();
+ final POP3MessageInfo[] msg = pop3Client.listMessages();
assertTrue(msg.length > 0);
for (int i = 0; i < msg.length; i++)
{
- Reader r = p.retrieveMessageTop(i + 1, numLines);
+ Reader r = pop3Client.retrieveMessageTop(i + 1, numLines);
assertNotNull(r);
r.close();
r = null;
@@ -388,11 +388,11 @@ public class POP3ClientCommandsTest extends TestCase
int reportedSize = 0;
int actualSize = 0;
- final POP3MessageInfo msg = p.listMessage(1);
+ final POP3MessageInfo msg = pop3Client.listMessage(1);
reportedSize = msg.size;
//Now try to retrieve more lines than exist in the message
- final Reader r = p.retrieveMessageTop(1, 100000);
+ final Reader r = pop3Client.retrieveMessageTop(1, 100000);
assertNotNull(r);
int delaycount = 0;
@@ -425,8 +425,8 @@ public class POP3ClientCommandsTest extends TestCase
{
reset();
connect();
- assertTrue(p.login(emptyUser, password));
- assertNull(p.retrieveMessageTop(1, 10));
+ assertTrue(pop3Client.login(emptyUser, password));
+ assertNull(pop3Client.retrieveMessageTop(1, 10));
}
public void testRetrieveMessageTopShouldFails() throws Exception
@@ -436,17 +436,17 @@ public class POP3ClientCommandsTest extends TestCase
login();
//Try to get message 0
- assertNull(p.retrieveMessageTop(0, 10));
+ assertNull(pop3Client.retrieveMessageTop(0, 10));
//Try to get a negative message
- assertNull(p.retrieveMessageTop(-2, 10));
+ assertNull(pop3Client.retrieveMessageTop(-2, 10));
//Try to get a message that is not there
- assertNull(p.retrieveMessageTop(100000, 10));
+ assertNull(pop3Client.retrieveMessageTop(100000, 10));
//Change states and try to get a valid message
- p.setState(POP3.UPDATE_STATE);
- assertNull(p.retrieveMessageTop(1, 10));
+ pop3Client.setState(POP3.UPDATE_STATE);
+ assertNull(pop3Client.retrieveMessageTop(1, 10));
}
public void testDeleteWithReset() throws Exception
@@ -455,31 +455,31 @@ public class POP3ClientCommandsTest extends TestCase
connect();
login();
//Get the original number of messages
- POP3MessageInfo[] msg = p.listMessages();
+ POP3MessageInfo[] msg = pop3Client.listMessages();
final int numMessages = msg.length;
int numDeleted = 0;
//Now delete some and logout
for (int i = 0; i < numMessages - 1; i ++)
{
- p.deleteMessage(i + 1);
+ pop3Client.deleteMessage(i + 1);
numDeleted++;
}
//Check to see that they are marked as deleted
assertEquals(numMessages, numDeleted + 1);
//Now reset to unmark the messages as deleted
- p.reset();
+ pop3Client.reset();
//Logout and come back in
- p.logout();
+ pop3Client.logout();
reset();
connect();
login();
//Get the new number of messages, because of
//reset, new number should match old number
- msg = p.listMessages();
+ msg = pop3Client.listMessages();
assertEquals(numMessages, msg.length);
}
@@ -489,28 +489,28 @@ public class POP3ClientCommandsTest extends TestCase
connect();
login();
//Get the original number of messages
- POP3MessageInfo[] msg = p.listMessages();
+ POP3MessageInfo[] msg = pop3Client.listMessages();
final int numMessages = msg.length;
int numDeleted = 0;
//Now delete some and logout
for (int i = 0; i < numMessages - 3; i ++)
{
- p.deleteMessage(i + 1);
+ pop3Client.deleteMessage(i + 1);
numDeleted++;
}
//Check to see that they are marked as deleted
assertEquals(numMessages, numDeleted + 3);
//Logout and come back in
- p.logout();
+ pop3Client.logout();
reset();
connect();
login();
//Get the new number of messages, because of
//reset, new number should match old number
- msg = p.listMessages();
+ msg = pop3Client.listMessages();
assertEquals(numMessages - numDeleted, msg.length);
}
@@ -520,9 +520,9 @@ public class POP3ClientCommandsTest extends TestCase
connect();
login();
- p.setState(POP3.UPDATE_STATE);
- assertFalse(p.reset());
+ pop3Client.setState(POP3.UPDATE_STATE);
+ assertFalse(pop3Client.reset());
- assertFalse(p.deleteMessage(1));
+ assertFalse(pop3Client.deleteMessage(1));
}
}
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 fd56b53..e557a87 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -50,37 +50,32 @@ public class TelnetClientFunctionalTest extends TestCase
boolean testresult = false;
tc1.connect("rainmaker.wunderground.com", 3000);
- final InputStream is = tc1.getInputStream();
- final OutputStream os = tc1.getOutputStream();
+ try (final InputStream is = tc1.getInputStream();
+ final OutputStream os = tc1.getOutputStream()) {
- boolean cont = waitForString(is, "Return to continue:", 30000);
- if (cont)
- {
- os.write("\n".getBytes());
- os.flush();
- cont = waitForString(is, "city code--", 30000);
- }
- if (cont)
- {
- os.write("LAX\n".getBytes());
- os.flush();
- cont = waitForString(is, "Los Angeles", 30000);
- }
- if (cont)
- {
- cont = waitForString(is, "X to exit:", 30000);
- }
- if (cont)
- {
- os.write("X\n".getBytes());
- os.flush();
- tc1.disconnect();
- testresult = true;
- }
+ boolean cont = waitForString(is, "Return to continue:", 30000);
+ if (cont) {
+ os.write("\n".getBytes());
+ os.flush();
+ cont = waitForString(is, "city code--", 30000);
+ }
+ if (cont) {
+ os.write("LAX\n".getBytes());
+ os.flush();
+ cont = waitForString(is, "Los Angeles", 30000);
+ }
+ if (cont) {
+ cont = waitForString(is, "X to exit:", 30000);
+ }
+ if (cont) {
+ os.write("X\n".getBytes());
+ os.flush();
+ tc1.disconnect();
+ testresult = true;
+ }
- assertTrue(testresult);
- os.close();
- is.close();
+ assertTrue(testresult);
+ }
}
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 80da73f..37c808d 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -721,63 +721,56 @@ extends TestCase implements TelnetNotificationHandler
boolean test1spy_ok = false;
boolean test2spy_ok = false;
boolean stopspy_ok = false;
- final byte expected1[] =
- { (byte) 't', (byte) 'e', (byte) 's', (byte) 't', (byte) '1' };
- final byte expected2[] =
- { (byte) 't', (byte) 'e', (byte) 's', (byte) 't', (byte) '2' };
-
+ final byte expected1[] = {(byte) 't', (byte) 'e', (byte) 's', (byte) 't', (byte) '1'};
+ final byte expected2[] = {(byte) 't', (byte) 'e', (byte) 's', (byte) 't', (byte) '2'};
- final PipedOutputStream po = new PipedOutputStream();
- final PipedInputStream pi = new PipedInputStream(po);
+ try (final PipedOutputStream po = new PipedOutputStream();
+ final PipedInputStream pi = new PipedInputStream(po)) {
- final OutputStream os = STANDARD.server.getOutputStream();
- final OutputStream ostc = STANDARD.client.getOutputStream();
+ final OutputStream os = STANDARD.server.getOutputStream();
+ final OutputStream ostc = STANDARD.client.getOutputStream();
- STANDARD.client.registerSpyStream(po);
+ STANDARD.client.registerSpyStream(po);
- os.write("test1".getBytes());
- os.flush();
+ os.write("test1".getBytes());
+ os.flush();
- Thread.sleep(1000);
- final byte buffer[] = new byte[5];
+ Thread.sleep(1000);
+ final byte buffer[] = new byte[5];
- if(pi.available() == 5)
- {
- pi.read(buffer);
- if (equalBytes(buffer, expected1)) {
- test1spy_ok = true;
+ if (pi.available() == 5) {
+ pi.read(buffer);
+ if (equalBytes(buffer, expected1)) {
+ test1spy_ok = true;
+ }
}
- }
- ostc.write("test2".getBytes());
- ostc.flush();
+ ostc.write("test2".getBytes());
+ ostc.flush();
- Thread.sleep(1000);
+ Thread.sleep(1000);
- if(pi.available() == 5)
- {
- pi.read(buffer);
- if (equalBytes(buffer, expected2)) {
- test2spy_ok = true;
+ if (pi.available() == 5) {
+ pi.read(buffer);
+ if (equalBytes(buffer, expected2)) {
+ test2spy_ok = true;
+ }
}
- }
-
- STANDARD.client.stopSpyStream();
- os.write("test1".getBytes());
- os.flush();
- ostc.write("test2".getBytes());
- ostc.flush();
- Thread.sleep(1000);
- if(pi.available() == 0)
- {
- stopspy_ok = true;
- }
+ STANDARD.client.stopSpyStream();
+ os.write("test1".getBytes());
+ os.flush();
+ ostc.write("test2".getBytes());
+ ostc.flush();
+ Thread.sleep(1000);
+ if (pi.available() == 0) {
+ stopspy_ok = true;
+ }
- assertTrue(test1spy_ok);
- assertTrue(test2spy_ok);
- assertTrue(stopspy_ok);
- pi.close();
+ assertTrue(test1spy_ok);
+ assertTrue(test2spy_ok);
+ assertTrue(stopspy_ok);
+ }
}
/*
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 dfafeb8..464f56d 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
@@ -57,26 +57,20 @@ public class TFTPServerPathTest extends TestCase
out.delete();
assertTrue("Couldn't clear output location", !out.exists());
- final FileOutputStream output = new FileOutputStream(out);
-
- tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output, "localhost", SERVER_PORT);
- output.close();
+ try (final FileOutputStream output = new FileOutputStream(out)) {
+ tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output, "localhost", SERVER_PORT);
+ }
assertTrue("file not created", out.exists());
out.delete();
- final FileInputStream fis = new FileInputStream(file);
- try
- {
+ try (final FileInputStream fis = new FileInputStream(file)) {
tftp.sendFile(out.getName(), TFTP.BINARY_MODE, fis, "localhost", SERVER_PORT);
fail("Server allowed write");
- }
- catch (final IOException e)
- {
+ } catch (final IOException e) {
// expected path
}
- fis.close();
file.delete();
tftpS.shutdown();
}
@@ -102,24 +96,17 @@ public class TFTPServerPathTest extends TestCase
out.delete();
assertTrue("Couldn't clear output location", !out.exists());
- final FileOutputStream output = new FileOutputStream(out);
-
- try
- {
+ try (final FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output, "localhost", SERVER_PORT);
fail("Server allowed read");
- }
- catch (final IOException e)
- {
+ } catch (final IOException e) {
// expected path
}
- output.close();
out.delete();
- final FileInputStream fis = new FileInputStream(file);
- tftp.sendFile(out.getName(), TFTP.BINARY_MODE, fis, "localhost", SERVER_PORT);
-
- fis.close();
+ try (final FileInputStream fis = new FileInputStream(file)) {
+ tftp.sendFile(out.getName(), TFTP.BINARY_MODE, fis, "localhost", SERVER_PORT);
+ }
assertTrue("file not created", out.exists());
@@ -144,19 +131,13 @@ public class TFTPServerPathTest extends TestCase
assertFalse("test construction error", new File(serverDirectory, "../foo").exists());
- final FileInputStream fis = new FileInputStream(file);
- try
- {
+ try (final FileInputStream fis = new FileInputStream(file)) {
tftp.sendFile("../foo", TFTP.BINARY_MODE, fis, "localhost", SERVER_PORT);
fail("Server allowed write!");
- }
- catch (final IOException e)
- {
+ } catch (final IOException e) {
// expected path
}
- fis.close();
-
assertFalse("file created when it should not have been",
new File(serverDirectory, "../foo").exists());
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 af1372f..4636161 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -92,13 +92,12 @@ public class TFTPTest extends TestCase
*/
private static File createFile(final File file, final int size) throws IOException
{
- final OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
- final byte[] temp = "0".getBytes();
- for (int i = 0; i < size; i++)
- {
- os.write(temp);
+ try (final OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
+ final byte[] temp = "0".getBytes();
+ for (int i = 0; i < size; i++) {
+ os.write(temp);
+ }
}
- os.close();
return file;
}
@@ -173,10 +172,9 @@ public class TFTPTest extends TestCase
out.delete();
assertTrue("Couldn't clear output location", !out.exists());
- final FileOutputStream output = new FileOutputStream(out);
-
- tftp.receiveFile(file.getName(), mode, output, "localhost", SERVER_PORT);
- output.close();
+ try (final FileOutputStream output = new FileOutputStream(out)) {
+ tftp.receiveFile(file.getName(), mode, output, "localhost", SERVER_PORT);
+ }
assertTrue("file not created", out.exists());
assertTrue("files not identical on file " + file, filesIdentical(out, file));
@@ -197,9 +195,9 @@ public class TFTPTest extends TestCase
in.delete();
assertTrue("Couldn't clear output location", !in.exists());
- final FileInputStream fis = new FileInputStream(file);
- tftp.sendFile(in.getName(), mode, fis, "localhost", SERVER_PORT);
- fis.close();
+ try (final FileInputStream fis = new FileInputStream(file)) {
+ tftp.sendFile(in.getName(), mode, fis, "localhost", SERVER_PORT);
+ }
// need to give the server a bit of time to receive our last packet, and
// close out its file buffers, etc.
@@ -212,36 +210,31 @@ public class TFTPTest extends TestCase
private boolean filesIdentical(final File a, final File b) throws IOException
{
- if (!a.exists() || !b.exists())
- {
+ if (!a.exists() || !b.exists()) {
return false;
}
- if (a.length() != b.length())
- {
+ if (a.length() != b.length()) {
return false;
}
- final InputStream fisA = new BufferedInputStream(new FileInputStream(a));
- final InputStream fisB = new BufferedInputStream(new FileInputStream(b));
+ try (final InputStream fisA = new BufferedInputStream(new FileInputStream(a));
+ final InputStream fisB = new BufferedInputStream(new FileInputStream(b))) {
- int aBit = fisA.read();
- int bBit = fisB.read();
+ int aBit = fisA.read();
+ int bBit = fisB.read();
- while (aBit != -1)
- {
- if (aBit != bBit)
- {
- fisA.close();
- fisB.close();
- return false;
+ while (aBit != -1) {
+ if (aBit != bBit) {
+ fisA.close();
+ fisB.close();
+ return false;
+ }
+ aBit = fisA.read();
+ bBit = fisB.read();
}
- aBit = fisA.read();
- bBit = fisB.read();
- }
- fisA.close();
- fisB.close();
+ }
return true;
}
}