Fixed a couple mistakes, latest minitest version compliance

This commit is contained in:
Maximilien Rigaut 2017-05-06 23:21:47 +02:00
parent f4273f6821
commit 542a225ba3
2 changed files with 16 additions and 3 deletions

View File

@ -100,7 +100,7 @@ def geticon(datatype):
def menuitem(text,link,datatype):
"Generate a menu link"
print (datatype)
#print (datatype)
return """<li><a href="{link}"><i class="fa fa-{datatype} "></i>{text}</a></li>""".format(text=text,link=link,datatype=geticon(datatype))
def makeSubNodelist(subnode,lang,getdatatype):

17
test.py
View File

@ -188,7 +188,7 @@ class testModel(simple):
def __init__(self,arg):
super(testModel, self).__init__(arg)
def _testDual(self):
def _testModel(self):
self.currentTest("loading:nodes")
site=tree_parser.makeWebsite("sites/example_website")
lang="fr"
@ -207,7 +207,7 @@ class testModel(simple):
for result,filenames in batch.items():
for f in filenames:
if (result!=model.getDataType(f)):
self.addFailure("{} is not {} ({} found)".format(f,result,model.getDataType(f)))
self.addFailure("'{}' is not from type {} ({} found)".format(f,result,model.getDataType(f)))
status=False
break
if not status:
@ -221,6 +221,18 @@ class testModel(simple):
# page=model.makePage(dual,site,lang,menu,data)
#print(page)
class testDual(simple):
"""docstring for testDual."""
def __init__(self, arg):
super(testDual, self).__init__(arg)
def _testDual(self):
self.currentTest("dual:icon")
print(dual.geticon('audio'))
self.addSuccess()
# menuitem(text,link,datatype)
# makeSubNodelist(subnode,lang,getdatatype)
testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42)
#testConfig=group(name="config",terminal=term,prefix="| ")
#testParser=group(name="parser",terminal=term,prefix="| ")
@ -237,6 +249,7 @@ testParser("file_parser").test()
testVky.addTest(testParser("file_parser"))
testVky.addTest(testTree("tree_parser"))
testVky.addTest(testModel("model"))
testVky.addTest(testDual("model:dual"))
#testVky.addTest(testConfig("testConfig",config)) test a config file
testVky.test()