From 2001fe982b38a59c7f03c3b7bb36a83ce5aaf246 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Tue, 23 Jul 2013 13:42:10 +0200
Subject: [PATCH] Squish: Moved code from aptw.py to build_utils

Change-Id: Id42cc45e9cb4a8a3aa43086ae3a427143617927c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
 tests/system/shared/build_utils.py         | 27 ++++++++++
 tests/system/suite_APTW/shared/aptw.py     | 59 ----------------------
 tests/system/suite_APTW/tst_APTW01/test.py |  1 -
 tests/system/suite_APTW/tst_APTW02/test.py |  1 -
 4 files changed, 27 insertions(+), 61 deletions(-)
 delete mode 100755 tests/system/suite_APTW/shared/aptw.py

diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py
index b9ac5b16100..4fbfd313ab6 100644
--- a/tests/system/shared/build_utils.py
+++ b/tests/system/shared/build_utils.py
@@ -225,3 +225,30 @@ def verifyBuildConfig(targetCount, currentTarget, shouldBeDebug=False, enableSha
         pass
     clickButton(waitForObject(":scrollArea.Details_Utils::DetailsButton"))
     switchViewTo(ViewConstants.EDIT)
+
+# verify if building and running of project was successful
+def verifyBuildAndRun():
+    # check compile output if build successful
+    checkCompile()
+    # check application output log
+    appOutput = logApplicationOutput()
+    if appOutput:
+        test.verify(re.search(".* exited with code \d+", str(appOutput)) and
+                    re.search('[Ss]tarting.*', str(appOutput)),
+                    "Verifying if built app started and closed successfully.")
+
+# run project for debug and release
+def runVerify(checkedTargets):
+    availableConfigs = iterateBuildConfigs(len(checkedTargets))
+    if not availableConfigs:
+        test.fatal("Haven't found build configurations, quitting")
+        invokeMenuItem("File", "Save All")
+        invokeMenuItem("File", "Exit")
+    # select debug configuration
+    for kit, config in availableConfigs:
+        selectBuildConfig(len(checkedTargets), kit, config)
+        test.log("Using build config '%s'" % config)
+        if not runAndCloseApp():
+            return
+        verifyBuildAndRun()
+        mouseClick(waitForObject(":*Qt Creator.Clear_QToolButton"))
diff --git a/tests/system/suite_APTW/shared/aptw.py b/tests/system/suite_APTW/shared/aptw.py
deleted file mode 100755
index 449924bc371..00000000000
--- a/tests/system/suite_APTW/shared/aptw.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-## Contact: http://www.qt-project.org/legal
-##
-## This file is part of Qt Creator.
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and Digia.  For licensing terms and
-## conditions see http://qt.digia.com/licensing.  For further information
-## use the contact form at http://qt.digia.com/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file.  Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Digia gives you certain additional
-## rights.  These rights are described in the Digia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-#############################################################################
-
-# shared script for APTW suite
-# helping to run and close app
-# verification
-
-# verify if building and running of project was successful
-def verifyBuildAndRun():
-    # check compile output if build successful
-    checkCompile()
-    # check application output log
-    appOutput = logApplicationOutput()
-    if appOutput:
-        test.verify(re.search(".* exited with code \d+", str(appOutput)) and
-                    re.search('[Ss]tarting.*', str(appOutput)),
-                    "Verifying if built app started and closed successfully.")
-
-# run project for debug and release
-def runVerify(checkedTargets):
-    availableConfigs = iterateBuildConfigs(len(checkedTargets))
-    if not availableConfigs:
-        test.fatal("Haven't found build configurations, quitting")
-        invokeMenuItem("File", "Save All")
-        invokeMenuItem("File", "Exit")
-    # select debug configuration
-    for kit, config in availableConfigs:
-        selectBuildConfig(len(checkedTargets), kit, config)
-        test.log("Using build config '%s'" % config)
-        if not runAndCloseApp():
-            return
-        verifyBuildAndRun()
-        mouseClick(waitForObject(":*Qt Creator.Clear_QToolButton"))
diff --git a/tests/system/suite_APTW/tst_APTW01/test.py b/tests/system/suite_APTW/tst_APTW01/test.py
index 6f9cff4aed8..7799d009e82 100644
--- a/tests/system/suite_APTW/tst_APTW01/test.py
+++ b/tests/system/suite_APTW/tst_APTW01/test.py
@@ -29,7 +29,6 @@
 
 source("../../shared/qtcreator.py")
 source("../../shared/suites_qtta.py")
-source("../shared/aptw.py")
 
 # test New Qt Gui Application build and run for release and debug option
 def main():
diff --git a/tests/system/suite_APTW/tst_APTW02/test.py b/tests/system/suite_APTW/tst_APTW02/test.py
index f77b33336d1..fcab9592d95 100644
--- a/tests/system/suite_APTW/tst_APTW02/test.py
+++ b/tests/system/suite_APTW/tst_APTW02/test.py
@@ -29,7 +29,6 @@
 
 source("../../shared/qtcreator.py")
 source("../../shared/suites_qtta.py")
-source("../shared/aptw.py")
 
 # test New Qt Quick Application build and run for release and debug option
 def main():