From 360eacd287fa28db44763566a6e021a5368f8df3 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 6 Oct 2018 02:07:40 +0200 Subject: [PATCH] Tests well implemented --- minitest | 2 +- skill_generator.py | 130 ++++++++++++++++++++++++++++----------------- 2 files changed, 81 insertions(+), 51 deletions(-) diff --git a/minitest b/minitest index 99f460e..957ecc6 160000 --- a/minitest +++ b/minitest @@ -1 +1 @@ -Subproject commit 99f460e23e16e9fbb093a23928eca264159807e4 +Subproject commit 957ecc643f50711cd1c457c01a35e620dd9d8ff5 diff --git a/skill_generator.py b/skill_generator.py index f6dafee..87e5d46 100755 --- a/skill_generator.py +++ b/skill_generator.py @@ -197,7 +197,6 @@ class testInit(minitest.simpleTestUnit): super(testInit, self).__init__("initialisation variables") def _testInit(self): - errors=0 self.currentTest("generating test values") try: @@ -245,6 +244,72 @@ class testInit(minitest.simpleTestUnit): self.addFailure("The element is not in the test values") self.addSuccess() +class testReroll(minitest.simpleTestUnit): + """Check the reroll inline message""" + def __init__(self): + super(testReroll, self).__init__("inline message") + + def _testReroll(self): + self.currentTest("regex generation") + model=""""var msg_relance="Relancer ce jet";""" + var=re.compile(' ([a-zA-Z:+_] .*?".*?)(?:\+"|;)') + self.addSuccess() + + self.currentTest('generating inline message') + roll=reroll(args) + self.addSuccess() + + # All theese MUST be in the final version, this test will be a pain + # to maintain since every addentum will be added to it manually + self.currentTest("checking generated roll") + for e in (var.findall(model)): + if roll.find(e)<0: + self.currentTest("[{}]".format(e)) + self.addFailure("missing value") + self.addSuccess() + + self.currentTest("checking model") + for e in var.findall(roll): + if model.find(e)<0: + self.currentTest("[{}]".format(e)) + self.addFailure("missing value") + self.addSuccess() + +class testWrapper(minitest.simpleTestUnit): + """Check the reroll inline message""" + def __init__(self): + super(testWrapper, self).__init__("inline message") + + def _testWrapper(self): + self.currentTest("generating wrapper") + s=len(hashedCategories) + try: + wrapper[-1] + errors+=1 + self.addFailure("Error: Element -1 shouldn't exist") + except: + self.addSuccess() + + self.currentTest("hashing categories") + for ele in wrapper: + for c in hashedCategories.keys(): + if ele.__getattr__(c)!=ele[hashedCategories[c]]: + print("Missmatch in {}, {} found, should be {}".format(ele[0],ele[hashedCategories[c]],ele.__getattr__(c))) + + for i in range(s): + if wrapper[ele[0]][i]!=ele.asList()[i] or wrapper[ele[0]][i]!=ele[i]: + print("Element {} is not identical in all representation {}!={}".format(i,wrapper[ele[0]][i],ele.asList()[i])) + self.addSuccess() + +def check_wrapper(args): + "Test the wrapper, only useful internally" + subclass=minitest.testGroup("Wrapper",term,verbose=True) + subclass.addTest(testWrapper()).test() + status=subclass.get_status() + return status['failure'] + def check_init(args): "Check the initialisation message" subclass=minitest.testGroup("Initialisation",term,verbose=True) @@ -253,58 +318,23 @@ def check_init(args): return status['failure'] def check_reroll(args): - "Check the reroll inline message" - errors=0 - model=""""var msg_relance="Relancer ce jet";""" - var=re.compile(' ([a-zA-Z:+_] .*?".*?)(?:\+"|;)') - roll=reroll(args) - - # All theese MUST be in the final version, this test will be a pain - # to maintain since every addentum will be added to it manually - #print (roll) - for e in (var.findall(model)): - if roll.find(e)<0: - errors+=1 - print("Can't find [{}] in the generated roll".format(e)) - - for e in var.findall(roll): - if model.find(e)<0: - errors+=1 - print("The expression [{}] is in the generated values but not the test".format(e)) - - return pErrors(sys._getframe().f_code.co_name,errors) - -def check_wrapper(args): - "Test the wrapper, only useful internally" - errors=0 - s=len(hashedCategories) - - try: - wrapper[-1] - errors+=1 - print("Error: Element -1 shouldn't exist") - except: - pass - for ele in wrapper: - for c in hashedCategories.keys(): - if ele.__getattr__(c)!=ele[hashedCategories[c]]: - print("Missmatch in {}, {} found, should be {}".format(ele[0],ele[hashedCategories[c]],ele.__getattr__(c))) - - for i in range(s): - if wrapper[ele[0]][i]!=ele.asList()[i] or wrapper[ele[0]][i]!=ele[i]: - print("Element {} is not identical in all representation {}!={}".format(i,wrapper[ele[0]][i],ele.asList()[i])) - errors+=1 - - return pErrors(sys._getframe().f_code.co_name,errors) + "Check the reroll inline generation" + subclass=minitest.testGroup("Reroll",term,verbose=True) + subclass.addTest(testReroll()).test() + status=subclass.get_status() + return status['failure'] def test_all(args): "Execute all tests" - mainClasses=minitest.testGroup("Main Classes",term,verbose=True,align=40) - check_init(args) - check_reroll(args) - check_wrapper(args) + #mainClasses=minitest.testGroup("Main Classes",term,verbose=True) + subclass=minitest.testGroup("Main Classes",term,verbose=True) + subclass.addTest(testReroll()) + subclass.addTest(testInit()) + subclass.addTest(testWrapper()) + + subclass.test() + status=subclass.get_status() + return status['failure'] def help(args): "Help, print the following message"