Chain1Sequence with generics

AniriRuj · AniriRuj · commit 0b65e5faba2d · 2021-06-13T12:39:39.000-04:00
diff --git a/src/main/java/Chain1Sequence.java b/src/main/java/Chain1Sequence.java
@@ -1,29 +1,79 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class Chain1Sequence {
+public class Chain1Sequence  {
 
     public boolean isNumeric(String value){
         try {
-            Integer.parseInt(value);
+            Long.parseLong(value);
             return true;
         } catch(NumberFormatException e){
             return false;
         }
     }
 
+    //2147483647 IntegerMax
+    //4194303 &#1095;&#1080;&#1089;&#1083;&#1086;, &#1082;&#1086;&#1090;&#1086;&#1088;&#1086;&#1077; &#1074;&#1089;&#1077; &#1077;&#1097;&#1077; &#1076;&#1072;&#1077;&#1090; &#1094;&#1077;&#1087;&#1086;&#1095;&#1082;&#1091; int
+
+    public <T> T returnNumericValue(String value) {
+        if (isNumeric(value)) {
+            if (Long.parseLong(value) >= 0) {
+                if (Long.parseLong(value) <= 4194303) {
+                    return (T) Integer.valueOf(Integer.parseInt(value));
+                } else {
+                    return (T) Long.valueOf(Long.parseLong(value));
+                }
+            }
+
+            return null;
+        }
+
+        return null;
+    }
+
+
     public List<String> getExpectedValues(String value) {
+        List <String> expectedValues = new ArrayList<>();
+
+        if (returnNumericValue(value) instanceof Integer) {
+            int valueInt = Integer.parseInt(value);
+
+            expectedValues.add(0, String.valueOf(valueInt)); //expectedValues.get(0) -> F1
+
+            for (int i = 1; i < 10; i ++) {
+                valueInt = valueInt * 2;
+                expectedValues.add(i, String.valueOf(valueInt)); //expectedValues.get(i) -> Fi+1 until F10
+            }
+
+            return expectedValues;
+
+        } else if(returnNumericValue(value) instanceof Long) {
+            long valueLong = Long.parseLong(value);
+            expectedValues.add(0, String.valueOf(valueLong)); //expectedValues.get(0) -> F1
+
+            for (int i = 1; i < 10; i ++) {
+                valueLong = valueLong * 2;
+                expectedValues.add(i, String.valueOf(valueLong)); //expectedValues.get(i) -> Fi+1 until F10
+            }
+
+            return expectedValues;
+        }
+
+        return null;
+    }
+
+    public List<String> getExpectedValuesLong(String value) {
         List<String> expectedValues = new ArrayList<>();
 
         if (isNumeric(value)) {
-            int valueInt = Integer.parseInt(value);
+            long valueLong = Long.parseLong(value);
 
-            if (valueInt >= 0) {
-                expectedValues.add(String.valueOf(valueInt)); //expectedValues.get(0) -> F1
+            if (valueLong >= 0) {
+                expectedValues.add(0, String.valueOf(valueLong)); //expectedValues.get(0) -> F1
 
                 for (int i = 1; i < 10; i ++) {
-                    valueInt = valueInt * 2;
-                    expectedValues.add(i, String.valueOf(valueInt)); //expectedValues.get(i) -> Fi+1 until F10
+                    valueLong = valueLong * 2;
+                    expectedValues.add(i, String.valueOf(valueLong)); //expectedValues.get(i) -> Fi+1 until F10
                 }
 
                 return expectedValues;
@@ -34,4 +84,6 @@ public List<String> getExpectedValues(String value) {
 
         return null;
     }
+
+
 }
diff --git a/src/test/java/Chain1SequenceTest.java b/src/test/java/Chain1SequenceTest.java
@@ -42,4 +42,41 @@ public void testChain1SequenceHappyPathIntMax() {
 
         Assert.assertEquals(expectedValues, actualValues);
     }
+
+    @Test
+    public void testChain1SequenceString() {
+
+        String value = "kghsafd";
+        List<String> expectedValues = null;
+
+        Chain1Sequence chain1Sequence = new Chain1Sequence();
+        List<String> actualValues = chain1Sequence.getExpectedValues(value);
+
+        Assert.assertEquals(expectedValues, actualValues);
+    }
+
+    @Test
+    public void testChain1SequenceUnicode() {
+
+        String value = "U+263A";
+        List<String> expectedValues = null;
+
+        Chain1Sequence chain1Sequence = new Chain1Sequence();
+        List<String> actualValues = chain1Sequence.getExpectedValues(value);
+
+        Assert.assertEquals(expectedValues, actualValues);
+    }
+
+    @Test
+    public void testChain1SequenceZerosAtTheBeginning() {
+
+        String value = "00700";
+        List<String> expectedValues = List.of("700", "1400", "2800", "5600", "11200", "22400", "44800", "89600",
+                "179200", "358400");
+
+        Chain1Sequence chain1Sequence = new Chain1Sequence();
+        List<String> actualValues = chain1Sequence.getExpectedValues(value);
+
+        Assert.assertEquals(expectedValues, actualValues);
+    }
 }
