Skip to content

Commit 59e78c2

Browse files
Fix tests
1 parent f9f71cb commit 59e78c2

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/localization/DateWrapper.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import javax.annotation.Nonnull;
44
import java.io.Serializable;
55
import java.time.Instant;
6-
import java.time.LocalDate;
76
import java.time.LocalDateTime;
87
import java.time.OffsetDateTime;
98
import java.time.ZoneId;
@@ -57,11 +56,19 @@ public OffsetDateTime offsetDateTime() {
5756
}
5857

5958
/**
60-
* @return the wrapped {@link Instant} as a {@link LocalDate} in the current time zone.
59+
* @return the wrapped {@link Instant} as a {@link LocalDateTime} in the current time zone.
6160
*/
6261
@Nonnull
6362
public LocalDateTime getLocalDateTime() {
64-
return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
63+
return getLocalDateTime(ZoneId.systemDefault());
64+
}
65+
66+
/**
67+
* @return the wrapped {@link Instant} as a {@link LocalDateTime} in the given time zone.
68+
*/
69+
@Nonnull
70+
public LocalDateTime getLocalDateTime(@Nonnull final ZoneId zoneId) {
71+
return LocalDateTime.ofInstant(instant, zoneId);
6572
}
6673

6774
/**

extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import javax.annotation.Nullable;
1717
import java.time.LocalDateTime;
18+
import java.time.ZoneOffset;
1819
import java.time.format.DateTimeFormatter;
1920
import java.net.MalformedURLException;
2021
import java.net.URL;
@@ -203,7 +204,7 @@ public void testUploadDate() throws Exception {
203204
final var expectedDateTime = LocalDateTime.parse(expectedDate,
204205
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
205206

206-
assertEquals(expectedDateTime, dateWrapper.getLocalDateTime());
207+
assertEquals(expectedDateTime, dateWrapper.getLocalDateTime(ZoneOffset.UTC));
207208
}
208209
}
209210

extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampRadioStreamExtractorTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.IOException;
2222
import java.time.LocalDate;
2323
import java.time.Month;
24+
import java.time.ZoneOffset;
2425
import java.util.Collections;
2526
import java.util.List;
2627

@@ -83,7 +84,8 @@ public List<String> expectedDescriptionContains() {
8384
@Test
8485
public void testUploadDate() throws ParsingException {
8586
final var expectedDate = LocalDate.of(2017, Month.MAY, 16);
86-
final var actualDate = extractor().getUploadDate().getLocalDateTime().toLocalDate();
87+
final var actualDate = extractor().getUploadDate().getLocalDateTime(ZoneOffset.UTC)
88+
.toLocalDate();
8789
assertEquals(expectedDate, actualDate);
8890
}
8991

0 commit comments

Comments
 (0)