diff --git a/generator/tree_parser.py b/generator/tree_parser.py index a0579e1..0b1a256 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -45,7 +45,7 @@ class WebTree(object): self.config_path=os.path.join(self.website_path,self.path,"_config.txt") self.config_file=file_parser.parse_file(self.config_path) self.variables=self.config_file.variables - self.name=self.config_file.name #Unsure it's actually useful + self.name=self.config_file.name #Should actually, rename the file to allow customs names in _config def get_variable(self,varname,filter_lang="*"): "Get the corresponding variable" diff --git a/minitest b/minitest index 9883a4d..c2d9f23 160000 --- a/minitest +++ b/minitest @@ -1 +1 @@ -Subproject commit 9883a4dbf69ee696642fea0597eb81193d41fcef +Subproject commit c2d9f232728d0c92f894761f2dcb4e5e05acced2 diff --git a/test.py b/test.py index 3284a3c..93f0c55 100644 --- a/test.py +++ b/test.py @@ -228,8 +228,62 @@ class testDual(simple): def _testDual(self): self.currentTest("dual:icon") - print(dual.geticon('audio')) + if((dual.geticon('audio')=="music") and (dual.geticon("other")=="file")): + self.addSuccess() + else: + self.addFailure("non conform dict"+str([e for e in dual.icons.keys()])) + + dualDict={"pagetitle":"#_pagetitle_#","websitename":"#_websitename_#","menu":"\{menu\}","page":"\{page\}"} + self.testThisDictOnDis("dual:container",dualDict,dual.container,str) + + menuDict={'previous':"TESTPREV",'menulist':"\{menulist\}",'articles':"#_articles_#"} + self.testThisDictOnDis("dual:menu",menuDict,dual.menu,str) + + contentDict={"content":"\{content\}","title":"\{title\}"} + self.testThisDictOnDis("dual:content",contentDict,dual.content,str) + + menuDict={"text":"TESTOEXT","link":"NONE","datatype":"audio"} + menuDictReturn={"text":"TESTOEXT","link":"NONE","datatype":dual.geticon("audio")} + self.testThisDictOnDis("dual:menuitem",menuDict,dual.menuitem,str,menuDictReturn) + + self.currentTest("dual:makeSubNodelist") + + self.currentTest("site:loading") + site=tree_parser.makeWebsite("sites/example_website") self.addSuccess() + + status=True + linkList=dual.makeSubNodelist(site.tree,"en",model.getDataType) + nominalLinkList=['
  • Transaltionus
  • ', + '
  • First article
  • ', + '
  • Poetry
  • '] + for i in range(len(nominalLinkList)): + if linkList[i] not in nominalLinkList: + self.addFailure("link {} malformed (expected {})".format(i,nominalLinkList[i]),nonDestructive=True) + status=False + + if status: + self.addSuccess() + + def testThisDictOnDis(self,name,testDict,testFunction,returnType=str,returnDict=None): + res=testFunction(**testDict) + if returnDict==None: + returnDict=testDict + self.currentTest(name+":type") + if type(res)==returnType: + self.addSuccess() + else: + self.addFailure("wrong return type (expected {}, got {})".format(type(res),returnType)) + # print(res) + self.currentTest(name+':content') + status=True + for key,val in returnDict.items(): + if res.find(val)<0: + self.addFailure("can't find {}".format(key)) + status=False + break + if status: + self.addSuccess() # menuitem(text,link,datatype) # makeSubNodelist(subnode,lang,getdatatype)