Commit Graph

35 Commits

Author SHA1 Message Date
Orgad Shaneh
687466ac47 Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
2017-06-20 11:32:02 +03:00
Christian Stenger
cce1e130d7 AutoTest: Fix handling of multiple build targets
If project files are not mapped 1:1 to targets the result
of the chosen executable was more or less random.
Try to handle multiple targets as correct as possible by
checking for build targets already where we still know
which files are part of the respective test cases.

Task-number: QTCREATORBUG-17783
Task-number: QTCREATORBUG-18357
Change-Id: I82dcc26bf52c9918e2727b439a719af08879ef49
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:14:55 +00:00
Christian Stenger
a9d511ff7d AutoTest: Unify TestTreeItem::modify*() functions
Change-Id: Ia234fb6a8a8466c039060f6f00b1a5e3dea2af9e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-02 10:14:28 +00:00
Christian Stenger
cccc6b37ec AutoTest: Remove not needed code
As this functionality had been simplified GTest* classes had been
ignored. Continue the simplification and finally remove now useless
code and file.

Change-Id: I89170cd5f05bb93bf30a05fdbf5370012bc9741a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-19 10:02:55 +00:00
Christian Stenger
23398229e9 AutoTest: Modernize code
* remove unnecessary QLatin1String where possible
* foreach
* nullptr
* bad naming of static members

Change-Id: If0f7c6839be4d2efbfef6f7f0775d2034775bd90
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:01:36 +00:00
Christian Stenger
4ae49fb856 AutoTest: Make data tags checkable
Change-Id: I9a1e8c9524a3f8beb3851646fb7b6bf7c8cac557
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-12 06:47:40 +00:00
Christian Stenger
b0bf07c64a AutoTest: Modernize code a bit
Change-Id: Ie56f6e5cb8a4f1962bd8df5e57214911ae609921
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-29 12:27:14 +00:00
Robert Loehning
04003d81b0 AutoTest: Improve string for translation
Change-Id: I2cb2ed0ade1a7bfa3b07855b8114aa1fd1de2d62
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-08 10:44:32 +00:00
Orgad Shaneh
82c6eedfae Autotest: Remove use of deprecated Qt::ItemIsTristate
Change-Id: I66fd41e3b63ef43359ba4dea61f7bc9bd0b683f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 07:21:12 +00:00
hjk
e48451b0a3 TreeModel: Consolidate child()/childAt() and rowCount()/childCount()
We never used the possibility to overload the virtual child() and
rowCount() functions, it's unlikely to be needed in future.

Change-Id: I7ebdf4dfc70bb0bcadea9ef3fb88f16632a95696
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-07 13:39:15 +00:00
hjk
b281d6dad7 TreeModel: Introduce a StaticTreeItem
This splits out the case of static string displays from the
TreeItem base class, making the base more lightweight.

Change-Id: If1f442011ec60094399a41b65d9b5015f432f82e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-15 08:55:16 +00:00
Christian Stenger
2f8b4b3fbf AutoTest: Move test framework related code...
...into files and respective sub folders.

Change-Id: Ic80d693bd73993a6e74b6d422349e47276e8cb6e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-01 11:37:32 +00:00
Christian Stenger
ef2f37f6d5 AutoTest: Decouple item and model once more
Change-Id: I301f17dd8be7feb9dc61f483277a4835aea937af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 11:24:27 +00:00
Christian Stenger
aaf7181c0d AutoTest: Fix execution of test sets
Broken by 842ab2a551

Change-Id: If34eb0ae726f172b049473b8dd1c92e7b771968c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 06:01:51 +00:00
Christian Stenger
317a1d14d7 AutoTest: Unify test parse result implementations
This is also necessary for a uniform handling while adding or
updating test tree items, which in turn makes it possible to
separate model and items once more.

Change-Id: I84ff558d23490c8734b22062f00e03e8c06d6720
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 06:01:44 +00:00
Christian Stenger
70394b29af AutoTest: Make delegate independent from sub-classes...
...of TestTreeItem.

Change-Id: Ieacaeff64dced5e2a4dd3bd3a853cfb1081f5146
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-19 12:10:48 +00:00
Christian Stenger
f429b95b0e AutoTest: Separate test configurations
Change-Id: I573b703b4f9ec246cf429d2602b6dc0b8174b50f
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-19 12:10:38 +00:00
Christian Stenger
0496473c55 AutoTest: More separation of test tree item and model
Change-Id: Icb096a1af749e74a3f47bc5235a4c0f0c2ce6023
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-18 11:13:20 +00:00
Christian Stenger
b58a10dfff AutoTest: Split off TestParseResult...
...to allow different approaches for different test frameworks.

Change-Id: I16f101fb3f702a0db00cffe33e0d83cd4ea28c99
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:48:43 +00:00
Christian Stenger
842ab2a551 AutoTest: Move functionality from model to item classes
Another preparation for having a consistent interface later on.

Change-Id: I573e45101016048de916f4d321b326a24efbe4ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:31:22 +00:00
Takumi ASAKI
8d3e0a1017 AutoTest: tr()-Fixes
Do not use QObject::tr().

Change-Id: If92f36166f29defd3501410efeed8e6f68dc896d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-03 13:28:26 +00:00
Alessandro Portale
574ab3c07b AutoTest: Remove duplicated icons
This change makes AutoTest reuse the equivalent icons from CPlusPlus.

Change-Id: I01f8c30798c7f1b622469ae1f25418e9d1bd8a93
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 13:15:06 +00:00
Francois Ferrand
3d82a67484 Autotests: emit testTreeModelChanged when new tests are added.
The signal used to be emitted only on reset or when tests are actually removed during sweep phase:
thus the 'run tests' button in test panel stayed disabled if the panel was opened while tests were
scanned.

Change-Id: I274c9d03f1e1140c8aa375f92465c5a0c866cd62
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-14 12:39:36 +00:00
Christian Stenger
c9f595bfc7 AutoTest: Fix variable name
This variable had been forgotten during the refactoring.

Change-Id: Icafe84ea04dec5822d2879db87f3b7334020924e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 10:08:45 +00:00
Christian Stenger
ba61f2946d AutoTest: Add some gtest related settings
This patch enables execution of disabled tests, repetition of
test runs and shuffling of test sets.

Change-Id: I3668afde5766d18acdf1afb7edd913655b13a76c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-02-26 09:40:46 +00:00
Christian Stenger
25d63d8556 AutoTest: Support typed gtests as well
Change-Id: I5e904ef50c76560df8b63fc766a2b78b90bf73cc
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:31 +00:00
David Schulz
8e5af55b55 AutoTest: Add convenient function to modify line and column.
Change-Id: Ica5fe4a8048b8faf75767bddb36a062ec438fcfe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-26 09:40:24 +00:00
Christian Stenger
36f6a5580f AutoTest: Unify handling of test tree items...
...and let specialized items handle its specialization by itself.

Change-Id: I988ce3c610bef68933b9102bb39ae4723add3a99
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:16 +00:00
Christian Stenger
009eef4e0d AutoTest: Separate TestTreeItems
Change-Id: I7592365832c6a24c9edc38c6fd3e38122711f2a4
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:06 +00:00
Christian Stenger
ac659dd25a AutoTest: Create new tree items only if necessary...
...otherwise update existing. This reduces the number of items
that would get created or destroyed especially while modifying
code or just open/close test related documents.

Change-Id: Ia6a03ec33550c8c28e5120422e0f68fa428c1020
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-16 11:59:09 +00:00
Christian Stenger
4a3b63c1d9 AutoTest: Remove unused code
Change-Id: I54a4666ab4619059fc5ad7a2597e10344c376a5b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-08 10:27:02 +00:00
Christian Stenger
fd4d1c801f AutoTest: Fix wrong copying of children
Change-Id: I1674ab75f7a019d4ea21ccc7449ba1f7b2c8e26f
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-01 08:31:48 +00:00
Christian Stenger
7a331b8c94 AutoTest: Provide mark and sweep functions
Actually they are not used, this is a preparation for later patches.

Change-Id: I25f43dd7dba06068ca9e39ccd4153361a7746304
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-01 08:31:43 +00:00
Christian Stenger
1caeb9bb63 AutoTest: Store referencing file inside test tree item
This duplicates (temporarily) the information for referencing files,
but the cache inside the parser will be removed within a later patch.

Change-Id: I7377864547f0d9ce074fa409b9c12067c4329d40
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-01 08:31:28 +00:00
Christian Stenger
15b4e6fc91 Delete unneeded and prepare directory structure...
...to get plugin's repository more easily integrated
into QC's repository.

Change-Id: I10243bb4283623ae951e799feacaa15915678e04
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-22 14:07:19 +00:00