Add test for mixedNumberWordToLong method

Add Billion to mixedNumberWordToLong
TeamNewPipe · Sep 17, 2019 · 6d504e0 · 6d504e0
1 parent 06016d1
commit 6d504e0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
@@ -43,14 +43,17 @@ public static String removeNonDigitCharacters(String toRemove) {
     public static long mixedNumberWordToLong(String numberWord) throws NumberFormatException, ParsingException {
         String multiplier = "";
         try {
-            multiplier = Parser.matchGroup("[\\d]+([\\.,][\\d]+)?([KMkm])+", numberWord, 2);
+            multiplier = Parser.matchGroup("[\\d]+([\\.,][\\d]+)?([KMBkmb])+", numberWord, 2);
         } catch(ParsingException ignored) {}
-        double count = Double.parseDouble(Parser.matchGroup1("([\\d]+([\\.,][\\d]+)?)", numberWord));
+        double count = Double.parseDouble(Parser.matchGroup1("([\\d]+([\\.,][\\d]+)?)", numberWord)
+                .replace(",", "."));
         switch (multiplier.toUpperCase()) {
             case "K":
                 return (long) (count * 1e3);
             case "M":
                 return (long) (count * 1e6);
+            case "B":
+                return (long) (count * 1e9);
             default:
                 return (long) (count);
         }

diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/utils/UtilsTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/utils/UtilsTest.java
@@ -0,0 +1,18 @@
+package org.schabi.newpipe.extractor.utils;
+
+import com.grack.nanojson.JsonParserException;
+import org.junit.Test;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import static org.junit.Assert.assertEquals;
+
+public class UtilsTest {
+    @Test
+    public void testMixedNumberWordToLong() throws JsonParserException, ParsingException {
+        assertEquals(10, Utils.mixedNumberWordToLong("10"));
+        assertEquals(10.5e3, Utils.mixedNumberWordToLong("10.5K"), 0.0);
+        assertEquals(10.5e6, Utils.mixedNumberWordToLong("10.5M"), 0.0);
+        assertEquals(10.5e6, Utils.mixedNumberWordToLong("10,5M"), 0.0);
+        assertEquals(1.5e9, Utils.mixedNumberWordToLong("1,5B"), 0.0);
+    }
+}