Merge pull request #338 from wb9688/parse-duration-string-test

Add tests for parseDurationString()
TeamNewPipe · Jun 15, 2020 · 92f6754 · 92f6754
2 parents e02d3c3 + 33b1121
commit 92f6754
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -142,9 +142,10 @@ public static long parseDurationString(String input)
             default:
                 throw new ParsingException("Error duration string with unknown format: " + input);
         }
-        return ((((Long.parseLong(Utils.removeNonDigitCharacters(days)) * 24)
-                + Long.parseLong(Utils.removeNonDigitCharacters(hours)) * 60)
-                + Long.parseLong(Utils.removeNonDigitCharacters(minutes))) * 60)
+
+        return ((Long.parseLong(Utils.removeNonDigitCharacters(days)) * 24
+                + Long.parseLong(Utils.removeNonDigitCharacters(hours))) * 60
+                + Long.parseLong(Utils.removeNonDigitCharacters(minutes))) * 60
                 + Long.parseLong(Utils.removeNonDigitCharacters(seconds));
     }
 

diff --git a/...src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelperTest.java b/...src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelperTest.java
@@ -5,9 +5,11 @@
 import org.schabi.newpipe.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class YoutubeParsingHelperTest {
@@ -27,4 +29,11 @@ public void testAreHardcodedYoutubeMusicKeysValid() throws IOException, Extracti
         assertTrue("Hardcoded YouTube Music keys are not valid anymore",
                 YoutubeParsingHelper.areHardcodedYoutubeMusicKeysValid());
     }
+
+    @Test
+    public void testParseDurationString() throws ParsingException {
+        assertEquals(1162567, YoutubeParsingHelper.parseDurationString("12:34:56:07"));
+        assertEquals(4445767, YoutubeParsingHelper.parseDurationString("1,234:56:07"));
+        assertEquals(754, YoutubeParsingHelper.parseDurationString("12:34 "));
+    }
 }