week 1 upgrades

Author: stgm

tests/cafeineTest.py

@@ -4,77 +4,74 @@
 
 from _extensions import *
 
-def expectedOutput(target, args):
-    return f"print 'Je krijgt {target} cafeine binnen.' bij {str(args)} als invoer"
-
+@t.passed(doctest_ok)
 @t.test(10)
 def calculatesZeroCaffeine(test):
+    """print 'Je krijgt 0 mg cafeine binnen.' bij [0, 0, 0, 0] als invoer"""
     args = [0, 0, 0, 0]
     target = "0 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(20)
 def calculatesCoffee(test):
+    """print 'Je krijgt 90 mg cafeine binnen.' bij [1, 0, 0, 0] als invoer"""
     args = [1, 0, 0, 0]
     target = "90 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(20)
 def calculatesTea(test):
+    """print 'Je krijgt 45 mg cafeine binnen.' bij [0, 1, 0, 0] als invoer"""
     args = [0, 1, 0, 0]
     target = "45 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(20)
 def calculatesEnergy(test):
+    """print 'Je krijgt 80 mg cafeine binnen.' bij [0, 0, 1, 0] als invoer"""
     args = [0, 0, 1, 0]
     target = "80 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(20)
 def calculatesCola(test):
+    """print 'Je krijgt 40 mg cafeine binnen.' bij [0, 0, 0, 1] als invoer"""
     args = [0, 0, 0, 1]
     target = "40 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(30)
 def calculatesSomeCafeine(test):
+    """print 'Je krijgt 580 mg cafeine binnen.' bij [1, 2, 3, 4] als invoer"""
     args = [1, 2, 3, 4]
     target = "580 mg"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args,
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)

tests/etenstijdTest.py

@@ -4,11 +4,42 @@
 
 from _extensions import *
 
-def expectedOutput(target, args):
-    return f"bepaalt correct de tijd voor {target[0]}" 
+@t.passed(doctest_ok)
+@t.test(8)
+def correct_meal_if_meal(test):
+    """de functie 'meal' geeft de juiste maaltijd voor elke tijd"""
+    def testMethod():
+        f = lib.getFunction("meal", test.fileName)
+        return (
+            f('7:30') == 'ontbijt' and
+            f('7:31') == 'ontbijt' and
+            f('07:31') == 'ontbijt' and
+            f('18:30') == 'avondeten' and
+            f('13:00') == 'lunch' and
+            f('12:00') == 'lunch'
+        )
+    test.test = testMethod
+
+@t.passed(doctest_ok)
+@t.test(9)
+def correct_none_if_no_meal(test):
+    """de functie 'meal' geeft None als er geen maaltijd van toepassing is"""
+    def testMethod():
+        f = lib.getFunction("meal", test.fileName)
+        return (
+            f('6:30') is None and
+            f('8:01') is None and
+            f('08:31') is None and
+            f('14:01') is None and
+            f('13:01') is None and
+            f('17:59') is None
+        )
+    test.test = testMethod
 
+@t.passed(doctest_ok)
 @t.test(10)
 def checks_breakfast(test):
+    """bepaalt correct de tijd voor ontbijt"""
     correct_meal_descriptions = ["ontbijt", "breakfast"]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["7:25"], overwriteAttributes = [("__name__", "__main__")])
@@ -24,14 +55,13 @@ def testMethod():
             return False
 
         return True
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(correct_meal_descriptions, None)
-
 
+@t.passed(doctest_ok)
 @t.test(20)
 def checks_lunch(test):
-    correct_meal_descriptions = ["lunch", "lunch"]
+    """bepaalt correct de tijd voor lunch"""
+    correct_meal_descriptions = ["lunch"]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["13:00"], overwriteAttributes = [("__name__", "__main__")])
         if not any([asserts.contains(output, meal) for meal in correct_meal_descriptions]):
@@ -46,13 +76,12 @@ def testMethod():
             return False
 
         return True
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(correct_meal_descriptions, None)
-
 
+@t.passed(doctest_ok)
 @t.test(30)
 def checks_dinner(test):
+    """bepaalt correct de tijd voor avondeten"""
     correct_meal_descriptions = ["avondeten", "dinner"]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["18:53"], overwriteAttributes = [("__name__", "__main__")])
@@ -72,6 +101,4 @@ def testMethod():
             return False
 
         return True
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(correct_meal_descriptions, None)

tests/orakelTest.py

@@ -4,67 +4,50 @@
 
 from _extensions import *
 
-def expectedOutput(target, args):
-    return f"het antwoord '{args}' geeft de uitvoer '{target}'"
-
+@t.passed(doctest_ok)
 @t.test(10)
 def checks_answer0(test):
+    """het antwoord '42' geeft de uitvoer 'Ja'"""
     args = "42"
     target = "Ja"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=[args],
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.exact(output.strip().split('\n')[-1], target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(20)
 def checks_answer1(test):
+    """het antwoord 'tweeenveertig' geeft de uitvoer 'Ja'"""
     args = "tweeenveertig"
     target = "Ja"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=[args],
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.exact(output.strip().split('\n')[-1], target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(30)
 def checks_answer2(test):
+    """het antwoord 'tweeënveertig' geeft de uitvoer 'Ja'"""
     args = "tweeënveertig"
     target = "Ja"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=[args],
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.exact(output.strip().split('\n')[-1], target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)
-
-# uitgecomment want dit staat niet in de opdracht, plus de string-methods
-# zijn nog niet behandeld in week 1
-# @t.test(4)
-# def checks_answer3(test):
-#     args = "TWEEENVEERTIG"
-#     target = "Ja"
-#     def testMethod():
-#         output = lib.outputOf(test.fileName, stdinArgs=[args],
-#                     overwriteAttributes = [("__name__", "__main__")])
-#         return asserts.exact(output.strip().split('\n')[-1], target)
-#
-#     test.test = testMethod
-#     test.description = lambda : expectedOutput(target, args)
 
-@t.test(50)
-def checks_answer4(test):
+@t.passed(doctest_ok)
+@t.test(40)
+def checks_answer3(test):
+    """het antwoord '53' geeft de uitvoer 'Nee'"""
     args = "53"
     target = "Nee"
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=[args],
                     overwriteAttributes = [("__name__", "__main__")])
         return asserts.exact(output.strip().split('\n')[-1], target)
-
     test.test = testMethod
-    test.description = lambda : expectedOutput(target, args)

tests/vakantieTest.py

@@ -4,82 +4,73 @@
 
 from _extensions import *
 
-def expectedOutput(target, args):
-    return f"print correct 'Jouw vakantie kost: {target}' bij {str(args)} als invoer" 
-
+@t.passed(doctest_ok)
 @t.test(10)
+def calculatesTravelCostsWithHint(test):
+    """de functie 'travel_costs' berekent correct de vervoerkosten"""
+    def testMethod():
+        travelCosts = lib.getFunction("travel_costs", test.fileName, stdinArgs=[1000, 0])(1000)
+        if travelCosts == 130:
+            return (False, 
+                    "vergeet niet om de kosten voor zowel heen als terug te berekenen"
+            )
+        elif travelCosts == 260:
+            return True
+        else:
+            return False
+    test.test = testMethod
+
+@t.passed(doctest_ok)
+@t.test(20)
 def calculatesZeroCosts(test):
+    """print correct 'Jouw vakantie kost: 0' bij [0, 0] als invoer"""
     target = "0"
     args = [0, 0]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args, overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda: expectedOutput(target, args)
-
-@t.test(20)
-def calculatesTravelCostsWithHint(test):
-  def testMethod():
-    travelCosts = lib.getFunction("travel_costs", test.fileName, stdinArgs=[1000, 0])(1000)
-    if travelCosts == 130:
-        return (False, 
-                "vergeet niet om de kosten voor zowel heen als terug te berekenen"
-                # if language == "nl" else
-                # "Don't forget to calculate costs for a round trip."
-            )
-    elif travelCosts == 260:
-        return True
-    else:
-        return False
-
-  test.test = testMethod
-  test.description = lambda : (
-    "de functie 'travel_costs' berekent correct de vervoerkosten"
-    # if language == "nl" else
-    # "The function 'travel_costs' calculates the costs of travel correctly."
-  )
 
+@t.passed(doctest_ok)
 @t.test(20)
 def calculatesTravelCosts(test):
+    """print correct 'Jouw vakantie kost: 260' bij [1000, 0] als invoer"""
     target = "260"
     args = [1000, 0]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args, overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda: expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(30)
 def calculatesSleepingCosts(test):
+    """print correct 'Jouw vakantie kost: 600' bij [0, 10] als invoer"""
     target = "600"
     args = [0, 10]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args, overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda: expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(40)
 def calculatesCosts(test):
+    """print correct 'Jouw vakantie kost: 589' bij [650, 7] als invoer"""
     target = "589"
     args = [650, 7]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args, overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda: expectedOutput(target, args)
 
+@t.passed(doctest_ok)
 @t.test(50)
 def calculatesCostsAndRoundsCorrectly(test):
+    """print correct 'Jouw vakantie kost: 371' bij [1425, 0] als invoer"""
     target = "371"
     args = [1425, 0]
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=args, overwriteAttributes = [("__name__", "__main__")])
         return asserts.contains(output.strip(), target)
-
     test.test = testMethod
-    test.description = lambda: expectedOutput(target, args)