Merge lp://qastaging/~chrisccoulson/oxide/unit-testing into lp://qastaging/~oxide-developers/oxide/oxide.trunk

Proposed by Chris Coulson
Status: Merged
Merged at revision: 1394
Proposed branch: lp://qastaging/~chrisccoulson/oxide/unit-testing
Merge into: lp://qastaging/~oxide-developers/oxide/oxide.trunk
Diff against target: 4053 lines (+1221/-715)
134 files modified
build/cmake/AutoGenerateHelper.cmake (+68/-0)
build/scripts/preprocess-helper.cmake (+23/-0)
qt/CMakeLists.txt (+0/-1)
qt/core/browser/oxide_qt_web_view.cc (+24/-0)
qt/core/browser/oxide_qt_web_view.h (+2/-0)
qt/core/glue/oxide_qt_web_view_proxy.h (+2/-0)
qt/quick/api/oxideqquickwebview.cc (+8/-0)
qt/quick/api/oxideqquickwebview_p.h (+2/-0)
qt/tests/CMakeLists.txt (+3/-1)
qt/tests/mock/position/CMakeLists.txt (+1/-4)
qt/tests/qmltests/CMakeLists.txt (+92/-94)
qt/tests/qmltests/ScriptMessageTestHandler.qml (+1/-1)
qt/tests/qmltests/TestUtils.js (+2/-2)
qt/tests/qmltests/TestWebContext.qml (+4/-2)
qt/tests/qmltests/TestWebView.qml (+7/-1)
qt/tests/qmltests/api/tst_CookieManager.qml (+1/-1)
qt/tests/qmltests/api/tst_GeolocationPermissionRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_GeolocationPermissionRequest_session_persist.qml (+1/-1)
qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml (+1/-1)
qt/tests/qmltests/api/tst_LocationBarController.qml (+11/-26)
qt/tests/qmltests/api/tst_MediaAccessPermissionRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_MediaAccessPermissionRequest_session_persist.qml (+1/-1)
qt/tests/qmltests/api/tst_NavigationRequest.qml (+2/-2)
qt/tests/qmltests/api/tst_NavigationRequest_no_window_creation.qml (+1/-1)
qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml (+1/-1)
qt/tests/qmltests/api/tst_NewViewRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_NotificationPermissionRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_session_persist.qml (+1/-1)
qt/tests/qmltests/api/tst_OxideGlobal.qml (+1/-1)
qt/tests/qmltests/api/tst_ScriptMessage.qml (+1/-1)
qt/tests/qmltests/api/tst_ScriptMessageHandler.qml (+1/-1)
qt/tests/qmltests/api/tst_ScriptMessageRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_UserAgentOverrideRequest.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContextDelegateWorker.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_cookiePolicy.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_defaultVideoCaptureDevice.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_delegateWorkers.qml (+12/-12)
qt/tests/qmltests/api/tst_WebContext_doNotTrack.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_popupBlockerEnabled.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_semi_construct_only_properties.qml (+3/-3)
qt/tests/qmltests/api/tst_WebContext_sessionCookies.qml (+4/-4)
qt/tests/qmltests/api/tst_WebContext_userAgent.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_userAgentOverrides.qml (+1/-1)
qt/tests/qmltests/api/tst_WebContext_userScripts.qml (+16/-12)
qt/tests/qmltests/api/tst_WebFrame_messageHandlers.qml (+6/-6)
qt/tests/qmltests/api/tst_WebFrame_sendMessageNoReply.qml (+1/-1)
qt/tests/qmltests/api/tst_WebFrame_tree.qml (+1/-1)
qt/tests/qmltests/api/tst_WebFrame_url.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_alertDialog.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_beforeUnloadDialog.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_closeRequested.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_confirmDialog.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_context.qml (+2/-2)
qt/tests/qmltests/api/tst_WebView_contextMenu.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_downloadRequested.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_editingCapabilities.qml (+4/-4)
qt/tests/qmltests/api/tst_WebView_executeEditingCommand.qml (+6/-6)
qt/tests/qmltests/api/tst_WebView_filePicker.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_findController.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_flickableLikeAPI.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_fullscreen.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_hoveredUrl.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_icon.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_incognito.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_loadHtml.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_loadProgress.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_loading.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_loading_deprecated.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_loading_old.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_messageHandlers.qml (+6/-6)
qt/tests/qmltests/api/tst_WebView_navigation.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_navigationHistory.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_newViewRequested.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_popupMenu_single.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_preferences.qml (+15/-17)
qt/tests/qmltests/api/tst_WebView_prepareToClose.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_promptDialog.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_rootFrame.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_save_restore_state.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_title.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_url.qml (+1/-1)
qt/tests/qmltests/api/tst_WebView_webProcessStatus.qml (+15/-4)
qt/tests/qmltests/api/tst_bug1324909.qml (+1/-2)
qt/tests/qmltests/api/tst_bug1361868.qml (+1/-1)
qt/tests/qmltests/api/tst_bug1445673.qml (+1/-1)
qt/tests/qmltests/api/tst_httpAuthentication.qml (+1/-1)
qt/tests/qmltests/core/tst_Clipboard.qml (+4/-4)
qt/tests/qmltests/core/tst_CustomURLSchemes.qml (+1/-1)
qt/tests/qmltests/core/tst_Incognito_cleanup.qml (+3/-3)
qt/tests/qmltests/core/tst_Incognito_cookies.qml (+1/-1)
qt/tests/qmltests/core/tst_NoSendMessageInMainScope.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageContentAPIMisc.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_bubbling.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_direct.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_errors.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRoutingToContent.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRoutingToContent_errors.qml (+1/-1)
qt/tests/qmltests/core/tst_ScriptMessageRouting_ordering.qml (+1/-1)
qt/tests/qmltests/core/tst_UnhandledURLSchemes.qml (+1/-1)
qt/tests/qmltests/core/tst_UnloadHandlers.qml (+2/-4)
qt/tests/qmltests/core/tst_UserAgentOverrideSetCaching.qml (+1/-1)
qt/tests/qmltests/core/tst_WebView_scriptMainWorld.qml (+1/-1)
qt/tests/qmltests/core/tst_bug1234555.qml (+1/-1)
qt/tests/qmltests/core/tst_geolocation.qml (+3/-3)
qt/tests/qmltests/crash/tst_bug1231650.qml (+2/-2)
qt/tests/qmltests/crash/tst_bug1267543.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1287261.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1349510.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1352952.qml (+2/-2)
qt/tests/qmltests/crash/tst_bug1381558.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1427828.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1442969.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1450021.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1450243.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1450570.qml (+1/-1)
qt/tests/qmltests/crash/tst_bug1477760.qml (+1/-1)
qt/tests/qmltests/main.cc (+128/-147)
qt/tests/qmltests/oxide_qml_testing_plugin.json (+0/-1)
qt/tests/qmltests/qml-test.conf.in (+4/-0)
qt/tests/qmltests/qml_test_support.cc (+194/-221)
qt/tests/qmltests/qml_test_support.h (+148/-0)
qt/tests/qmltests/qmldir (+1/-2)
qt/tests/qmltests/qmldir.hack (+0/-2)
qt/tests/qmltests/quick_test_compat.cc (+66/-0)
qt/tests/qmltests/quick_test_compat.h (+57/-0)
qt/tests/qmltests/ssl/tst_CertificateError.qml (+1/-1)
qt/tests/qmltests/ssl/tst_CertificateError_no_response.qml (+1/-1)
qt/tests/qmltests/ssl/tst_SecurityStatus.qml (+1/-1)
qt/tests/qmltests/ssl/tst_SslCertificate.qml (+1/-1)
qt/tests/qmltests/ssl/tst_WebPreferences_mixedContent.qml (+1/-1)
qt/tests/qmltests/ssl/tst_WebView_mixedContentOverrides.qml (+1/-1)
qt/tests/qmltests/test_nam_factory.cc (+75/-0)
qt/tests/qmltests/test_nam_factory.h (+35/-0)
qt/tests/runtests.py (+68/-25)
To merge this branch: bzr merge lp://qastaging/~chrisccoulson/oxide/unit-testing
Reviewer Review Type Date Requested Status
Chris Coulson Pending
Review via email: mp+290445@code.qastaging.launchpad.net
To post a comment you must log in.
1393. By Chris Coulson

Merge from lp:oxide

1394. By Chris Coulson

Make it possible to run a single test case

1395. By Chris Coulson

Undo change to oxide.qmltypes

1396. By Chris Coulson

Make it easy to run tests in gdb

1397. By Chris Coulson

Ensure the string passed to QuickTestResult::setProgramName remains valid

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches