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 5b6f6509 Declutter unit test code
5b6f6509 is described below
commit 5b6f650946490158e6a0fd5e880860659c5199c3
Author: Gary D. Gregory <[email protected]>
AuthorDate: Sun Mar 16 16:00:07 2025 -0400
Declutter unit test code
---
.../org/apache/commons/net/ftp/FTPFileTest.java | 37 ++++++++--------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPFileTest.java
b/src/test/java/org/apache/commons/net/ftp/FTPFileTest.java
index 075f8d87..d27dcb76 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPFileTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPFileTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.net.ftp;
-import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -41,19 +40,15 @@ public class FTPFileTest {
final Calendar timestamp =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
timestamp.set(2023, Calendar.AUGUST, 4, 23, 40, 55);
file.setTimestamp(timestamp);
-
final Instant timestampInstant = file.getTimestampInstant();
-
assertNotNull(timestampInstant);
final LocalDateTime fileDateTime =
LocalDateTime.ofInstant(file.getTimestampInstant(), ZoneId.of("GMT"));
- assertAll(
- () -> assertEquals(2023, fileDateTime.getYear()),
- () -> assertEquals(Month.AUGUST, fileDateTime.getMonth()),
- () -> assertEquals(4, fileDateTime.getDayOfMonth()),
- () -> assertEquals(23, fileDateTime.getHour()),
- () -> assertEquals(40, fileDateTime.getMinute()),
- () -> assertEquals(55, fileDateTime.getSecond())
- );
+ assertEquals(2023, fileDateTime.getYear());
+ assertEquals(Month.AUGUST, fileDateTime.getMonth());
+ assertEquals(4, fileDateTime.getDayOfMonth());
+ assertEquals(23, fileDateTime.getHour());
+ assertEquals(40, fileDateTime.getMinute());
+ assertEquals(55, fileDateTime.getSecond());
}
@Test
@@ -156,19 +151,15 @@ public class FTPFileTest {
file.setPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION, true);
file.setPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION,
true);
file.setPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION,
true);
-
final String formattedString = file.toFormattedString("GMT");
-
- assertAll(
- () -> assertTrue(formattedString.startsWith("-")),
- () -> assertTrue(formattedString.startsWith("rwx", 1)),
- () -> assertTrue(formattedString.contains(file.getUser())),
- () -> assertTrue(formattedString.contains(file.getGroup())),
- () ->
assertTrue(formattedString.contains(String.valueOf(file.getSize()))),
- () -> assertTrue(formattedString.contains("1969-07-16
13:32:00")),
- () -> assertTrue(formattedString.contains("GMT")),
- () -> assertTrue(formattedString.contains(file.getName()))
- );
+ assertTrue(formattedString.startsWith("-"));
+ assertTrue(formattedString.startsWith("rwx", 1));
+ assertTrue(formattedString.contains(file.getUser()));
+ assertTrue(formattedString.contains(file.getGroup()));
+ assertTrue(formattedString.contains(String.valueOf(file.getSize())));
+ assertTrue(formattedString.contains("1969-07-16 13:32:00"));
+ assertTrue(formattedString.contains("GMT"));
+ assertTrue(formattedString.contains(file.getName()));
}
@Test