Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1457863) for merge conflict on a CLOSED TREE

Browse Source 
Backed out changeset a9e4a1af13b9 (bug 1457863)
Backed out changeset d4e8c9ea8f0e (bug 1457863)
This commit is contained in:
shindli 2018-05-02 01:54:08 +03:00
parent 1df26ee40e
commit 1eca61443f
5 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -50,7 +50,7 @@ buildscript {
}
}
ext.kotlin_version = '1.2.20'
ext.kotlin_version = '1.1.51'
ext.support_library_version = '23.4.0'
if (gradle.mozconfig.substs.MOZ_ANDROID_GOOGLE_PLAY_SERVICES) {

4
mobile/android/geckoview/build.gradle
View File

@ -170,10 +170,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
}
} as StandardOutputListener
kotlinOptions {
allWarningsAsErrors = true
}
doFirst {
logging.addStandardErrorListener(listener)
}

42
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt
View File

@ -317,7 +317,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
var counter = 0
sessionRule.waitUntilCalled(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 2, order = [1, 2])
@AssertCalled(count = 2, order = intArrayOf(1, 2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
val info = sessionRule.currentCall
assertThat("Method info should be valid", info, notNullValue())
@ -462,11 +462,11 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(order = [1])
@AssertCalled(order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
}
@AssertCalled(order = [2])
@AssertCalled(order = intArrayOf(2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
})
@ -478,11 +478,11 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(order = [2])
@AssertCalled(order = intArrayOf(2))
override fun onPageStart(session: GeckoSession, url: String) {
}
@AssertCalled(order = [1])
@AssertCalled(order = intArrayOf(1))
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
})
@ -494,11 +494,11 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.waitForPageStops(2)
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(order = [1, 3, 1])
@AssertCalled(order = intArrayOf(1, 3, 1))
override fun onPageStart(session: GeckoSession, url: String) {
}
@AssertCalled(order = [2, 4, 1])
@AssertCalled(order = intArrayOf(2, 4, 1))
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
})
@ -511,11 +511,11 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.waitForPageStops(2)
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(order = [1, 2, 1])
@AssertCalled(order = intArrayOf(1, 2, 1))
override fun onPageStart(session: GeckoSession, url: String) {
}
@AssertCalled(order = [3, 4, 1])
@AssertCalled(order = intArrayOf(3, 4, 1))
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
})
@ -664,12 +664,12 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
var counter = 0
sessionRule.delegateUntilTestEnd(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
counter++
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
counter++
}
@ -708,11 +708,11 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
@Test(expected = AssertionError::class)
fun delegateUntilTestEnd_throwOnWrongOrder() {
sessionRule.delegateUntilTestEnd(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStart(session: GeckoSession, url: String) {
}
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
})
@ -742,12 +742,12 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
var counter = 0
sessionRule.delegateDuringNextWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
counter++
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
counter++
}
@ -785,34 +785,34 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.delegateUntilTestEnd(object : Callbacks.ProgressDelegate,
Callbacks.NavigationDelegate {
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStart(session: GeckoSession, url: String) {
testCounter++
}
@AssertCalled(count = 1, order = [4])
@AssertCalled(count = 1, order = intArrayOf(4))
override fun onPageStop(session: GeckoSession, success: Boolean) {
testCounter++
}
@AssertCalled(count = 2, order = [1, 3])
@AssertCalled(count = 2, order = intArrayOf(1, 3))
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
testCounter++
}
@AssertCalled(count = 2, order = [1, 3])
@AssertCalled(count = 2, order = intArrayOf(1, 3))
override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
testCounter++
}
})
sessionRule.delegateDuringNextWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
waitCounter++
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
waitCounter++
}

36
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
View File

@ -26,7 +26,7 @@ class NavigationDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.NavigationDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onLoadRequest(session: GeckoSession, uri: String,
where: Int,
flags: Int,
@ -40,20 +40,20 @@ class NavigationDelegateTest : BaseSessionTest() {
response.respond(false)
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onLocationChange(session: GeckoSession, url: String) {
assertThat("Session should not be null", session, notNullValue())
assertThat("URL should not be null", url, notNullValue())
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
assertThat("Session should not be null", session, notNullValue())
assertThat("Cannot go back", canGoBack, equalTo(false))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
assertThat("Session should not be null", session, notNullValue())
assertThat("Cannot go forward", canGoForward, equalTo(false))
@ -198,7 +198,7 @@ class NavigationDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.NavigationDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onLoadRequest(session: GeckoSession, uri: String,
where: Int,
flags: Int,
@ -209,17 +209,17 @@ class NavigationDelegateTest : BaseSessionTest() {
response.respond(false)
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onLocationChange(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
assertThat("Cannot go back", canGoBack, equalTo(false))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
assertThat("Cannot go forward", canGoForward, equalTo(false))
}
@ -249,7 +249,7 @@ class NavigationDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.NavigationDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onLoadRequest(session: GeckoSession, uri: String,
where: Int,
flags: Int,
@ -260,17 +260,17 @@ class NavigationDelegateTest : BaseSessionTest() {
response.respond(false)
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onLocationChange(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
assertThat("Cannot go back", canGoBack, equalTo(false))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
assertThat("Can go forward", canGoForward, equalTo(true))
}
@ -285,7 +285,7 @@ class NavigationDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.NavigationDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onLoadRequest(session: GeckoSession, uri: String,
where: Int,
flags: Int,
@ -296,17 +296,17 @@ class NavigationDelegateTest : BaseSessionTest() {
response.respond(false)
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onLocationChange(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO2_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
assertThat("Can go back", canGoBack, equalTo(true))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
assertThat("Cannot go forward", canGoForward, equalTo(false))
}
@ -334,12 +334,12 @@ class NavigationDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO2_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should succeed", success, equalTo(true))
}

28
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt
View File

@ -27,14 +27,14 @@ class ProgressDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("Session should not be null", session, notNullValue())
assertThat("URL should not be null", url, notNullValue())
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onSecurityChange(session: GeckoSession,
securityInfo: GeckoSession.ProgressDelegate.SecurityInformation) {
assertThat("Session should not be null", session, notNullValue())
@ -46,7 +46,7 @@ class ProgressDelegateTest : BaseSessionTest() {
equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN))
}
@AssertCalled(count = 1, order = [3])
@AssertCalled(count = 1, order = intArrayOf(3))
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Session should not be null", session, notNullValue())
assertThat("Load should succeed", success, equalTo(true))
@ -93,13 +93,13 @@ class ProgressDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStops(2)
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 2, order = [1, 3])
@AssertCalled(count = 2, order = intArrayOf(1, 3))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url,
endsWith(forEachCall(INVALID_URI, HELLO_HTML_PATH)))
}
@AssertCalled(count = 2, order = [2, 4])
@AssertCalled(count = 2, order = intArrayOf(2, 4))
override fun onPageStop(session: GeckoSession, success: Boolean) {
// The first load is certain to fail because of interruption by the second load
// or by invalid domain name, whereas the second load is certain to succeed.
@ -117,17 +117,17 @@ class ProgressDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onSecurityChange(session: GeckoSession,
securityInfo: GeckoSession.ProgressDelegate.SecurityInformation) {
}
@AssertCalled(count = 1, order = [3])
@AssertCalled(count = 1, order = intArrayOf(3))
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should succeed", success, equalTo(true))
}
@ -144,17 +144,17 @@ class ProgressDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onSecurityChange(session: GeckoSession,
securityInfo: GeckoSession.ProgressDelegate.SecurityInformation) {
}
@AssertCalled(count = 1, order = [3])
@AssertCalled(count = 1, order = intArrayOf(3))
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should succeed", success, equalTo(true))
}
@ -164,17 +164,17 @@ class ProgressDelegateTest : BaseSessionTest() {
sessionRule.waitForPageStop()
sessionRule.forCallbacksDuringWait(object : Callbacks.ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@AssertCalled(count = 1, order = intArrayOf(1))
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url, endsWith(HELLO2_HTML_PATH))
}
@AssertCalled(count = 1, order = [2])
@AssertCalled(count = 1, order = intArrayOf(2))
override fun onSecurityChange(session: GeckoSession,
securityInfo: GeckoSession.ProgressDelegate.SecurityInformation) {
}
@AssertCalled(count = 1, order = [3])
@AssertCalled(count = 1, order = intArrayOf(3))
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should succeed", success, equalTo(true))
}