#4 calculator now ignores invalid hour values

app/hours_calculator.py

@@ -14,10 +14,8 @@ def add(self, *args):
 
         for hour in args:
             hour = hour.strip()
-            if hour == '':
+            if not self._is_valid_format(hour) or hour == '':
                 continue
-            if not self._is_valid_format(hour):
-                return 'Invalid hour value: "{0}"'.format(hour)
             total_minutes += self._get_calculation_strategy(hour).calculate_minutes(hour)
 
         total_hours = int(total_minutes / 60)

tests/test_hours_calculator.py

@@ -12,9 +12,6 @@ def test_add_with_no_parameters_returns_zero(self):
     def test_add_with_one_parameter_returns_that_parameter(self):
         self.assertEqual("02:53", self.calculator.add("2:53"))
 
-    # def test_add_replace_dot_with_colon(self):
-    #     self.assertEqual("02:53", self.calculator.add("2.53"))
-
     def test_add_ignore_leading_zero(self):
         self.assertEqual("02:53", self.calculator.add("02:53"))
         self.assertEqual("02:03", self.calculator.add("2:03"))
@@ -93,10 +90,7 @@ def test_round_down_decimal_inputs(self):
     def test_integration(self):
         self.assertEqual("05:02", self.calculator.add("1:65", "-1.00", '4.70', '-0.75'))
 
-    def test_invalid_inputs_return_NaN_string(self):
-        self.assertEqual("Invalid hour value: \"1:1:65\"", self.calculator.add("1:1:65"))
-        self.assertEqual("Invalid hour value: \"aaa\"", self.calculator.add("aaa"))
-        self.assertEqual("Invalid hour value: \"a:0b\"", self.calculator.add("a:0b"))
-
-    def test_if_any_one_of_the_inputs_is_invalid_return_NaN(self):
-        self.assertEqual("Invalid hour value: \"1:1:65\"", self.calculator.add("1:00", "1:1:65", "1:00", "1:00"))
+    def test_skip_invalid_inputs(self):
+        self.assertEqual("00:00", self.calculator.add("1:1:65"))
+        self.assertEqual("01:00", self.calculator.add("aaa", '1:00'))
+        self.assertEqual("01:00", self.calculator.add("1:00", 'a:0b'))