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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 17b60d728 Fix weird test method names
17b60d728 is described below
commit 17b60d728909991f4812ac448179652bf6ba1ec7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 22 15:26:15 2023 -0500
Fix weird test method names
---
.../commons/compress/utils/TimeUtilsTest.java | 96 +++++++++++-----------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java
b/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java
index 797183175..3d73734c7 100644
--- a/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java
@@ -85,18 +85,20 @@ public class TimeUtilsTest {
Arguments.of("1969-12-31T23:59:59.000000199Z",
"1969-12-31T23:59:59.0000001Z"));
}
- @ParameterizedTest
- @MethodSource("dateToNtfsProvider")
- public void shouldConvertDateToFileTime(final String instant, final long
ignored) {
- final Instant parsedInstant = Instant.parse(instant);
- final FileTime parsedFileTime = FileTime.from(parsedInstant);
- final Date parsedDate = Date.from(parsedInstant);
- assertEquals(parsedFileTime, toFileTime(parsedDate));
+ @Test
+ public void testIsUnixTime() {
+ assertTrue(TimeUtils.isUnixTime(null));
+
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2022-12-27T12:45:22Z"))));
+
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2038-01-19T03:14:07Z"))));
+
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("1901-12-13T23:14:08Z"))));
+
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("1901-12-13T03:14:08Z"))));
+
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2038-01-19T03:14:08Z"))));
+
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2099-06-30T12:31:42Z"))));
}
@ParameterizedTest
@MethodSource("dateToNtfsProvider")
- public void shouldConvertDateToNtfsTime(final String instant, final long
ntfsTime) {
+ public void testJavaTimeToNtfsTime(final String instant, final long
ntfsTime) {
final long ntfsMillis = Math.floorDiv(ntfsTime,
HUNDRED_NANOS_PER_MILLISECOND) * HUNDRED_NANOS_PER_MILLISECOND;
final Date parsed = Date.from(Instant.parse(instant));
final long converted = toNtfsTime(parsed);
@@ -107,74 +109,72 @@ public class TimeUtilsTest {
@ParameterizedTest
@MethodSource("fileTimeToNtfsProvider")
- public void shouldConvertFileTimeToDate(final String instant, final long
ignored) {
+ public void testNtfsTimeToFileTime(final String instant, final long
ntfsTime) {
+ final FileTime parsed = FileTime.from(Instant.parse(instant));
+ assertEquals(parsed, ntfsTimeToFileTime(ntfsTime));
+ }
+
+ @ParameterizedTest
+ @MethodSource("dateToNtfsProvider")
+ public void testNtfsTimeToJavaTime(final String instant, final long
ntfsTime) {
+ final Date converted = ntfsTimeToDate(ntfsTime);
+ assertEquals(Instant.parse(instant), converted.toInstant());
+ // ensuring the deprecated method still works
+ assertEquals(converted,
SevenZArchiveEntry.ntfsTimeToJavaTime(ntfsTime));
+ }
+
+ @ParameterizedTest
+ @MethodSource("fileTimeToNtfsProvider")
+ public void testToDate(final String instant, final long ignored) {
final Instant parsedInstant = Instant.parse(instant);
final FileTime parsedFileTime = FileTime.from(parsedInstant);
final Date parsedDate = Date.from(parsedInstant);
assertEquals(parsedDate, toDate(parsedFileTime));
}
- @ParameterizedTest
- @MethodSource("fileTimeToNtfsProvider")
- public void shouldConvertFileTimeToNtfsTime(final String instant, final
long ntfsTime) {
- final FileTime parsed = FileTime.from(Instant.parse(instant));
- assertEquals(ntfsTime, toNtfsTime(parsed));
+ @Test
+ public void testToDateNull() {
+ assertNull(toDate(null));
}
@ParameterizedTest
- @MethodSource("fileTimeToUnixTimeArguments")
- public void shouldConvertFileTimeToUnixTime(final long expectedUnixTime,
final String instant) {
- assertEquals(expectedUnixTime,
TimeUtils.toUnixTime(FileTime.from(Instant.parse(instant))));
+ @MethodSource("dateToNtfsProvider")
+ public void testToFileTime(final String instant, final long ignored) {
+ final Instant parsedInstant = Instant.parse(instant);
+ final FileTime parsedFileTime = FileTime.from(parsedInstant);
+ final Date parsedDate = Date.from(parsedInstant);
+ assertEquals(parsedFileTime, toFileTime(parsedDate));
}
- @ParameterizedTest
- @MethodSource("dateToNtfsProvider")
- public void shouldConvertNtfsTimeToDate(final String instant, final long
ntfsTime) {
- final Date converted = ntfsTimeToDate(ntfsTime);
- assertEquals(Instant.parse(instant), converted.toInstant());
- // ensuring the deprecated method still works
- assertEquals(converted,
SevenZArchiveEntry.ntfsTimeToJavaTime(ntfsTime));
+ @Test
+ public void testToFileTimeNull() {
+ assertNull(toFileTime(null));
}
@ParameterizedTest
@MethodSource("fileTimeToNtfsProvider")
- public void shouldConvertNtfsTimeToFileTime(final String instant, final
long ntfsTime) {
+ public void testToNtfsTime(final String instant, final long ntfsTime) {
final FileTime parsed = FileTime.from(Instant.parse(instant));
- assertEquals(parsed, ntfsTimeToFileTime(ntfsTime));
+ assertEquals(ntfsTime, toNtfsTime(parsed));
}
@ParameterizedTest
@MethodSource("fileTimeToUnixTimeArguments")
- public void shouldConvertUnixTimeToFileTime(final long unixTime, final
String expectedInstant) {
- assertEquals(Instant.parse(expectedInstant),
TimeUtils.unixTimeToFileTime(unixTime).toInstant());
+ public void testToUnixTime(final long expectedUnixTime, final String
instant) {
+ assertEquals(expectedUnixTime,
TimeUtils.toUnixTime(FileTime.from(Instant.parse(instant))));
}
@ParameterizedTest
@MethodSource("truncateFileTimeProvider")
- public void shouldTruncateFileTimeToHundredNanos(final String original,
final String truncated) {
+ public void testTruncateToHundredNanos(final String original, final String
truncated) {
final FileTime originalTime = FileTime.from(Instant.parse(original));
final FileTime truncatedTime = FileTime.from(Instant.parse(truncated));
assertEquals(truncatedTime,
TimeUtils.truncateToHundredNanos(originalTime));
}
- @Test
- public void testShouldCheckWhetherTimeCanBeRepresentedAsUnixTime() {
- assertTrue(TimeUtils.isUnixTime(null));
-
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2022-12-27T12:45:22Z"))));
-
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2038-01-19T03:14:07Z"))));
-
assertTrue(TimeUtils.isUnixTime(FileTime.from(Instant.parse("1901-12-13T23:14:08Z"))));
-
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("1901-12-13T03:14:08Z"))));
-
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2038-01-19T03:14:08Z"))));
-
assertFalse(TimeUtils.isUnixTime(FileTime.from(Instant.parse("2099-06-30T12:31:42Z"))));
- }
-
- @Test
- public void testShouldConvertNullDateToNullFileTime() {
- assertNull(toFileTime(null));
- }
-
- @Test
- public void testShouldConvertNullFileTimeToNullDate() {
- assertNull(toDate(null));
+ @ParameterizedTest
+ @MethodSource("fileTimeToUnixTimeArguments")
+ public void testUnixTimeToFileTime(final long unixTime, final String
expectedInstant) {
+ assertEquals(Instant.parse(expectedInstant),
TimeUtils.unixTimeToFileTime(unixTime).toInstant());
}
}
