From 542a225ba3449776b4c4c427f29d5ba091ae075c Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 6 May 2017 23:21:47 +0200 Subject: [PATCH] Fixed a couple mistakes, latest minitest version compliance --- generator/models/dual.py | 2 +- test.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/generator/models/dual.py b/generator/models/dual.py index ff4365c..5924434 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -100,7 +100,7 @@ def geticon(datatype): def menuitem(text,link,datatype): "Generate a menu link" - print (datatype) + #print (datatype) return """
  • {text}
  • """.format(text=text,link=link,datatype=geticon(datatype)) def makeSubNodelist(subnode,lang,getdatatype): diff --git a/test.py b/test.py index 0fe221e..3284a3c 100644 --- a/test.py +++ b/test.py @@ -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()