Skip to content

Commit 2dc17d4

Browse files
Improve tests
1 parent 758c31b commit 2dc17d4

3 files changed

Lines changed: 16 additions & 13 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import javax.annotation.Nullable;
1818
import java.time.LocalDateTime;
19+
import java.time.ZoneId;
1920
import java.time.format.DateTimeFormatter;
2021
import java.net.MalformedURLException;
2122
import java.net.URL;
@@ -200,9 +201,10 @@ public void testUploadDate() throws Exception {
200201
} else {
201202
assertNotNull(dateWrapper);
202203

203-
final LocalDateTime expectedDateTime = LocalDateTime.parse(expectedUploadDate(),
204+
final var expectedDateTime = LocalDateTime.parse(expectedUploadDate(),
204205
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
205-
final LocalDateTime actualDateTime = dateWrapper.offsetDateTime().toLocalDateTime();
206+
final var actualDateTime = LocalDateTime.ofInstant(dateWrapper.getInstant(),
207+
ZoneId.systemDefault());
206208

207209
assertEquals(expectedDateTime, actualDateTime);
208210
}

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import org.schabi.newpipe.extractor.stream.StreamType;
2020

2121
import java.io.IOException;
22-
import java.util.Calendar;
22+
import java.time.LocalDate;
23+
import java.time.Month;
24+
import java.time.ZoneOffset;
2325
import java.util.Collections;
2426
import java.util.List;
25-
import java.util.TimeZone;
2627

2728
public class BandcampRadioStreamExtractorTest extends DefaultStreamExtractorTest {
2829

@@ -82,14 +83,10 @@ public List<String> expectedDescriptionContains() {
8283
@Override
8384
@Test
8485
public void testUploadDate() throws ParsingException {
85-
final Calendar expectedCalendar = Calendar.getInstance();
86-
87-
// 16 May 2017 00:00:00 GMT
88-
expectedCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
89-
expectedCalendar.setTimeInMillis(0);
90-
expectedCalendar.set(2017, Calendar.MAY, 16);
91-
92-
assertEquals(expectedCalendar.getTimeInMillis(), extractor().getUploadDate().offsetDateTime().toInstant().toEpochMilli());
86+
final var expectedDate = LocalDate.of(2017, Month.MAY, 16);
87+
final var actualDate = LocalDate.ofInstant(extractor().getUploadDate().getInstant(),
88+
ZoneOffset.UTC);
89+
assertEquals(expectedDate, actualDate);
9390
}
9491

9592
@Test

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelLocalizationTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.schabi.newpipe.extractor.localization.Localization;
1414
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1515

16+
import java.time.LocalDateTime;
17+
import java.time.ZoneId;
1618
import java.time.format.DateTimeFormatter;
1719
import java.time.temporal.ChronoUnit;
1820
import java.util.LinkedHashMap;
@@ -73,7 +75,9 @@ private void testLocalizationsFor(final String channelUrl) throws Exception {
7375
+ "\n:::: " + item.getStreamType() + ", views = " + item.getViewCount();
7476
final DateWrapper uploadDate = item.getUploadDate();
7577
if (uploadDate != null) {
76-
final String dateAsText = dateTimeFormatter.format(uploadDate.offsetDateTime());
78+
final var dateTime = LocalDateTime.ofInstant(uploadDate.getInstant(),
79+
ZoneId.systemDefault());
80+
final String dateAsText = dateTimeFormatter.format(dateTime);
7781
debugMessage += "\n:::: " + item.getTextualUploadDate() +
7882
"\n:::: " + dateAsText;
7983
}

0 commit comments

Comments
 (0)