Commit 7bb64a58 authored by Christian Stenger's avatar Christian Stenger

Squish: Move simpleFileName() into shared script

Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent d007681b
......@@ -647,3 +647,6 @@ def readFile(filename):
content = f.read()
f.close()
return content
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
......@@ -149,9 +149,6 @@ def checkUnsavedChangesContains(model, filePaths):
test.compare(set(foundItems), set(filePaths),
"Verifying whether modified (unsaved) files do match expected.")
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
def cleanup():
global testFolder
if testFolder:
......
......@@ -166,6 +166,3 @@ def revertChanges(files):
"Maybe it has not been changed at all.")
else:
test.fail("Could not open %s for reverting changes" % simpleName)
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
......@@ -140,6 +140,3 @@ def compareFileToOriginal(fileName):
origFile.close()
test.compare(originalContent, currentContent,
"Comparing original to reverted file content for '%s'" % fileName)
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
......@@ -147,6 +147,3 @@ def verifyOutline(outlinePseudoTree, datasetFileName):
return
test.passes("All nodes (%d) inside outline match expected nodes for '%s'."
% (len(expected), fileName))
def simpleFileName(navigatorFileName):
return ".".join(navigatorFileName.split(".")[-2:]).replace("\\", "")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment