diff --git a/tests/integreren/afstandTest.py b/tests/integreren/afstandTest.py index fbafe17..e33c8a1 100644 --- a/tests/integreren/afstandTest.py +++ b/tests/integreren/afstandTest.py @@ -12,6 +12,7 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) except ImportError: pass diff --git a/tests/integreren/histogramTest.py b/tests/integreren/histogramTest.py index dc523a6..bec66e0 100644 --- a/tests/integreren/histogramTest.py +++ b/tests/integreren/histogramTest.py @@ -13,7 +13,9 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) + lib.neutralizeFunction(plt.plot) except ImportError: pass diff --git a/tests/integreren/montecarloTest.py b/tests/integreren/montecarloTest.py index 161fa76..56160c8 100644 --- a/tests/integreren/montecarloTest.py +++ b/tests/integreren/montecarloTest.py @@ -13,8 +13,9 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") - lib.neutralizeFunction(plt.pause) lib.neutralizeFunction(matplotlib.use) + lib.neutralizeFunction(plt.pause) + lib.neutralizeFunction(plt.plot) except ImportError: pass diff --git a/tests/integreren/nulpuntenTest.py b/tests/integreren/nulpuntenTest.py index f3acf98..2016947 100644 --- a/tests/integreren/nulpuntenTest.py +++ b/tests/integreren/nulpuntenTest.py @@ -12,7 +12,9 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) + lib.neutralizeFunction(plt.plot) except ImportError: pass diff --git a/tests/integreren/plotTest.py b/tests/integreren/plotTest.py index 7d217dd..d15f642 100644 --- a/tests/integreren/plotTest.py +++ b/tests/integreren/plotTest.py @@ -20,6 +20,7 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) except ImportError: pass diff --git a/tests/integreren/randomwiskundeTest.py b/tests/integreren/randomwiskundeTest.py index 89678e4..755861d 100644 --- a/tests/integreren/randomwiskundeTest.py +++ b/tests/integreren/randomwiskundeTest.py @@ -8,7 +8,3 @@ def correctAmount(test): test.test = lambda : assertlib.numberOnLine(math.e, lib.getLine(lib.outputOf(_fileName), 0), deviation = 0.0027) test.description = lambda : "Geeft de correcte gemiddeld aantal worpen" test.succes = lambda info : "komt dit getal bekend voor?" - - - - diff --git a/tests/integreren/riemannTest.py b/tests/integreren/riemannTest.py index 03938a3..f0fdc0e 100644 --- a/tests/integreren/riemannTest.py +++ b/tests/integreren/riemannTest.py @@ -13,7 +13,9 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) + lib.neutralizeFunction(plt.plot) except ImportError: pass diff --git a/tests/integreren/twitterTest.py b/tests/integreren/twitterTest.py index 27d1be0..194dc40 100644 --- a/tests/integreren/twitterTest.py +++ b/tests/integreren/twitterTest.py @@ -13,7 +13,9 @@ def before(): matplotlib.use("Agg") import matplotlib.pyplot as plt plt.switch_backend("Agg") + lib.neutralizeFunction(matplotlib.use) lib.neutralizeFunction(plt.pause) + lib.neutralizeFunction(plt.plot) except ImportError: pass @@ -60,6 +62,13 @@ def correctFunc1(test): # ^---- Filter global code from source file ----- - test.test = lambda : assertlib.between(lib.getFunction("twitter", _fileName)(), 0.82, 0.83) + def testMethod(): + import time + s = time.time() + res = assertlib.between(lib.getFunction("twitter", _fileName)(), 0.82, 0.83) + print(time.time() - s) + return res + + test.test = testMethod test.description = lambda : "twitter geeft het juiste antwoord" test.timeout = lambda : 90