From 77355baca0f628f5e95cbf1d8bf3c2475a95150f Mon Sep 17 00:00:00 2001 From: Manel Caro Date: Fri, 29 Mar 2019 14:54:24 +0100 Subject: Modify database connection object and xml parser object --- test-cli/test/helpers/setup_xml.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'test-cli/test/helpers/setup_xml.py') diff --git a/test-cli/test/helpers/setup_xml.py b/test-cli/test/helpers/setup_xml.py index 3fd9fd5..c1dc21e 100644 --- a/test-cli/test/helpers/setup_xml.py +++ b/test-cli/test/helpers/setup_xml.py @@ -1,22 +1,23 @@ import xml.etree.ElementTree as XMLParser + class XMLSetup (object): - """aaaaa""" + """XML Setup Parser""" __tree = None # Parser __dbType = None # database connection required: PgSQLConnection __dbConnectionRaw = None # Connection string in raw __dbConnectionStr = None # Connection string to use in sql object connection def __init__(self, filename): - """aaaaa""" + """Parse the file in the constructor""" self.__tree = XMLParser.parse(filename) def __del__(self): - """aaaaa""" + """Destructor do nothing""" pass - def getdbConnectionStr (self): - """aaaaa""" + def getdbConnectionStr(self): + """XML to database connection string""" if self.__dbConnectionRaw is not None: return self.__dbConnectionRaw @@ -29,7 +30,7 @@ class XMLSetup (object): return None - def getPostgresConnectionStr (self): + def getPostgresConnectionStr(self): """aaaaa""" str = self.__dbConnectionRaw del str['type'] @@ -37,4 +38,11 @@ class XMLSetup (object): def getMysqlConnectionStr (self): """aaaaa""" - pass \ No newline at end of file + pass + + def getBoard(self, key, default): + for element in self.__tree.iter('board'): + if key in element.attrib: + return element.attrib[key] + return default + -- cgit v1.1