summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-6/+22
|\ | | | | | | Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0
| * fix for losing map item focus while dragging themPaolo Angelelli2016-06-021-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMapItemBase::childMouseEventFilter currently does a contain() check on the clicks but also on the mouse move events. by not doing it on mouse move events the problem seems fixed, but the autotests get broken because it seems that the map doesn't get panned anymore but the element gets dragged instead. Task-number: QTBUG-52075 Change-Id: I5ce340ca591ec924eebed1fe7acda18d31301fc5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove test_border_drag testMichal Klocek2016-05-301-152/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Since change 820f79284248e5fcc9910282055e67f07c918559 map can not have "borders", remove test which tries to drag items in/out of map borders, moreover particular test tries to drag items which are not visible, which gives anyway false results. Add missing zoomLevel setting to init(). Change-Id: I4932e767fe1b9e3d213ef7b2f654a9bbe857de78 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-05-2711-152/+215
|\ \ | |/ | | | | Change-Id: I066dc4f161f4bdfe182ba9fe00d273e5fbcedf5d
| * Replace waitForRendering calls in qml unit testsMichal Klocek2016-05-2611-152/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes eea315187d1add70aaf69745c031b8d6342b2303 moved map items final position calculation to "polish" call of sg. In unit testing "waitForRendering" was introduced to sync between input events processing and items being polished. Unfortunately this approach is race condition prone, since render can run in separate thread and frame swapped signals are emitted from render thread. Replace waitForRendering with waitForPolished instead. Improve test execution by providing init() and intTestCase() functions for map items unit tests, so test can be run "out of order" manner. Add missing namespace macros for location test qml plugin. Task-number: QTBUG-31797 Task-number: QTBUG-53455 Change-Id: Iec083143ae621e5be603d03f43d6ef260b056d0f Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge branch '5.6' into 5.7Alex Blasche2016-05-261-1/+1
|\ \ | |/ | | | | Change-Id: If8d408079ba6cceffd516c0ed95a21a2ca1ca2a0
| * QtLocation autotest fixPaolo Angelelli2016-05-201-1/+1
| | | | | | | | | | | | | | Apparently this test passed until now for mysterious reasons Change-Id: I9597c13bc7b3d8fee148d6e1095b7a09ea3b37dc Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-05-183-12/+7
|\ \ | |/ | | | | Change-Id: Ifed3a326085bd4aaff069007966efd6932c2be3b
| * Windows: Skip flaky tests in declarative_ui.Friedemann Kleint2016-05-181-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-53455 Change-Id: Ib65496de7e59341fe4ed8a443aed10fe4b2a63d4 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: Ib5cc25c57d3d096f818d67169ec98c9f3cb75c47 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * make use of COPIESOswald Buddenhagen2016-04-281-6/+3
| | | | | | | | | | Change-Id: Ie1fe505d7b07a66e41ed7968275feaa98abe46d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix for negative QGeoCoordinate.azimuthTo results in range ]360, 359[Paolo Angelelli2016-04-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | QGeoCoordinate.azimuthTo() currently returns negative value (between 0 and -1) for azimuths that should instead be in the range between 360 and 359. This patch should bring all returned values in the range [0, 360[ (360 excluded). Change-Id: I0b5ee7c3fc2bbeb80ca8167a53c7c16d9e067e29 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Reduce setCameraData calls to minimumMichal Klocek2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | Remove checks for cameraCapabilities during each setCameraData call. This checks are already performed on plugin initialization. Refactor QGeoMapPrivate to reduce resize calls. Rename updateRequired to sgNodeChanged to reflect real useage. Add setter setSize for QGeoMap. Change-Id: If4e3501fa99a8a97cbc471990837b08c43b8e723 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove QGeoMapController from QGeoMapMichal Klocek2016-03-175-378/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code to use QGeoCameraData directly. All functionality related to zoom, center boundary checks are now handled in QDeclaratvieGeoMap class. This makes handling of center and zoomLevel properties much simpler and less error prone, since camera data can not be modified along the call stack. As result we avoid forwarding change signals back and forth: * qgeodeclarativegeomap::setCenter -> qgeomapcontroller::setCenter * qgeomapcontroller::setCenter -> qgeomap::setCameraData * qgeomap::setCameraData -> qgeomacontroller::cameraDataChanged * qgeomapcontroller::cameraDataChanged -> emit qdecalartivegeomap::centerChanged Call always setCenter and setZoomLevel on qdeclarativegeomap instance instead. Introduce initialize() method to handle cases where map plugin is loaded and scenegraph geometery is not yet set. This is required to correctly handle new boundary checks to limit grey areas. Change-Id: I6066cefd4a648dc76333dc241d1f261451a32e9c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | QGeoMapScene renamed to QGeoTiledMapScenev5.7.0-alpha1Paolo Angelelli2016-03-033-11/+11
| | | | | | | | | | | | | | | | | | | | Since the class QGeoMapScene is tightly coupled to QGeoTiledMap, this patch renames it into QGeoTiledMapScene/QGeoTiledMapScenePrivate, to clarify the structure of the module and avoid confusion, as otherwise it would not be clear that this class is exclusively used by QGeoTiledMap. Change-Id: Ifd76b02ff14d0f0690dc37fcb0a93b0e0702d05d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Adjustment for the minimum zoom level to prevent gray bandsPaolo Angelelli2016-03-023-16/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a lower bound for the minimum zoom level of a map element so that it becomes canvas size dependent, and it will also prevent the map from being smaller than the canvas size in either dimension, avoiding gray bands. It also bounds the center of the map so that the map cannot be panned or flicked out of bounds. The documentation for QDeclarativeGeoMap::minimumZoomLevel has been modified to reflect the new behavior. A few testcases have been modified to reflect this new behavior and its implications. Change-Id: I3c8160d0295e8dda2f7001e8fec68a5200ea2172 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Add hash function for QGeoCoordinateAlex Blasche2016-03-021-0/+40
| | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning][General] Added qHash(QGeoCoordinate()). Task-number: QTBUG-51404 Change-Id: I02c6dc0a5399ebf3181b34ffa58a82a2119118a0 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Refactor prefetching tilesMichal Klocek2016-02-098-98/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation uses same QGeoCameraTiles object to calculate visible tiles and tiles which should be prefetched. This is semi optimal since frustum intersection algorithm uses bunch of different parameters. Simplify the logic and use separate objects, this way values in both cases are cached and calculation is done when required. This is important since prefetchData can be called anytime from map's API. Remove textured tiles from scene when clearCache called, this will force redownload of all the tiles. Add new unit test qgeotiledmap and move prefetch test due to refactoring. Change-Id: I6a906df405f212436cdd35ac76f95b559e6b7aae Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Load geotest plugin during geomapcontroller unit testMichal Klocek2016-02-042-113/+114
| | | | | | | | | | | | | | | | Do not compile in plugin sources, instead load the plugin Forthcoming cpp tests should use the same schematics. Change-Id: I8e1b21ed4e44fb78e4541966e1890a556ef527fe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add prefetch testcase to tst_QGeoCameraTilesMichal Klocek2016-02-041-854/+927
| | | | | | | | | | | | | | | | | | | | Test tiles prefetch for PrefetchNeighbourLayer and PrefetchTwoNeighbourLayers. Reformat unit test so it is easier to browse the code. Change-Id: Ifcda364052960f0112a1859c25cb8d9d05df2023 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-0/+59
|\ \ | |/ | | | | Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7
| * Added methods for modifying QDeclarativePolylineMapItem.v5.6.0-beta1Harald Meyer2015-12-141-0/+59
| | | | | | | | | | | | | | | | | | | | | | Added the methods insertCoordinate(index, coordinate), replaceCoordinate(index, coordinate), removeCoordinate(index), pathLength(), coordinateAt(index) to the QDeclarativePolylineMapItem. Change-Id: I8b1f7e01cf814fe6fdb9f2da376793891514b5f0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-20160-2721/+1921
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: Ic9ed595cc04b1fbbefb8ec8cac20c1480681857a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-0110-167/+221
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/imports/location/qdeclarativegeomap_p.h Change-Id: Iaf232acbe9098eb1b57f571638dd37f75b2ff345
| * Improve map item rendering performanceMichal Klocek2015-11-276-45/+74
| | | | | | | | | | | | | | | | | | | | | | | | A flood of input events, such as when pinch, triggers multiple map item geometry updates to occur per frame. These geometry updates are potentially expensive and only the last generated geometry is used. Mark items to be polished to make geometry updates once per frame when updatePolish() is called. Done-with: Aaron McCarthy <aaron.mccarthy@jollamobile.com> Change-Id: I0af40e2d0b09c8364382d4b4c018988f3986f7f0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix tile fetcher from test plugin.Michal Klocek2015-11-251-27/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting tiles immediately with test plugin was not implemented, what's more the current delayed implementation was keeping pointer only to last requested tile, which on slow machines ended up on "downloading" only one tile (last one) This change is required to fix the CI qtlocation flaky tests. Change-Id: I107701692a70b45401e7219ad7ee0f4a372efb04 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix MapGestureArea APIMichal Klocek2015-11-231-30/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmlfy map gesture area API: * do not use "is" for properties (panActive,pinchActive) * do not use "active" for accepted gestures (acceptedGestures) * do not use "ZoomGestures" (PinchGesture) * make private panEnabled, pinchEnabled * remove pan/pinchEnabled signals * update documentation * fix order of emitting panFinished, flickFinished [ChangeLog][MapGestureArea] Improve QML API including renaming and removal of obsolete elements. Change-Id: I643c923dcd94388475feb402b29ce3df916037a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Remove fitViewportToGeoShape from map qml apiMichal Klocek2015-11-232-12/+4
| | | | | | | | | | | | | | | | | | Use visibleRegion to fit the map's viewport [ChangeLog][Map] Remove fitViewportToGeoShape from map qml api Change-Id: I378329602a5c1f4cceda327f7abcca61c1217564 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Fix coordianteAnimation testMichal Klocek2015-11-231-2/+6
| | | | | | | | | | Change-Id: I755630bb361a83e67a329c6c07048623fe566ede Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
| * geocode tests: use tryCompare after waitLaszlo Agocs2015-11-031-50/+25
| | | | | | | | | | Change-Id: I9ee2842ec3969323b3195e5a7690bebb0a05029c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Split QGeoTileCache for easier customization of the tile cache.Harald Meyer2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGeoTileCache is split into two classes: The abstract class QAbstractGeoTileCache offers interfaces for inserting and getting tiles, as well as getting cache status information such as used texture memory. The new class QGeoFileTileCache implements QAbstractGeoTileCache and offers a file based caching implementation (the implementation is the same as before splitting the class). Change-Id: I2eab7491d489ac5b251c1296b67688901f5cc7d7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1612-12/+12
|\ \ | |/ | | | | Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
| * Bump all QtLocation 5.5 tags to 5.6Alex Blasche2015-09-2312-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.5 was a tech preview release. The real release is 5.6. Some 5.5 interfaces did change. It is possible that there are apps in existence which are based on the 5.5 API's. To avoid miscommunication we bump all version tags to the real first release version. The existing 5.5 QML imports will continue to work but apps may encounter API changes when they move from 5.5 to 5.6. The API changes are listed in the QtLocation documentation. Change-Id: Ia7000e871a5ee6b09234e5d58d4fc8927e93b154 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-09-227-67/+174
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro Change-Id: I1cd05c8e9c9e55edc0d2d1c2b967d94a9efd0394
| * Remove dependency on libgeoclue.Aaron McCarthy2015-09-103-23/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-implement Geoclue plugin using only Qt DBus dropping both the build-time and run-time dependency on libgeoclue. Allowing the Geoclue plugin to be build on all platforms that support Qt DBus. The priority of the Geoclue plugin has been lowered slightly so that the native position plugin, if available, has precedence. [ChangeLog][QtPositioning][Position] The Geoclue plugin has been re-implemented using Qt DBus. Task-number: QTBUG-40702 Change-Id: Ia06d089bfb46c10769ccffd765c044c361a9b484 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Skip loading real plugins in testsLaszlo Agocs2015-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | Introduce a new plugin metadata field "Testable" that can be used to indicate that using the plugin in question in test runs (e.g. in a CI environment) is dangerous. We can then check for QT_QTESTLIB_RUNNING and skip the plugin in question. Change-Id: Iabe9f1600d7274e0e9224dc49d02aa2e5d3cabd6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Do not double delete in positioning test appLaszlo Agocs2015-09-091-4/+4
| | | | | | | | | | | | | | Otherwise it can crash on exit. Change-Id: I9e107bd94a6f8a6f2d6600e18a532d313534560c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make use of incubator to asynchronously instantiate delegatesAaron McCarthy2015-09-091-37/+62
| | | | | | | | | | | | | | | | This has the side effect that map items instantiated by the view are no longer be added to the map in a deterministic order. Change-Id: I5933136e8d9dbf0e698353370b9bfc0affe146ac Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix incorrect include guardLaszlo Agocs2015-09-071-1/+1
| | | | | | | | | | | | | | Clang warns about it. Change-Id: I4281622a2928890c2d88e3a483c18fba420d0afd Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2015-09-061-6/+3
|\ \ | |/ | | | | Change-Id: Ia305efe8c4b616ed70309dfcae47f39cd1a4c4da
| * Harden the Routing QML testv5.6.0-alpha1Alex Blasche2015-09-031-6/+3
| | | | | | | | | | | | | | | | We cannot rely on the CI to respond on time after small timeouts like 200ms. Change-Id: I6569e0288e204a5e2096833abd086f3f61020239 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devAlex Blasche2015-08-313-53/+43
|\ \ | |/
| * Update Error enums for GeoCode & Route model typesAlex Blasche2015-08-282-25/+27
| | | | | | | | | | | | | | | | | | | | | | 1.) Remove not required/duplicated enums 2.) Add docs for new enum values 3.) Sorted the enums by alphabet (except for NoErrror) 4.) Other minor spelling corrections 5.) Update and expand tests Change-Id: I83bf9e5e40f1237ead45320d020b315b39442946 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Re-enable QML geocoding unit testAlex Blasche2015-08-281-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They were disabled when trying to get qtlocation pass through the new CI. The failure reason were the delayed geocoding requests. The plugin employs a 200ms timeout before answering such requests. The unit test aligned its wait times along the same timeout values. Unfortunately this is not testable in the CI as those timeouts are not guaranteed. Task-number: QTBUG-47423 Change-Id: I1e3accaf1590f0c95282a62a8cc02a76de71b47c Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Disable MapPinch test due to flakinesssAlex Blasche2015-08-281-0/+0
| | | | | | | | | | | | | | Task-number: QTBUG-47970 Change-Id: I50c287f895a3c815a5055bb6fee0b663bd7f227d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Fix routing test for OSXAlex Blasche2015-08-251-12/+7
| | | | | | | | | | | | | | | | OSX test machines seem to have trouble with correct timer invocations. This patch makes the failing code point less reliant on timeing issues. Change-Id: If70d3c763336a5993fc75ecb66db6fbcf20453a6 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-2869-69/+0
|/ | | | | Change-Id: I1eb987fdd48e33bd1d71da7f9efb9f02e05de3c9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Adjust plugin path for win to cope with Debug/Release dirsAlex Blasche2015-07-2912-0/+60
| | | | | | | | | This messes up the relative path to the test plugins in QCoreApplication::libraryPaths(). Change-Id: I0ab35ba9be60ea9ec2383bbe3791baebb844f2a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Temporarily disable test to make qtlocation pass in dev CI.Alex Blasche2015-07-291-0/+3
| | | | | | | | The tests intermittently fail on OSX 10.10 Task-number: QTBUG-47423 Change-Id: I4bc4bbaa4cde1a309895281811f88496cab84ccf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Prospective fix for running tests in the new CI on OS XSimon Hausmann2015-07-2912-0/+24
| | | | | | | | A hack is in place to look for the plugin in ../../../plugins/... but that won't work if we use bundles. Change-Id: I963d6267d658a0315641df1a23f4a111fe3b596e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
View Lorry Controller Status