Bug 1714950: Fix test loadWithHTTPSOnlyMode with https-first-mode enabled r=geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D116990
This commit is contained in:
Christoph Kerschbaumer 2021-06-09 19:42:32 +00:00
Родитель f0d30bfbed
Коммит 2df9bc6544
1 изменённых файлов: 12 добавлений и 1 удалений

Просмотреть файл

@ -354,18 +354,29 @@ class NavigationDelegateTest : BaseSessionTest() {
privateSession.loadUri(secureUri)
privateSession.waitForPageStop()
var onLoadCalledCounter = 0
privateSession.forCallbacksDuringWait(object : Callbacks.NavigationDelegate {
@AssertCalled(count = 0)
override fun onLoadError(session: GeckoSession, uri: String?, error: WebRequestError): GeckoResult<String>? {
return null
}
@AssertCalled(count = 1)
override fun onLoadRequest(session: GeckoSession, request: LoadRequest): GeckoResult<AllowOrDeny>? {
onLoadCalledCounter++
return null
}
})
val httpsFirstPBMPref = "dom.security.https_first_pbm"
val httpsFirstPBMPrefValue = (sessionRule.getPrefs(httpsFirstPBMPref)[0] as Boolean)
if (httpsFirstPBMPrefValue) {
// if https-first is enabled we get two calls to onLoadRequest
// (1) http://example.com/ and (2) https://example.com/
assertThat("Assert count privateSession.onLoadRequest", onLoadCalledCounter, equalTo(2))
} else {
assertThat("Assert count privateSession.onLoadRequest", onLoadCalledCounter, equalTo(1))
}
sessionRule.runtime.settings.setAllowInsecureConnections(GeckoRuntimeSettings.HTTPS_ONLY_PRIVATE)
privateSession.loadUri(insecureUri)