Commit Graph

204 Commits

Author SHA1 Message Date
Christian Stenger
96f33150fe SquishTests: Adapt to changed reload behavior
The default for the reload behavior has changed, so explicitly
set the setting when necessary.

Change-Id: Ibcc3e8d2decf3f50dd3d1288c38ec3d027fbc23e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-05-16 10:21:47 +00:00
Christian Stenger
22e91fc119 SquishTests: Move waitForObject calls
Before calling clickOnTab we used explicit waitForObject calls
sometimes.
Move these waitForObject calls into clickOnTab as the workaround
inside clickOnTab lets assume that the call of waitForObject
beforehand could fail.

Change-Id: Iba3bd952bfeec3738417ab6e2ea735665acb504d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-05-15 13:56:17 +00:00
Eike Ziller
e5640386f8 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I682b330a278a329fc6294baeff6a28040abd10bc
2024-04-22 12:18:10 +02:00
Christian Stenger
8781befcfb SquishTests: Wait for combo box popup closing
On systems where some ui features may be using animations
the animation could interfere with the test.
Explicitly wait a short amount of time as there is no
easy way to achieve this.
This fixes a couple of tests on macOS.

Change-Id: Ib79b43955ebf218342db108a43979093994fba02
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-04-19 11:55:15 +00:00
Eike Ziller
310d3cc041 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/remotelinux/linuxdevice.cpp

Change-Id: Iad28a1bfa4632922931d351d2fe27757cf21dec3
2024-04-15 08:33:39 +02:00
Robert Löhning
355e3ecdf8 SquishTests: Rename object
to avoid strange errors when trying to use object.exists()

Change-Id: I919a7fe90e00daad2040b5e4f2c271de807aea16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:31:30 +00:00
Robert Löhning
95df308bc3 SquishTests: Remove compatibility code for Python 2
Change-Id: Ibcf9a76fb163aa7167ad0ef0616c39b33c30d7c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:30:00 +00:00
Eike Ziller
309a01337f Merge remote-tracking branch 'origin/13.0'
Change-Id: I12578a55fb61a3a9620c749c0b3bbbae6dcb4493
2024-04-02 14:54:30 +02:00
Robert Löhning
b887825661 SquishTests: Make sure that *UnderCursor() return a str
Without this, "line in lineUnderCursor(w)" can be False
although "line == lineUnderCursor(w)" is True.

Change-Id: I7fa6be7d237957706bf1ad93d7303c55b81f24ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-02 09:36:34 +00:00
Robert Löhning
498625520a SquishTests: Don't try removing packages directories
Seems they are not being created anymore.

Change-Id: I8b48a848793fb73ea193918c14c322d6166b2053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-07 11:12:04 +00:00
Robert Löhning
c4abbef0a8 SquishTests: Stabilize adding documentation
I noticed that Creator built on Qt 6.6.0 never needed longer than
two seconds to update the documentation after adding qtcreator.qch.
The same sources of Creator built on Qt 6.6.2 needed up to four
seconds. This subtle difference can lead to the situation that the
documentation was not yet updated when clicking "Getting Started"
in tst_WELP01, which then just displays an empty page.

Change-Id: I11ab2a902825190ed8ae27dad55a847f01ba44dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-19 11:20:26 +00:00
Robert Löhning
4dd44e01c2 SquishTests: Move definition of regexVerify() to where it's used
Change-Id: I1f06a36c62acbd6662737bdd6657981f3cf04c36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-14 15:10:30 +00:00
Eike Ziller
2e280e1c50 Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/plugins/clangcodemodel/clangdfollowsymbol.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I45b7fee1a1d784c44f2139fb1ede69190d23d6fd
2023-12-06 16:50:15 +01:00
Robert Löhning
5c1b8dee32 SquishTests: Simplify and stabilize special handling of Mac menus
- Check condition only once
- Make sure correct length is being used

Change-Id: I8c9627d91b4f022d60bae039c0478248cc30d183
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-06 07:35:12 +00:00
Christian Stenger
a149c52e99 SquishTests: Start expecting Python kits
Python kits will be new in QC13. Do not let the squish tests
fail in case it stumbles over one.

Change-Id: Ic0af56f49321f6d5800d11398d2e73b21c25e51a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-11-29 08:23:40 +00:00
Christian Stenger
1701172c30 SquishTests: Fix opening cascaded menus
Change-Id: Ieae5d24f60b9e67c602dbf43737ee3a712a7908c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-14 13:27:30 +00:00
Christian Stenger
b44a7817b8 SquishTests: Handle codec problems
Reading files depends on the system encoding and will
return a bytes object instead of a str even for text files
on some Windows setups.
Handle this by explcitly converting to str if needed.
Handle possible decoding issues by falling back to UTF8
encoding when running into decoding error while decoding
on Windows.

Change-Id: I8c1f24ff052710e4b1927399d54e321088e3b171
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 08:14:10 +00:00
Christian Stenger
a86356ce8a Squish: Fix menu handling on macOS
Some menus inside QC have special numbering - but this only
applies to Linux and Windows. On macOS we do not add this
special numbering.
Additionally this patch stabilizes the triggering of
submenus. When they get triggered it takes a split of a
second until the items inside the menu are usable.
Let squish wait until the sub menu is fully present before
trying to activate some of its items.

Change-Id: I32c688a937ada1da07506d4ebd22730e4f2bcaef
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-18 13:23:15 +00:00
Robert Löhning
0960156ada SquishTests: Fetch speedcrunch as needed
Change-Id: I4a2103bc58ae7ccdf4d728627f0346af40e6266e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-29 14:04:32 +00:00
Robert Löhning
200d3b455b SquishTests: Don't test.verify state of checkbox in getBuildIssues
- It generates a ridiculously large number of test results in
  comparison to what's actually tested
- In tst_memberoperator, it is used in waitFor(). Thus, it depends
  on timing and the number of test results varies from one
  execution to another

Change-Id: I7d4ad8f87590b4fc2dda51e9eda703961c7acd9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:35:38 +00:00
Robert Löhning
8d03220017 SquishTests: Improve log messages of exceptions
...and make them more similar to Squish's own "Error" messages.

Change-Id: If5df701d4fa01fc1c1aea94cc9778a6a5dccc44e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:33:01 +00:00
Robert Löhning
d86b091297 SquishTests: Further Python3 adaption
Fixing tests in suite_editors

Change-Id: I4e5e1adc2c4e6606232d76a794aff7a7144d5c9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-02 09:14:12 +00:00
Christian Stenger
ac4aaf5e23 SquishTests: Some Python3 adaption
Makes some tests succeed and lets a couple of tests get further
on macOS.

Change-Id: I9a3f124c094e67f51748ddae47d00897fe5259d5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-27 04:36:30 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Robert Löhning
5039ebff70 Help: SquishTests: Updates for tst_WELP01
Change-Id: I2e25f8c3368c4c00c13827f5eb70d9e3a4fc5a9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-26 07:33:16 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Robert Löhning
0c2e1cf094 Squish: Update location of Options dialog
Change-Id: Ie9df4f897621520744998c3dbd9a3c44600ba844
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-28 10:13:34 +00:00
Eike Ziller
9bf0efcbb9 Merge commit 'origin/7.0'
Change-Id: I90148816d32c81b9fef982b5010c785161d83097
2022-05-10 11:45:37 +02:00
Robert Löhning
90bde92efd Squish: Align iterateKits() better with the way we use it
Change-Id: Ib41b4e763b0df8a74fd7b073710b29640fea17db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-09 15:03:23 +00:00
Robert Löhning
02742670d3 Squish: Reduce complexity of iterateQtVersions()
By removing dead code, code which generated unused data,
unneeded generality and needless abstractions.

Change-Id: Ie271363c5446ef02f32e48a78db3d8ef9be0ed29
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-09 15:03:07 +00:00
Eike Ziller
3b2134711b Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
2022-04-20 16:12:41 +02:00
Christian Stenger
3b5ef55a32 Squish: Ensure treeview items are accessible
Before using mouseClick() we must ensure the items are really
accessible. So, scroll the view to the respective item explicitly.

Change-Id: I9e460b9f8cd64590d8a59692ba2d726495de3d92
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-04-14 04:35:28 +00:00
Christian Stenger
113c867bda Squish: Ensure we get str output from commands
Change-Id: I4e7ff85d2e2afbf714e9d16ae07e56d93cc57655
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-04-13 10:09:23 +00:00
Christian Stenger
0c1b5065c8 Squish: Remove obsolete workaround
Squish forces file dialogs to be real QFileDialogs for a long
time while testing.
Beside being no more necessary the workaround also causes
problems nowadays.

Change-Id: I211b64e61a0e28ede2a38d4d90cea5da350fa749
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-04-13 04:29:19 +00:00
Eike Ziller
780f5da7c4 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/studiowelcome/recentpresets.h
	src/plugins/studiowelcome/userpresets.h

Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
2022-03-28 15:10:11 +02:00
Christian Stenger
fcddfe5a8c Squish: Fix project wizard test
Change-Id: Iabf4463ac535cab025db3ee808e61f5fe7054095
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:08 +00:00
Christian Stenger
cc885348c7 Squish: Adapt to ui change
Change-Id: I0c896d5fa6d8fd814afec3206a2faae434da9dc7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 11:31:54 +00:00
Robert Löhning
7a8ca55f77 Squish: Introduce helper function for checking for strings
In Python3 type unicode is unavailable since it's implicit with "str".
The new functions helps porting code.

Change-Id: I5de0fa182acbbaf267ed51f66f658cb9c884f4c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 11:00:35 +00:00
Robert Löhning
5ba3eb7fcf Squish: Update for running tst_generic_highlighter
Change-Id: I262fb7a7223e235708cbc7e8e382a2448a2f8c84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-29 13:20:00 +00:00
Robert Löhning
c4ba0c2021 Squish: Update for running suite_CSUP
Change-Id: I2773f98af0a6656fcf1362b4dcd2d853cc2aea81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-27 18:47:04 +00:00
Robert Löhning
4455dd2ece Squish: Prepare tst_WELP01 for Qt 6
Working around the wildcard issue...

Change-Id: I3d3b8e0360762ea72c39a49274df271fc0090e8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:28:25 +00:00
Robert Löhning
0824aa2ce3 Squish: Use tab visibility hack on Windows, too
Change-Id: I6e5f4b75747b703ab46e2f3776b134aff8b34ac0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:26:39 +00:00
Robert Löhning
770182653c Squish: Add parentheses around all print statements
Required by Python 3.

Change-Id: Ia28491882a844d3642da38145b1ebfcfbd5883b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 10:31:19 +00:00
Christian Stenger
da53e3f994 Squish: Allow automatically created kits
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:11:26 +00:00
Robert Loehning
89d36b418a Make Help mode Squish-testable again
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-22 12:44:54 +00:00
Christian Stenger
3a97df0f61 Squish: Adapt to changed menus
Change-Id: I8557003bbc94affb018b09e6d5d36cae0f72403a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-06-04 19:53:35 +00:00
Christian Stenger
99deb21b7a Squish: Adapt verification of kits
Kits are nowadays displayed if configured, but disabled
if they do not fit for the respective project.

Change-Id: If04a20afde2fc1ada643e45d5eea33e6ace7a4f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-24 09:37:12 +00:00
Christian Stenger
ea829fa6d5 Squish: Workaround bad focus issue when using Squish
When interacting with the file dialog QC seems to lose its
focus and never gets it completely back.
This in turn makes lots of short cuts useless and (context)
menu entries disappear or being disabled.
Avoid this by explicitly closing the popup of the line edit
if there is one.

Change-Id: I79f86b3133d2d0780d73d75e15416d59f35dfa1e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-02 19:32:00 +00:00
Robert Loehning
2c5d4ef6f8 Squish: Use parameters in some calls to mouseClick(...)
Partially reverts e8727fcae2 for these lines.

Change-Id: I268b1ff337095bd08d3e92c8be57bc2b6e5de8d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-26 14:56:47 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-07-25 12:06:05 +00:00