Merge pull request #1180 from timponce/master

Implement Issue #1179 - Tests for Leap Year Plugin

jarviscli/plugins/leap_year.py

@@ -3,19 +3,22 @@
 
 @plugin("leap year")
 def leap_year(jarvis, s):
-    leap = False
-    from collections import namedtuple
-    year = int(input("Enter a year: ").strip())
+    if s == "":
+        s = jarvis.input("Enter a year: ")
     try:
-        year = int(year)
-    except:
-        jarvis.say('Wrong input. Please make sure you just enter an integer e.g. \'2012\'.')
-
-    if (year % 400 == 0) and (year % 100 == 0) or (year % 4 ==0) and (year % 100 != 0):
-        leap = True
-    if leap:
-        jarvis.say(str(year) + ' is a leap year.')
+        year = int(s)
+    except ValueError:
+        jarvis.say(
+            "Wrong input. Please make sure you just enter an integer e.g. '2012'."
+        )
+        return
     else:
-        jarvis.say(str(year) + ' is not a leap year.')
-
-
+        if (
+            (year % 400 == 0)
+            and (year % 100 == 0)
+            or (year % 4 == 0)
+            and (year % 100 != 0)
+        ):
+            jarvis.say(f"{year} is a leap year.")
+        else:
+            jarvis.say(f"{year} is not a leap year.")

jarviscli/tests/test_leap_year.py

@@ -0,0 +1,35 @@
+import unittest
+from tests import PluginTest
+from plugins import leap_year
+
+
+class LeapYearTest(PluginTest):
+    def setUp(self):
+        self.test = self.load_plugin(leap_year.leap_year)
+
+    def test_divisible_by_400_and_100(self):
+        self.test.run("2000")
+        self.assertEqual(self.history_say().last_text(), "2000 is a leap year.")
+
+    def test_divisible_by_100_and_not_400(self):
+        self.test.run("1900")
+        self.assertEqual(self.history_say().last_text(), "1900 is not a leap year.")
+
+    def test_divisible_by_4_and_not_100(self):
+        self.test.run("2008")
+        self.assertEqual(self.history_say().last_text(), "2008 is a leap year.")
+
+    def test_not_divisible_by_4(self):
+        self.test.run("2017")
+        self.assertEqual(self.history_say().last_text(), "2017 is not a leap year.")
+
+    def test_invalid_input(self):
+        self.test.run("abc")
+        self.assertEqual(
+            self.history_say().last_text(),
+            "Wrong input. Please make sure you just enter an integer e.g. '2012'.",
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()