add default checks

Author: stgm

tests/_extensions.py

@@ -6,7 +6,16 @@
 import subprocess
 import re
 
-@t.test(1000)
+from _notAllowedCode import *
+
+@t.test(0)
+def tabs_ok(test):
+    test.description = lambda: "het bestand is in orde"
+    test.test = lambda: (
+        notAllowedCode(test, lib.source(test.fileName), {'tab': '	'})
+    )
+
+@t.test(1)
 def mypy_ok(test):
     def testMethod():
         p = subprocess.run(['mypy', '--strict', '--ignore-missing-imports', test.fileName], capture_output=True, universal_newlines=True)
@@ -19,7 +28,7 @@ def report(output):
     test.test = testMethod
     test.fail = report
 
-@t.test(1001)
+@t.test(2)
 def doctest_ok(test):
     def testMethod():
         with open(test.fileName, 'r') as source_file:

tests/_notAllowedCode.py

@@ -0,0 +1,21 @@
+import checkpy.tests as t
+import checkpy.lib as lib
+import checkpy.assertlib as assertlib
+
+def notAllowedCode(test, source, notAllowed):
+    source_no_comments = lib.removeComments(source)
+
+    abc = []
+
+    for element in notAllowed:
+        if notAllowed[element] in source_no_comments:
+            abc.append(element)
+
+
+    if len(abc) > 0:
+        warning = "let op dat je geen " + ", ".join(abc) + " gebruikt"
+        test.fail = lambda info : warning
+        test.success = lambda info : warning
+        return False
+
+    return True

tests/cafeineTest.py

@@ -4,12 +4,10 @@
 
 from _extensions import *
 
-language = "en"
-
 def expectedOutput(target, args):
     return f"print 'Je krijgt {target} cafeine binnen.' bij {str(args)} als invoer"
 
-@t.test(1)
+@t.test(10)
 def calculatesZeroCaffeine(test):
     args = [0, 0, 0, 0]
     target = "0 mg"
@@ -21,7 +19,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(2)
+@t.test(20)
 def calculatesCoffee(test):
     args = [1, 0, 0, 0]
     target = "90 mg"
@@ -33,7 +31,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(2)
+@t.test(20)
 def calculatesTea(test):
     args = [0, 1, 0, 0]
     target = "45 mg"
@@ -45,7 +43,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(2)
+@t.test(20)
 def calculatesEnergy(test):
     args = [0, 0, 1, 0]
     target = "80 mg"
@@ -57,7 +55,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(2)
+@t.test(20)
 def calculatesCola(test):
     args = [0, 0, 0, 1]
     target = "40 mg"
@@ -69,7 +67,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(3)
+@t.test(30)
 def calculatesSomeCafeine(test):
     args = [1, 2, 3, 4]
     target = "580 mg"

tests/calculatorTest.py

@@ -4,7 +4,7 @@
 
 from _extensions import *
 
-@t.test(0)
+@t.test(10)
 def checks_answer0(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["3 + 5"],
@@ -14,7 +14,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : "3 + 5 = 8.0"
 
-@t.test(1)
+@t.test(20)
 def checks_answer1(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["19 - 6"],
@@ -24,7 +24,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : "19 - 6 = 13.0"
 
-@t.test(2)
+@t.test(30)
 def checks_answer2(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["6 - 19"],
@@ -35,7 +35,7 @@ def testMethod():
     test.description = lambda : "6 - 19 = -13.0"
 
 
-@t.test(3)
+@t.test(40)
 def checks_answer3(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["12 * 23"],
@@ -45,7 +45,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : "12 * 23 = 276.0"
 
-@t.test(4)
+@t.test(50)
 def checks_answer4(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["6 / 4"],
@@ -56,7 +56,7 @@ def testMethod():
     test.description = lambda : "6 / 4 = 1.5"
 
 
-@t.test(5)
+@t.test(60)
 def checks_answer5(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["-8 * 12"],

tests/etenstijdTest.py

@@ -4,34 +4,10 @@
 
 from _extensions import *
 
-language = "en"
-
 def expectedOutput(target, args):
-    if language == "nl":
-        return f"Bepaalt correct de tijd voor {target[0]}." 
-    else:
-        return f"Correctly determines the time for {target[1]}." 
-
-@t.test(0)
-def validFile(test):
-    def testMethod():
-        output = lib.outputOf(test.fileName, stdinArgs=["7:01"],
-                    overwriteAttributes = [("__name__", "__main__")])
-        if "ontbijt" in output:
-            global language
-            language = "nl"
-        elif not "breakfast" in output:
-            return False, "Output not recognized; please double check examples on the assignment page."
-        return asserts.fileExists(test.fileName)
-
-    test.test = testMethod
-    test.description = lambda : (
-        "Het bestand is in orde."
-        if language == "nl" else
-        "The file is valid."
-    )
+    return f"bepaalt correct de tijd voor {target[0]}" 
 
-@t.test(1)
+@t.test(10)
 def checks_breakfast(test):
     correct_meal_descriptions = ["ontbijt", "breakfast"]
     def testMethod():
@@ -53,7 +29,7 @@ def testMethod():
     test.description = lambda : expectedOutput(correct_meal_descriptions, None)
 
 
-@t.test(2)
+@t.test(20)
 def checks_lunch(test):
     correct_meal_descriptions = ["lunch", "lunch"]
     def testMethod():
@@ -75,7 +51,7 @@ def testMethod():
     test.description = lambda : expectedOutput(correct_meal_descriptions, None)
 
 
-@t.test(3)
+@t.test(30)
 def checks_dinner(test):
     correct_meal_descriptions = ["avondeten", "dinner"]
     def testMethod():

tests/orakelTest.py

@@ -7,7 +7,7 @@
 def expectedOutput(target, args):
     return f"het antwoord '{args}' geeft de uitvoer '{target}'"
 
-@t.test(1)
+@t.test(10)
 def checks_answer0(test):
     args = "42"
     target = "Ja"
@@ -19,7 +19,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(2)
+@t.test(20)
 def checks_answer1(test):
     args = "tweeenveertig"
     target = "Ja"
@@ -31,7 +31,7 @@ def testMethod():
     test.test = testMethod
     test.description = lambda : expectedOutput(target, args)
 
-@t.test(3)
+@t.test(30)
 def checks_answer2(test):
     args = "tweeënveertig"
     target = "Ja"
@@ -57,7 +57,7 @@ def testMethod():
 #     test.test = testMethod
 #     test.description = lambda : expectedOutput(target, args)
 
-@t.test(5)
+@t.test(50)
 def checks_answer4(test):
     args = "53"
     target = "Nee"

tests/scrabbleTest.py

@@ -5,7 +5,7 @@
 from _extensions import *
 
 
-@t.test(0)
+@t.test(10)
 def checks_compute_score(test):
     def testMethod():
         compute_score = lib.getFunction("compute_score", test.fileName)
@@ -22,7 +22,7 @@ def testMethod():
     test.description = lambda: "De functie 'compute_score' werkt correct."
 
 
-@t.test(1)
+@t.test(20)
 def check_S1(test):
     targets = ["Speler 1 wint!", "Player 1 wins!"]
 
@@ -38,7 +38,7 @@ def testMethod():
     test.description = lambda: "Player 1 with 'Pizza' wins from Player 2 with 'Kaas'."
 
 
-@t.test(2)
+@t.test(30)
 def check_S2(test):
     targets = ["Speler 2 wint!", "Player 2 wins!"]
 
@@ -56,7 +56,7 @@ def testMethod():
     )
 
 
-@t.test(3)
+@t.test(40)
 def check_gelijkspel(test):
     targets = ["Gelijkspel!", "It's a tie!"]
 
@@ -74,7 +74,7 @@ def testMethod():
     )
 
 
-@t.test(4)
+@t.test(50)
 def check_gelijkspel(test):
     targets = ["Gelijkspel!", "It's a tie!"]
 

tests/temperatuurTest.py

@@ -4,7 +4,7 @@
 
 from _extensions import *
 
-@t.test(0)
+@t.test(10)
 def checks_convert_temperature(test):
     def testMethod():
         convert_temperature = lib.getFunction("convert_temperature", test.fileName)
@@ -31,7 +31,7 @@ def testMethod():
 #     test.description = lambda : "All of 'C', 'F', 'c' and 'f' are accepted by the program."
 
 
-@t.test(2)
+@t.test(20)
 def check_overall1(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["F", 0, 9, 3],
@@ -42,7 +42,7 @@ def testMethod():
     test.description = lambda : "The correct table is printed when converting F to C with 0 as begin temperature, 9 as end temperature and 3 as step size."
 
 
-@t.test(3)
+@t.test(30)
 def check_overall2(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["C", 0, 20, 5],
@@ -52,7 +52,7 @@ def testMethod():
     test.test = testMethod      
     test.description = lambda : "The correct table is printed when converting C to F with 0 as begin temperature, 20 as end temperature and 5 as step size."
 
-@t.test(4)
+@t.test(40)
 def check_overall3(test):
     def testMethod():
         output = lib.outputOf(test.fileName, stdinArgs=["f", 0, 9, 3],
@@ -61,4 +61,3 @@ def testMethod():
 
     test.test = testMethod
     test.description = lambda : "The correct table is printed when converting f (lowercase) to C with 0 as begin temperature, 9 as end temperature and 3 as step size."
-