diff --git a/generator/tree_parser.py b/generator/tree_parser.py index 0271836..e061c2c 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -148,8 +148,8 @@ class WebSubTree(WebTree): for item,langs in self.nodes.iteritems(): for lang,node in langs.iteritems(): print "{} [{}] {}".format(prefix,lang,node) - print "-----------" - print node.get_content("en") + print prefix+" +-----------" + print "{} | {}".format(prefix,node.get_content("en")) for item,langs in self.subtree.iteritems(): for lang,node in langs.iteritems(): diff --git a/minitest b/minitest index 4020369..808b0bd 160000 --- a/minitest +++ b/minitest @@ -1 +1 @@ -Subproject commit 4020369dcd554b8105e8d23d1f521a68647d81eb +Subproject commit 808b0bd20a6ad8d14f806f6549365366dc348325 diff --git a/test.py b/test.py index 97cbd4f..43d9bbf 100644 --- a/test.py +++ b/test.py @@ -10,10 +10,136 @@ from generator import * term=Terminal() unit=minitest.testUnit +simple=minitest.simpleTestUnit group=minitest.testGroup +class testParser(simple): + """Testing the file parser""" + def __init__(self,name): + super(testParser,self).__init__(name) + + def _tests_all(self): + config_langs=["*","en","fr"] + self.currentTest="parser:load" + config=file_parser.parse_file("sites/example_website/_config.txt") + self.addSucess() + + self.currentTest="parser_config" + if (type(config)==file_parser.WebPage): + self.addResult("parser_config",True,"") + else: + self.addFailure("config is supposed to be a WebPage") + + self.currentTest="parser_config:var:type" + if type(config.variables)==dict: + self.addSucess() + else: + self.addFailure("config is not a dict") + + self.currentTest="parser_config:lang" + for lang in config_langs: + if lang not in config.list_of_lang: + self.addFailure("lang {} not in config".format(lang)) + self.addSucess() + + self.currentTest="parser_config:content" + if type(config.content)==list: + for e in config.content: + if len(e)!=2: + self.addFailure("line is not formated with [text,[lang]]") + self.addSucess() + else: + self.addFailure("content is supposed to be a list of lines&langs") + + self.currentTest="parser_config:generator" + gen=config.get_next_line("*") + if type(gen)==types.GeneratorType: + self.addSucess() + else: + self.addFailure("get_next_line is supposed to be a generator") + + self.currentTest="parser_config:generator:lang" + content_by_lang={'*':[],'fr':[],'en':[]} + for line in config.content: + txt,langs=line[0],line[1] + for lang in langs: + if lang in ["fr","en"]: + content_by_lang[lang].append(txt) + elif lang=="*": + for l in config_langs: + content_by_lang[l].append(txt) + succes=True + for l in ["en","fr"]: + generator_table=[e for e in config.get_next_line(l)] + if len(content_by_lang[l])!=len(generator_table): + self.addFailure("generator and model don't have the same length [{}]".format(l)) + succes=False + for i in xrange(len(generator_table)): + if generator_table[i]!=content_by_lang[l][i]: + self.addFailure("generator and model have different content [{}:{}]".format(l,i)) + succes=False + if succes: + self.addSucess() + + self.currentTest="parser_config:generator:type" + for l in config.get_next_line("*"): + if type(l)!=str: + self.addFailure("type is supposed to be a string") + + self.currentTest="parser_file:open" + index=file_parser.parse_file("sites/example_website/index.txt") + self.addSucess() + + + self.currentTest="parser_file" + contentCheck={ + 'error':['![Alt text](/path/to/img.jpg)', "If you don't close properly something __a lot of content will be lost", '__in the generation', 'process', 'Like this'] + ,"*":['![Alt text](/path/to/img.jpg)', 'Like this'] + ,"en":['Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', '![Alt text](/path/to/img.jpg)', 'Like this'] + ,"fr": ['Loreme ipsume dolore site amete, consecteture adipisicinge elite, sede doe eiusmode tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolore ine reprehenderite ine voluptate velite esse cillume dolore eu fugiatte nulla pariature. Excepteure sinte occaecate cupidatate none proidente, sunta ine culpa qui officia deserunte mollite anime ide est laborume.', '![Alt text](/path/to/img.jpg)', 'Like this'] + ,"hidden":['![Alt text](/path/to/img.jpg)', 'Hiden text, can be used in many ways. Note that hidden is not a reserved keyword and is just treated separately in the generation process.', 'Like this'] + ,"useless":['![Alt text](/path/to/img.jpg)', 'The useless keyword is not reserved either, and since it wont be treated in the generation process, it will just be lost', 'Like this'] + } + self.addSucess() + for lang in contentCheck.keys(): + self.currentTest="parser_file:"+lang + if contentCheck[lang]==[e for e in index.get_next_line(lang)]: + self.addSucess() + else: + self.addFailure("Error text doesn't match") + + +class testTree(simple): + """docstring for testTree.""" + def __init__(self,name): + super(testTree, self).__init__(name) + + def _testTree(self): + list_of_lang=["fr","en","*"] + self.currentTest="tree:load" + webt=tree_parser.makeWebsite("sites/example_website") + self.addSucess() + + self.currentTest="tree:repr" + if repr(webt)=="WebTree @ sites/example_website/": + self.addSucess() + else: + self.addFailure("Repr incorrect") + + status=True + self.currentTest="tree:get_title" + for l in list_of_lang: + if webt.get_title(l)!="Mouaulande": + self.addFailure("lang incorrect {}".format(l)) + status=False + if status: + self.addSucess() + + print webt.get_config() + webt.print_webtree() + testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) -#testConfig=group() +#testConfig=group(name="config",terminal=term,prefix="| ") #testParser=group(name="parser",terminal=term,prefix="| ") #testTree=group(name="tree",terminal=term,prefix="| ") #testModel=group(name="model",terminal=term,prefix="| ") @@ -24,95 +150,8 @@ testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) #testParser time -class testParser(unit): - """Testing the file parser""" - def __init__(self): - super(testParser, self).__init__("file_parser") - self.results=[] - self.currentTest="" - - def addSucess(self): - self.addResult(self.currentTest,True,"") - - def addFailure(self,msg): - self.addResult(self.currentTest,False,msg) - - - def test(self): - try: - config_langs=["*","en","fr"] - #raise IOError("Impossible to load config") - self.currentTest="parser:load" - config=file_parser.parse_file("sites/example_website/_config.txt") - self.addSucess() - - self.currentTest="parser_config" - if (type(config)==file_parser.WebPage): - self.addResult("parser_config",True,"") - else: - self.addFailure("config is supposed to be a WebPage") - - self.currentTest="parser_config:var:type" - if type(config.variables)==dict: - self.addSucess() - else: - self.addFailure("config is not a dict") - - self.currentTest="parser_config:lang" - for lang in config_langs: - if lang not in config.list_of_lang: - self.addFailure("lang {} not in config".format(lang)) - self.addSucess() - - self.currentTest="parser_config:content" - if type(config.content)==list: - for e in config.content: - if len(e)!=2: - self.addFailure("line is not formated with [text,[lang]]") - self.addSucess() - else: - self.addFailure("content is supposed to be a list of lines&langs") - - self.currentTest="parser_config:generator" - gen=config.get_next_line("*") - if type(gen)==types.GeneratorType: - self.addSucess() - else: - self.addFailure("get_next_line is supposed to be a generator") - - self.currentTest="parser_config:generator:lang" - content_by_lang={'*':[],'fr':[],'en':[]} - for line in config.content: - txt,langs=line[0],line[1] - for lang in langs: - if lang in ["fr","en"]: - content_by_lang[lang].append(txt) - elif lang=="*": - for l in config_langs: - content_by_lang[l].append(txt) - succes=True - for l in ["en","fr"]: - generator_table=[e for e in config.get_next_line(l)] - if len(content_by_lang[l])!=len(generator_table): - self.addFailure("generator and model don't have the same length [{}]".format(l)) - succes=False - for i in xrange(len(generator_table)): - if generator_table[i]!=content_by_lang[l][i]: - self.addFailure("generator and model have different content [{}:{}]".format(l,i)) - succes=False - if succes: - self.addSucess() - - self.currentTest="parser_config:generator:type" - for l in config.get_next_line("*"): - if type(l)!=str: - self.addFailure("type is supposed to be a string") - #print index.content - except Exception as e: - self.addFailure(e) - - return self.results - -testVky.addTest(testParser()) +testParser("file_parser").test() +testVky.addTest(testParser("file_parser")) +testVky.addTest(testTree("tree_parser")) testVky.test()