Commit Graph

70 Commits

Author SHA1 Message Date
Robert Loehning
eebd4579c2 Squish: Test building Quick controls
Change-Id: I51a71d18dd8b3cccc10145fdc5c9a7726c85c7d5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-15 14:24:41 +02:00
Robert Loehning
dc66a01b10 Squish: Configure old Qt Quick projects with Qt 4
Change-Id: I3a891ba8a3ca5d437c114a95fb1620a200261301
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-02 13:58:54 +02:00
Christian Stenger
03a1361f59 Squish: Explicitly set wanted kit
Change-Id: I287ce12a040a81a6392f39385c5a0c26d53b8e28
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-04-01 12:05:04 +02:00
Robert Loehning
9759d3bacb Squish: Fix modifyRunSettingsForHookIntoQtQuickUI for multiple kits
Change-Id: I3d42920edba4a750c27714d26c9143e48c17fd39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-28 10:18:06 +01:00
Christian Stenger
8a6b6c7cba Squish: Avoid AUT crash in tst_qml_outline
Change-Id: I93e8c0050dba4f0acb7b02eeeb5a0dfdddf9d02d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-20 13:05:54 +01:00
Christian Stenger
521bb9156e Squish: Use Qt5.2.1 kit if possible
Change-Id: I674c100e12c5553c2cee36ea2d78ba4e6f61a299
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-05 16:40:35 +01:00
Christian Stenger
ae781b1919 Squish: Update Qt Quick tests to reflect new available versions
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-02-19 14:38:55 +01:00
Christian Stenger
8087db30a3 Squish: Do not invoke Exit on AUT inside helper functions
Quitting the AUT should always be reserved for the main function
of a test case.

Change-Id: I1a90e7c1e327cde37280e9d3130b30216798382c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-01-28 12:22:38 +01:00
Christian Stenger
1cdb5d87c2 Squish: Update Qt Quick hooking stuff...
...to differentiate between Qt Quick 1 and Qt Quick 2 when using
no additional function on the subprocess.

Change-Id: Ia345a1503128be0c5b81a010c438009bf41d93b5
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-01-23 11:05:09 +01:00
Robert Loehning
52bff97cfa Squish: Replaced lot of signal code by one simple function
Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-01-22 10:13:02 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Robert Loehning
f5ec3f4237 Squish: Make some variables local
Change-Id: I1687ae59c6327616ee18f6120dca9d0d0ce40bcf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-01-07 15:24:57 +01:00
Christian Stenger
4b4e5f6990 Squish: Qt Quick [12] Application templates are merged
Additionally there is no more a way of creating a Qt Quick application
from an existing qml file.

Change-Id: I5c1e8d26640fa3e1b865b6cc97745d64b51edc75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-22 16:04:10 +01:00
Robert Loehning
fbeac46c60 Squish: Update number of kits
Only one kit in use now. According to dt it's gonna stay this way.

Change-Id: Id52f04db438eda8d9eebf79264c7ddd28a0f497e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-24 13:40:52 +02:00
Christian Stenger
8ff61e3036 Squish: Enable Qt5 for suite_qtquick test cases
Change-Id: I84caf3b4c47badcf444242b6fbc52090ccb5680a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-30 14:37:54 +02:00
Christian Stenger
7bb64a58f4 Squish: Move simpleFileName() into shared script
Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-29 09:16:33 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-15 13:35:01 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal()
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-02 10:13:19 +02:00
Christian Stenger
c74bb8dfca Squish: Clean up
Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-10 12:15:29 +02:00
Robert Loehning
d41e01696a Squish: Added Qt 5.0.1 Kit
Change-Id: Ia5c81254de3bd2ad3537ac3a300aa2dbe0e16015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-27 17:11:41 +01:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-22 16:52:13 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication()
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-08 10:30:37 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-06 13:49:14 +01:00
Christian Stenger
4cb9f675aa Squish: use new approach for markText()
This new approach is a bit slower than using Qt functionality,
but it's now completely relying on user-interaction.

Change-Id: I361f6f201dfff8122a11aae30204eb79967fe4ae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-28 17:07:12 +01:00
Christian Stenger
128df0f4b4 Squish: Improve Outline test
Added signal, property and function elements.

Change-Id: I3d98bb43baaec45e34cd24963e4d8b64ca624792
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-28 14:10:26 +01:00
Robert Loehning
3f570a7901 Squish: Enable testing with MSVC again
Change-Id: Ib6051caa6e3a52a611aa24c0bf0c4d89939fdd58
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-23 12:06:26 +01:00
Christian Stenger
00dab06535 Squish: Added test for QML outline
Change-Id: I6199cf22da0049319c2eaef6977884ed7f63a4fd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-18 13:58:33 +01:00
Christian Stenger
8a6d5ccd36 Squish: Fix usage of Qt Quick UI wizard
Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-05 09:30:33 +01:00
Christian Stenger
18e0363c71 Squish: Remove unnecessary calls to clean up
Change-Id: I981392e5ef3397c3b80f1031e0644f84de1445f2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-28 21:11:05 +01:00
Robert Loehning
fa655dd407 Squish: Moved editor tests to editors suite
Change-Id: I82bd92db762f7f997460ece4c2f77d0381dca6b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-19 14:21:24 +02:00
Robert Loehning
832bc738c7 Squish: Improved checks before working on projects
Change-Id: Ieb230be55b94d00be272cb84796ce8fd22f4f8f7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-27 17:32:39 +02:00
Robert Loehning
e51863ee1a Squish: More explicit name for Desktop kit
Change-Id: Ibc711e37ca71d3543a8fa8b46fb2ac7c9c5c4129
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-25 14:11:12 +02:00
Christian Stenger
77a6b71f72 Squish: Use global objects.map from inside QMLS
Change-Id: I5c37408bc3a0e232d7f2a70e01db510725f99df1
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 17:22:39 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:38 +02:00
Jan Kerekes
f22449b94a Squish: Added new test cases(4, 5) to c support suite
initial commit

Change-Id: If2fb169ac66ccbcc463e4cfef491ca4fb3e01c30
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-19 17:32:39 +02:00
Christian Stenger
5d92a73c82 Squish: Fix syntax errors
Change-Id: I61572a8369721ba4943f11f0edee236bd816e771
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-09 19:24:55 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-04-05 17:22:06 +02:00
Robert Loehning
0e0158fc3f Squish: Cleaned for-loops
Change-Id: Ide5313c8838aa7ad9ad74cbaed12872ce0a35413
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-02-22 16:58:01 +01:00
Robert Loehning
c85a456352 Squish: Additional log at the end of tst_qml_editor
Change-Id: I1d1da9b333b76e086319091ad6849eca3dc21fb9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-02-14 15:10:50 +01:00
Denis Mingulov
142cee902b TextEditor: Fix incorrect dependency to CppEditor resources
TextEditor BaseHoverHandler::addF1ToToolTip() method has used
a resource from CppEditor (:/cppeditor/images/f1.png), despite
of the inverse official dependecy in PluginSpec file and other
classes.

As it is not used anywhere else - to fix the issue f1.png and
f1.svg are moved from CppEditor to TextEditor.

Change-Id: I14b542837d6337bd08e19ad72cf4a869be08465a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-30 14:06:23 +01:00
Christian Stenger
591754be7e Squish: Fix minor bugs (mostly on Mac)
This avoids some timing issues as well as a problem
I only saw on Mac: Sometimes Squish fails inside
placeCursorToLine() with 'I don't know how to type on
object of type QmlJSEditor::QmlJSTextEditorWidget'.

Change-Id: Ifc192914375fb37362fa31399be4972c9ce50b92
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-27 13:33:10 +01:00
Robert Loehning
c14a4756a9 Squish: Refactored openContextMenuOnTextCursorPosition()
Change-Id: Ie7a903794c11ed32cc1786c66ee0fa8d654a93f2
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-24 17:50:13 +01:00
Robert Loehning
ed51dde28b Squish: Fixed and simplified function
Change-Id: I5177202b366f8373dda05cbe8f4b1ae2e529cc5c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-13 15:20:34 +01:00
Christian Stenger
d2c9e3f40e Squish: Fix tests on Mac
Change-Id: Ibedf2bb581a5b0deb7c8e95ec792630e429f1570
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-05 14:06:57 +01:00
Christian Stenger
4e0421ed15 Squish: Add hovering test
Change-Id: I78a8e855a3b276c1549b57002ced88af3245ccdd
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-05 12:23:54 +01:00
Christian Stenger
fb21ad4d3c Squish: Added FindUsages test to QML test
Change-Id: I2571bf1e87d34495dc4299f04d310f894d22e38d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-12-13 17:10:14 +01:00
Robert Loehning
8480c3837b Squish: Added utility functions
Change-Id: I5ac2aabde688e86557ee364bb190e0230ba75822
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-12-08 13:30:16 +01:00
Christian Stenger
86ba284d06 Squish: Improved and refactored hook into
Change-Id: I05f17bbe49db7064cd6bf5131363ca0708aad087
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-12-02 15:03:18 +01:00
Robert Loehning
844b1c0490 Squish: Improved timeouts
- tuned timeouts according to expected duration
- use default timeout instead of passing equal value

Change-Id: I90bcbc5ecfd420a01e05acabc987a67b322c1f3f
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-11-29 14:34:21 +01:00
Christian Stenger
8500fa9f6a Squish: Improve hook-into sub-processes
With this patch it's possible to not only hook into the
QmlApplicationViewer (although nothing else is currently done)
and additionally to not only send the closing event to the
sub-process. You can now define a function that will be executed
on the sub-process.
Both modified tests show an example how to use it.

Change-Id: I39b9959f2cf1d519b8afeb0c479ac2d68ea20ca6
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-11-25 19:39:41 +01:00