Squish: Fix getEditorForFileSuffix() and simpleFileName()...

...when using filenames coming from Squish's treeview syntax.

Change-Id: I0296dbabb09af11dde5ed4716b1b1f48f05c47e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2014-06-04 09:44:20 +02:00
parent dcc3dcadac
commit 7a86928fbc
4 changed files with 14 additions and 6 deletions
+6 -1
View File
@@ -603,7 +603,12 @@ def readFile(filename):
return content
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
# try to find the last part of the given name, assume it's inside a (folder) structure
search = re.search(".*[^\\\\]\.(.*)$", navigatorFileName)
if search:
return search.group(1).replace("\\", "")
# it's just the filename
return navigatorFileName.replace("\\", "")
def clickOnTab(tabBarStr, tabText, timeout=5000):
if not waitFor("object.exists(tabBarStr)", timeout):