Fix some issues

Author: Isira-Seneviratne

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

@@ -36,10 +36,6 @@ public DateWrapper(@Nonnull final Instant instant, final boolean isApproximation
         this.isApproximation = isApproximation;
     }
 
-    public DateWrapper(@Nonnull final LocalDateTime dateTime) {
-        this(dateTime, false);
-    }
-
     public DateWrapper(@Nonnull final LocalDateTime dateTime, final boolean isApproximation) {
         this(dateTime.atZone(ZoneId.systemDefault()).toInstant(), isApproximation);
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -230,7 +230,7 @@ public DateWrapper getUploadDate() throws ParsingException {
 
         return parseOptionalDate(dateText, "MMM dd, yyyy")
                 .or(() -> parseOptionalDate(dateText, "dd MMM yyyy"))
-                .map(DateWrapper::new)
+                .map(date -> new DateWrapper(date.atStartOfDay(), true))
                 .orElseThrow(() ->
                     new ParsingException("Could not parse upload date \"" + dateText + "\""));
     }

extractor/src/test/java/org/schabi/newpipe/extractor/localization/TimeAgoParserTest.java

@@ -12,7 +12,6 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.Month;
-import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -43,15 +42,14 @@ void parseTimeAgo(final ParseTimeAgoTestData testData) {
         final var now = LocalDateTime.of(2020, Month.JANUARY, 1, 1, 1, 1);
         final var parser = TimeAgoPatternsManager.getTimeAgoParserFor(Localization.DEFAULT, now);
         final var expected = testData.getExpectedApplyToNow().apply(now);
-        final var zoneId = ZoneId.systemDefault();
 
         assertAll(
             Stream.of(
                     testData.getTextualDateLong(),
                     testData.getTextualDateShort())
                 .map(textualDate -> () -> assertEquals(
                     expected,
-                    LocalDateTime.ofInstant(parser.parse(textualDate).getInstant(), zoneId),
+                    parser.parse(textualDate).getLocalDateTime(),
                     "Expected " + expected + " for " + textualDate
                 ))
         );

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

@@ -5,7 +5,6 @@
 import org.schabi.newpipe.extractor.InfoItemsCollector;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.MetaInfo;
-import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.Frameset;
@@ -16,7 +15,6 @@
 
 import javax.annotation.Nullable;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -194,19 +192,18 @@ public void testViewCount() throws Exception {
     @Test
     @Override
     public void testUploadDate() throws Exception {
-        final DateWrapper dateWrapper = extractor().getUploadDate();
+        final var dateWrapper = extractor().getUploadDate();
+        final var expectedDate = expectedUploadDate();
 
-        if (expectedUploadDate() == null) {
+        if (expectedDate == null) {
             assertNull(dateWrapper);
         } else {
             assertNotNull(dateWrapper);
 
-            final var expectedDateTime = LocalDateTime.parse(expectedUploadDate(),
+            final var expectedDateTime = LocalDateTime.parse(expectedDate,
                     DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
-            final var actualDateTime = LocalDateTime.ofInstant(dateWrapper.getInstant(),
-                    ZoneId.systemDefault());
 
-            assertEquals(expectedDateTime, actualDateTime);
+            assertEquals(expectedDateTime, dateWrapper.getLocalDateTime());
         }
     }
 

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

@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.Month;
-import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.List;
 
@@ -84,8 +83,7 @@ public List<String> expectedDescriptionContains() {
     @Test
     public void testUploadDate() throws ParsingException {
         final var expectedDate = LocalDate.of(2017, Month.MAY, 16);
-        final var actualDate = LocalDate.ofInstant(extractor().getUploadDate().getInstant(),
-                ZoneOffset.UTC);
+        final var actualDate = extractor().getUploadDate().getLocalDateTime().toLocalDate();
         assertEquals(expectedDate, actualDate);
     }
 

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

@@ -13,8 +13,6 @@
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.LinkedHashMap;
@@ -75,11 +73,8 @@ private void testLocalizationsFor(final String channelUrl) throws Exception {
                         + "\n:::: " + item.getStreamType() + ", views = " + item.getViewCount();
                 final DateWrapper uploadDate = item.getUploadDate();
                 if (uploadDate != null) {
-                    final var dateTime = LocalDateTime.ofInstant(uploadDate.getInstant(),
-                            ZoneId.systemDefault());
-                    final String dateAsText = dateTimeFormatter.format(dateTime);
-                    debugMessage += "\n:::: " + item.getTextualUploadDate() +
-                            "\n:::: " + dateAsText;
+                    final String dateStr = dateTimeFormatter.format(uploadDate.getLocalDateTime());
+                    debugMessage += "\n:::: " + item.getTextualUploadDate() + "\n:::: " + dateStr;
                 }
                 if (DEBUG) System.out.println(debugMessage + "\n");
             }