Refactoring de la validación de los negativos

12meses12katas · Feb 7, 2012 · 34169de · 34169de
1 parent ac94e00
commit 34169de
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/diegoguemes/EneroStringCalculator/NumberSplitter.cs b/diegoguemes/EneroStringCalculator/NumberSplitter.cs
@@ -11,17 +11,11 @@ public class NumberSplitter
         private const string CUSTOM_SEPARATOR_START = "//";
         private const string CUSTOM_SEPARATOR_END = "\n";
 
-        public IEnumerable<string> SplitNumbers(string numbers)
+        public IEnumerable<int> SplitNumbers(string numbers)
         {
             string numbersPart = GetNumbersPart(numbers);
             string[] separators = GetSeparators(numbers);
-            var parsedNumbers = numbersPart.Split(separators, StringSplitOptions.RemoveEmptyEntries);
-            if(parsedNumbers.Any(n => int.Parse(n) < 0))
-            {
-                throw new ArgumentException(string.Format("Negatives not allowed: {0}",
-                                                          string.Join(",", parsedNumbers.Where(n => int.Parse(n) < 0))));
-            }
-            return parsedNumbers;
+            return numbersPart.Split(separators, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
         }
 
         private string GetNumbersPart(string numbers)

diff --git a/diegoguemes/EneroStringCalculator/StringCalculator.cs b/diegoguemes/EneroStringCalculator/StringCalculator.cs
@@ -18,9 +18,29 @@ public int Add(string numbers)
             if (string.IsNullOrEmpty(numbers))
                 return 0;
             var parsedNumbers = splitter.SplitNumbers(numbers);
-            return parsedNumbers.Sum(n => int.Parse(n));
+            ValidateNumbers(parsedNumbers);
+            return parsedNumbers.Sum();
         }
 
+        private void ValidateNumbers(IEnumerable<int> numbers)
+        {
+            var negatives = GetNegatives(numbers);
+            if (negatives.Count() > 0)
+            {
+                throw new ArgumentException(string.Format("Negatives not allowed: {0}",
+                                                          string.Join(",", negatives)));
+            }
+        }
+
+        private IEnumerable<int> GetNegatives(IEnumerable<int> numbers)
+        {
+            return numbers.Where(IsNegative);
+        }
+
+        private bool IsNegative(int number)
+        {
+            return number < 0;
+        }
 
     }
 }