diff --git a/build.gradle b/build.gradle
index f7cb95cbd383ac26c6cdbe2e8abb8aaddef93ef6..d537ade743e9090b86a5a05cbd09783852b8e3d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -367,7 +367,7 @@ subprojects {
include '**/*.kt'
exclude '**/thirdparty/**'
}
- ktlint('0.47.1')
+ ktlint('0.48.2')
}
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
index dc5fc0694ca1d1916b1964c74e56545218d245a3..0f1fa260cb640444dca2c37ee28b475f5a4ff3c1 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
@@ -94,14 +94,14 @@ class AccessibilityTest : BaseSessionTest() {
if (Build.VERSION.SDK_INT >= 21) {
AccessibilityNodeInfo::class.java.getMethod(
"getChildId",
- Int::class.java
+ Int::class.java,
).invoke(this, index) as Long
} else {
(
AccessibilityNodeInfo::class.java.getMethod("getChildNodeIds")
.invoke(this) as SparseLongArray
).get(index)
- }
+ },
)
}
}
@@ -160,7 +160,7 @@ class AccessibilityTest : BaseSessionTest() {
})
},
{ (view.parent as View).setAccessibilityDelegate(null) },
- object : EventDelegate { }
+ object : EventDelegate { },
)
}
@@ -179,7 +179,7 @@ class AccessibilityTest : BaseSessionTest() {
sessionRule.waitUntilCalled(object : GeckoSession.NavigationDelegate {
override fun onLoadRequest(
session: GeckoSession,
- request: GeckoSession.NavigationDelegate.LoadRequest
+ request: GeckoSession.NavigationDelegate.LoadRequest,
): GeckoResult<AllowOrDeny>? {
return GeckoResult.allow()
}
@@ -201,7 +201,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
View.NO_ID,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
}
}
@@ -212,7 +212,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Root node should have WebView class name",
node.className.toString(),
- equalTo("android.webkit.WebView")
+ equalTo("android.webkit.WebView"),
)
}
@@ -232,7 +232,7 @@ class AccessibilityTest : BaseSessionTest() {
sessionRule.waitUntilCalled(object : GeckoSession.NavigationDelegate {
override fun onLoadRequest(
session: GeckoSession,
- request: GeckoSession.NavigationDelegate.LoadRequest
+ request: GeckoSession.NavigationDelegate.LoadRequest,
): GeckoResult<AllowOrDeny>? {
return GeckoResult.allow()
}
@@ -250,7 +250,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
View.NO_ID,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -261,7 +261,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Header is a11y focused",
node.contentDescription.toString(),
- equalTo("Licenses")
+ equalTo("Licenses"),
)
}
})
@@ -269,7 +269,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -280,7 +280,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Next text leaf is focused",
node.text.toString(),
- equalTo("All of the ")
+ equalTo("All of the "),
)
}
})
@@ -297,7 +297,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with href",
node.contentDescription as String,
- equalTo("free")
+ equalTo("free"),
)
}
})
@@ -316,7 +316,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Label accessibility focused",
node.className.toString(),
- equalTo("android.view.View")
+ equalTo("android.view.View"),
)
assertThat("Text node should not be focusable", node.isFocusable, equalTo(false))
assertThat("Text node should be a11y focused", node.isAccessibilityFocused, equalTo(true))
@@ -327,7 +327,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -338,7 +338,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Editbox accessibility focused",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
assertThat("Entry node should be focusable", node.isFocusable, equalTo(true))
assertThat("Entry node should be a11y focused", node.isAccessibilityFocused, equalTo(true))
@@ -349,7 +349,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -380,13 +380,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Focused EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Hint has field name",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("Name description")
+ equalTo("Name description"),
)
}
}
@@ -402,13 +402,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Focused EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Hint has field name",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("Last, required")
+ equalTo("Last, required"),
)
}
}
@@ -430,7 +430,7 @@ class AccessibilityTest : BaseSessionTest() {
s.addRange(r);
};
this.select(document.querySelector('p').childNodes[2], 2, 6);
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -444,7 +444,7 @@ class AccessibilityTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
this.select(document.querySelector('p').lastElementChild.firstChild, 1, 2);
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -472,7 +472,7 @@ class AccessibilityTest : BaseSessionTest() {
// Changing DOM selection doesn't focus the document! Force focus
// here so we can use that to determine when this is done.
document.activeElement.blur();
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitUntilCalled(object : EventDelegate {
@AssertCalled(count = 1)
@@ -508,7 +508,7 @@ class AccessibilityTest : BaseSessionTest() {
private fun waitUntilTextTraversed(
fromIndex: Int,
toIndex: Int,
- expectedNode: Int? = null
+ expectedNode: Int? = null,
): Int {
var nodeId: Int = AccessibilityNodeProvider.HOST_VIEW_ID
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -584,7 +584,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Focused EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
}
@@ -632,7 +632,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD, true)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD, true),
)
waitUntilTextSelectionChanged(0, 5, "hello cruel cruel cruel")
@@ -664,21 +664,21 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
waitUntilTextTraversed(0, 1, nodeId) // "L"
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
waitUntilTextTraversed(1, 2, nodeId) // "o"
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
waitUntilTextTraversed(0, 1, nodeId) // "L"
}
@@ -700,21 +700,21 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
waitUntilTextTraversed(0, 5, nodeId) // "Lorem"
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
waitUntilTextTraversed(6, 11, nodeId) // "ipsum"
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
waitUntilTextTraversed(0, 5, nodeId) // "Lorem"
}
@@ -736,21 +736,21 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE),
)
waitUntilTextTraversed(0, 18, nodeId) // "Lorem ipsum dolor "
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE),
)
waitUntilTextTraversed(18, 28, nodeId) // "sit amet, "
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE),
)
waitUntilTextTraversed(0, 18, nodeId) // "Lorem ipsum dolor "
}
@@ -779,7 +779,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Next char should succeed", success, equalTo(true))
waitUntilTextTraversed(start, start + 1, nodeId)
@@ -789,7 +789,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Next char should fail at end", success, equalTo(false))
@@ -798,7 +798,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Prev char should succeed", success, equalTo(true))
waitUntilTextTraversed(start, start + 1, nodeId)
@@ -808,7 +808,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Prev char should fail at start", success, equalTo(false))
}
@@ -835,7 +835,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Next word should succeed", success, equalTo(true))
waitUntilTextTraversed(0, 4, nodeId) // "anim"
@@ -843,7 +843,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Next word should succeed", success, equalTo(true))
waitUntilTextTraversed(5, 7, nodeId) // "id"
@@ -852,14 +852,14 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Next word should fail at end", success, equalTo(false))
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Prev word should succeed", success, equalTo(true))
waitUntilTextTraversed(0, 4, nodeId) // "anim"
@@ -868,7 +868,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Prev word should fail at start", success, equalTo(false))
}
@@ -891,7 +891,7 @@ class AccessibilityTest : BaseSessionTest() {
var success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Prev word should succeed", success, equalTo(true))
waitUntilTextTraversed(418, 424, nodeId) // "mollit"
@@ -900,7 +900,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD),
)
assertThat("Next word should fail at last word", success, equalTo(false))
@@ -908,7 +908,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Next char should succeed", success, equalTo(true))
waitUntilTextTraversed(424, 425, nodeId) // " "
@@ -917,7 +917,7 @@ class AccessibilityTest : BaseSessionTest() {
success = provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
- moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER)
+ moveByGranularityArguments(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER),
)
assertThat("Next char should fail at last char", success, equalTo(false))
}
@@ -941,7 +941,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"First heading is level 1",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("heading level 1")
+ equalTo("heading level 1"),
)
}
}
@@ -958,7 +958,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Second heading is level 2",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("heading level 2")
+ equalTo("heading level 2"),
)
}
}
@@ -975,7 +975,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Third heading is level 3",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("heading level 3")
+ equalTo("heading level 3"),
)
}
}
@@ -1001,7 +1001,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Hint has description",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("description")
+ equalTo("description"),
)
}
}
@@ -1109,7 +1109,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Section has 1 child",
createNodeInfo(rootNode.getChildId(0)).childCount,
- equalTo(1)
+ equalTo(1),
)
mainSession.evaluateJS("document.querySelector('#to_show').style.display = 'none';")
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -1123,7 +1123,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Section has no children",
createNodeInfo(rootNode.getChildId(0)).childCount,
- equalTo(0)
+ equalTo(0),
)
}
@@ -1185,7 +1185,7 @@ class AccessibilityTest : BaseSessionTest() {
mainSession.evaluateJS(
"document.querySelector('#container').removeAttribute('aria-atomic');" +
- "document.querySelector('p').textContent = '5pm';"
+ "document.querySelector('p').textContent = '5pm';",
)
sessionRule.waitUntilCalled(object : EventDelegate {
@AssertCalled(count = 1)
@@ -1331,19 +1331,19 @@ class AccessibilityTest : BaseSessionTest() {
"#user1" to "bar",
"#pass1" to "baz",
"#user2" to "bar",
- "#pass2" to "baz"
+ "#pass2" to "baz",
) +
if (Build.VERSION.SDK_INT >= 19) {
mapOf(
"#email1" to "a@b.c",
"#number1" to "24",
- "#tel1" to "42"
+ "#tel1" to "42",
)
} else {
mapOf(
"#email1" to "bar",
"#number1" to "",
- "#tel1" to "bar"
+ "#tel1" to "bar",
)
}
@@ -1360,7 +1360,7 @@ class AccessibilityTest : BaseSessionTest() {
event instanceof $doc.defaultView.UIEvent ? "UIEvent" :
event instanceof $doc.defaultView.Event ? "Event" : "Unknown";
resolve([event.target.value, '${entry.value}', eventInterface]);
- }, { once: true }))"""
+ }, { once: true }))""",
)
}
}
@@ -1384,8 +1384,8 @@ class AccessibilityTest : BaseSessionTest() {
child.isPassword,
equalTo(
child.inputType == InputType.TYPE_CLASS_TEXT or
- InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD
- )
+ InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD,
+ ),
)
}
@@ -1398,7 +1398,8 @@ class AccessibilityTest : BaseSessionTest() {
} else {
when (child.inputType) {
InputType.TYPE_CLASS_TEXT or
- InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS -> "a@b.c"
+ InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS,
+ -> "a@b.c"
InputType.TYPE_CLASS_NUMBER -> "24"
InputType.TYPE_CLASS_PHONE -> "42"
else -> "bar"
@@ -1421,7 +1422,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Can perform auto-fill",
provider.performAction(id, ACTION_SET_TEXT, args),
- equalTo(true)
+ equalTo(true),
)
}
}
@@ -1441,13 +1442,13 @@ class AccessibilityTest : BaseSessionTest() {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1715480
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "fission.bfcacheInParent" to false
- )
+ "fission.bfcacheInParent" to false,
+ ),
)
fun countAutoFillNodes(
cond: (AccessibilityNodeInfo) -> Boolean =
{ it.className == "android.widget.EditText" },
- id: Int = View.NO_ID
+ id: Int = View.NO_ID,
): Int {
val info = createNodeInfo(id)
return (
@@ -1492,12 +1493,12 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Initial auto-fill count should match",
countAutoFillNodes(),
- equalTo(18)
+ equalTo(18),
)
assertThat(
"Password auto-fill count should match",
countAutoFillNodes({ it.isPassword }),
- equalTo(4)
+ equalTo(4),
)
// Now wait for the nodes to clear.
@@ -1506,7 +1507,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Should not have auto-fill fields",
countAutoFillNodes(),
- equalTo(0)
+ equalTo(0),
)
// Now wait for the nodes to reappear.
@@ -1516,12 +1517,12 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Should have auto-fill fields again",
countAutoFillNodes(),
- equalTo(18)
+ equalTo(18),
)
assertThat(
"Should not have focused field",
countAutoFillNodes({ it.isFocused }),
- equalTo(0)
+ equalTo(0),
)
mainSession.evaluateJS("document.querySelector('#pass1').focus()")
@@ -1533,7 +1534,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Should have one focused field",
countAutoFillNodes({ it.isFocused }),
- equalTo(1)
+ equalTo(1),
)
mainSession.evaluateJS("document.querySelector('#pass1').blur()")
@@ -1545,7 +1546,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Should not have focused field",
countAutoFillNodes({ it.isFocused }),
- equalTo(0)
+ equalTo(0),
)
}
@@ -1579,12 +1580,12 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Entry hint is label",
entryNode.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("Name:")
+ equalTo("Name:"),
)
assertThat(
"Entry input type is correct",
entryNode.inputType,
- equalTo(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT)
+ equalTo(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT),
)
}
@@ -1633,7 +1634,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -1648,7 +1649,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@@ -1755,7 +1756,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@AssertCalled(count = 1)
@@ -1765,13 +1766,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on text leaf",
node.text as String,
- startsWith("One")
+ startsWith("One"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"first item is a text leaf",
node.extras.getCharSequence("AccessibilityNodeInfo.geckoRole")!!.toString(),
- equalTo("text leaf")
+ equalTo("text leaf"),
)
}
}
@@ -1780,7 +1781,7 @@ class AccessibilityTest : BaseSessionTest() {
provider.performAction(
nodeId,
AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,
- null
+ null,
)
sessionRule.waitUntilCalled(object : EventDelegate {
@AssertCalled(count = 1)
@@ -1790,13 +1791,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on link",
node.contentDescription as String,
- startsWith("Two")
+ startsWith("Two"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"second item is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.geckoRole")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
@@ -1857,13 +1858,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with href",
node.contentDescription as String,
- startsWith("a with href")
+ startsWith("a with href"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with href is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
@@ -1878,13 +1879,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with no attributes",
node.text as String,
- startsWith("a with no attributes")
+ startsWith("a with no attributes"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with no attributes is not a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("")
+ equalTo(""),
)
}
}
@@ -1899,13 +1900,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with name",
node.text as String,
- startsWith("a with name")
+ startsWith("a with name"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with name is not a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("")
+ equalTo(""),
)
}
}
@@ -1920,13 +1921,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with onclick",
node.contentDescription as String,
- startsWith("a with onclick")
+ startsWith("a with onclick"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with onclick is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
@@ -1941,13 +1942,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on span with role link",
node.contentDescription as String,
- startsWith("span with role link")
+ startsWith("span with role link"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"span with role link is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
@@ -1971,7 +1972,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with href",
node.contentDescription as String,
- startsWith("a with href")
+ startsWith("a with href"),
)
}
})
@@ -1985,7 +1986,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with onclick",
node.contentDescription as String,
- startsWith("a with onclick")
+ startsWith("a with onclick"),
)
}
})
@@ -1999,7 +2000,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on span with role link",
node.contentDescription as String,
- startsWith("span with role link")
+ startsWith("span with role link"),
)
}
})
@@ -2019,13 +2020,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus is EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Accessibility focus on ARIA 1.0 combobox",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("ARIA 1.0 combobox")
+ equalTo("ARIA 1.0 combobox"),
)
}
}
@@ -2040,13 +2041,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus is EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Accessibility focus on ARIA 1.1 combobox",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("ARIA 1.1 combobox")
+ equalTo("ARIA 1.1 combobox"),
)
}
}
@@ -2070,13 +2071,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus is EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Accessibility focus on ARIA 1.0 combobox",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("ARIA 1.0 combobox")
+ equalTo("ARIA 1.0 combobox"),
)
}
}
@@ -2091,13 +2092,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus is EditBox",
node.className.toString(),
- equalTo("android.widget.EditText")
+ equalTo("android.widget.EditText"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"Accessibility focus on ARIA 1.1 combobox",
node.extras.getString("AccessibilityNodeInfo.hint"),
- equalTo("ARIA 1.1 combobox")
+ equalTo("ARIA 1.1 combobox"),
)
}
}
@@ -2120,7 +2121,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with href",
node.contentDescription as String,
- startsWith("a with href")
+ startsWith("a with href"),
)
}
})
@@ -2144,7 +2145,7 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with no attributes",
node.text as String,
- startsWith("a with no attributes")
+ startsWith("a with no attributes"),
)
}
})
@@ -2174,13 +2175,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with name",
node.text as String,
- startsWith("a with name")
+ startsWith("a with name"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with name is not a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("")
+ equalTo(""),
)
}
}
@@ -2195,13 +2196,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on a with onclick",
node.contentDescription as String,
- startsWith("a with onclick")
+ startsWith("a with onclick"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"a with onclick is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
@@ -2226,13 +2227,13 @@ class AccessibilityTest : BaseSessionTest() {
assertThat(
"Accessibility focus on span with role link",
node.contentDescription as String,
- startsWith("span with role link")
+ startsWith("span with role link"),
)
if (Build.VERSION.SDK_INT >= 19) {
assertThat(
"span with role link is a link",
node.extras.getCharSequence("AccessibilityNodeInfo.roleDescription")!!.toString(),
- equalTo("link")
+ equalTo("link"),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt
index 796f0bfdd04c3fa472ff93274310b3b4f50ed7d5..fbfe2fe46d32b85695e9f73fbcc691e8d5ffc282 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt
@@ -68,32 +68,32 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Guid should match",
login.guid,
- equalTo(null)
+ equalTo(null),
)
assertThat(
"Origin should match",
login.origin,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Form action origin should match",
login.formActionOrigin,
- equalTo(null)
+ equalTo(null),
)
assertThat(
"HTTP realm should match",
login.httpRealm,
- equalTo(null)
+ equalTo(null),
)
assertThat(
"Username should match",
login.username,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Password should match",
login.password,
- equalTo("")
+ equalTo(""),
)
}
@@ -103,8 +103,8 @@ class AutocompleteTest : BaseSessionTest() {
mapOf(
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
- "signon.autofillForms.http" to true
- )
+ "signon.autofillForms.http" to true,
+ ),
)
val fetchHandled = GeckoResult<Void>()
@@ -156,27 +156,27 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Guid should match",
creditCard.guid,
- equalTo(null)
+ equalTo(null),
)
assertThat(
"Name should match",
creditCard.name,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Number should match",
creditCard.number,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Expiration month should match",
creditCard.expirationMonth,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Expiration year should match",
creditCard.expirationYear,
- equalTo("")
+ equalTo(""),
)
}
@@ -213,7 +213,7 @@ class AutocompleteTest : BaseSessionTest() {
.number(number[1])
.expirationMonth(expMonth[1])
.expirationYear(expYear[1])
- .build()
+ .build(),
)
val selectHandled = GeckoResult<Void>()
@@ -235,14 +235,14 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onCreditCardSelect(
session: GeckoSession,
- prompt: AutocompleteRequest<CreditCardSelectOption>
+ prompt: AutocompleteRequest<CreditCardSelectOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
assertThat(
"There should be two options",
prompt.options.size,
- equalTo(2)
+ equalTo(2),
)
for (i in 0..1) {
@@ -252,22 +252,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Name should match",
creditCard.name,
- equalTo(name[i])
+ equalTo(name[i]),
)
assertThat(
"Number should match",
creditCard.number,
- equalTo(number[i])
+ equalTo(number[i]),
)
assertThat(
"Expiration month should match",
creditCard.expirationMonth,
- equalTo(expMonth[i])
+ equalTo(expMonth[i]),
)
assertThat(
"Expiration year should match",
creditCard.expirationYear,
- equalTo(expYear[i])
+ equalTo(expYear[i]),
)
}
Handler(Looper.getMainLooper()).postDelayed({
@@ -285,22 +285,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Filled name should match",
mainSession.evaluateJS("document.querySelector('#name').value") as String,
- equalTo(name[0])
+ equalTo(name[0]),
)
assertThat(
"Filled number should match",
mainSession.evaluateJS("document.querySelector('#number').value") as String,
- equalTo(number[0])
+ equalTo(number[0]),
)
assertThat(
"Filled expiration month should match",
mainSession.evaluateJS("document.querySelector('#expMonth').value") as String,
- equalTo(expMonth[0])
+ equalTo(expMonth[0]),
)
assertThat(
"Filled expiration year should match",
mainSession.evaluateJS("document.querySelector('#expYear').value") as String,
- equalTo(expYear[0])
+ equalTo(expYear[0]),
)
}
@@ -312,62 +312,62 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Guid should match",
address.guid,
- equalTo(null)
+ equalTo(null),
)
assertThat(
"Name should match",
address.name,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Given name should match",
address.givenName,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Family name should match",
address.familyName,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Street address should match",
address.streetAddress,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Address level 1 should match",
address.addressLevel1,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Address level 2 should match",
address.addressLevel2,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Address level 3 should match",
address.addressLevel3,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Postal code should match",
address.postalCode,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Country should match",
address.country,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Tel should match",
address.tel,
- equalTo("")
+ equalTo(""),
)
assertThat(
"Email should match",
address.email,
- equalTo("")
+ equalTo(""),
)
}
@@ -402,7 +402,7 @@ class AutocompleteTest : BaseSessionTest() {
.number(number[2])
.expirationMonth(expMonth[2])
.expirationYear(expYear[2])
- .build()
+ .build(),
)
mainSession.loadTestPath(CC_FORM_HTML_PATH)
@@ -429,7 +429,7 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"There should be three options",
prompt.options.size,
- equalTo(3)
+ equalTo(3),
)
prompt.setDelegate(promptInstanceDelegate)
Handler(Looper.getMainLooper()).postDelayed({
@@ -493,14 +493,14 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onAddressSelect(
session: GeckoSession,
- prompt: AutocompleteRequest<AddressSelectOption>
+ prompt: AutocompleteRequest<AddressSelectOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
assertThat(
"There should be one option",
prompt.options.size,
- equalTo(savedAddresses.size)
+ equalTo(savedAddresses.size),
)
val addressOption = prompt.options.find { it.value.familyName == selectedAddress.familyName }
@@ -510,62 +510,62 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Guid should match",
address?.guid,
- equalTo(selectedAddress.guid)
+ equalTo(selectedAddress.guid),
)
assertThat(
"Name should match",
address?.name,
- equalTo(selectedAddress.name)
+ equalTo(selectedAddress.name),
)
assertThat(
"Given name should match",
address?.givenName,
- equalTo(selectedAddress.givenName)
+ equalTo(selectedAddress.givenName),
)
assertThat(
"Family name should match",
address?.familyName,
- equalTo(selectedAddress.familyName)
+ equalTo(selectedAddress.familyName),
)
assertThat(
"Street address should match",
address?.streetAddress,
- equalTo(selectedAddress.streetAddress)
+ equalTo(selectedAddress.streetAddress),
)
assertThat(
"Address level 1 should match",
address?.addressLevel1,
- equalTo(selectedAddress.addressLevel1)
+ equalTo(selectedAddress.addressLevel1),
)
assertThat(
"Address level 2 should match",
address?.addressLevel2,
- equalTo(selectedAddress.addressLevel2)
+ equalTo(selectedAddress.addressLevel2),
)
assertThat(
"Address level 3 should match",
address?.addressLevel3,
- equalTo(selectedAddress.addressLevel3)
+ equalTo(selectedAddress.addressLevel3),
)
assertThat(
"Postal code should match",
address?.postalCode,
- equalTo(selectedAddress.postalCode)
+ equalTo(selectedAddress.postalCode),
)
assertThat(
"Country should match",
address?.country,
- equalTo(selectedAddress.country)
+ equalTo(selectedAddress.country),
)
assertThat(
"Tel should match",
address?.tel,
- equalTo(selectedAddress.tel)
+ equalTo(selectedAddress.tel),
)
assertThat(
"Email should match",
address?.email,
- equalTo(selectedAddress.email)
+ equalTo(selectedAddress.email),
)
Handler(Looper.getMainLooper()).postDelayed({
@@ -586,42 +586,42 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Filled given name should match",
mainSession.evaluateJS("document.querySelector('#givenName').value") as String,
- equalTo(selectedAddress.givenName)
+ equalTo(selectedAddress.givenName),
)
assertThat(
"Filled family name should match",
mainSession.evaluateJS("document.querySelector('#familyName').value") as String,
- equalTo(selectedAddress.familyName)
+ equalTo(selectedAddress.familyName),
)
assertThat(
"Filled street address should match",
mainSession.evaluateJS("document.querySelector('#streetAddress').value") as String,
- equalTo(selectedAddress.streetAddress)
+ equalTo(selectedAddress.streetAddress),
)
assertThat(
"Filled country should match",
mainSession.evaluateJS("document.querySelector('#country').value") as String,
- equalTo(selectedAddress.country)
+ equalTo(selectedAddress.country),
)
assertThat(
"Filled postal code should match",
mainSession.evaluateJS("document.querySelector('#postalCode').value") as String,
- equalTo(selectedAddress.postalCode)
+ equalTo(selectedAddress.postalCode),
)
assertThat(
"Filled email should match",
mainSession.evaluateJS("document.querySelector('#email').value") as String,
- equalTo(selectedAddress.email)
+ equalTo(selectedAddress.email),
)
assertThat(
"Filled telephone number should match",
mainSession.evaluateJS("document.querySelector('#tel').value") as String,
- equalTo(selectedAddress.tel)
+ equalTo(selectedAddress.tel),
)
assertThat(
"Filled organization should match",
mainSession.evaluateJS("document.querySelector('#organization').value") as String,
- equalTo(selectedAddress.organization)
+ equalTo(selectedAddress.organization),
)
}
@@ -691,7 +691,7 @@ class AutocompleteTest : BaseSessionTest() {
.tel(tels[0])
.organization(organizations[0])
.build(),
- selectedAddress
+ selectedAddress,
)
checkAddressesForCorrectness(savedAddresses.toTypedArray(), selectedAddress)
@@ -744,7 +744,7 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"There should be one option",
prompt.options.size,
- equalTo(1)
+ equalTo(1),
)
prompt.setDelegate(promptInstanceDelegate)
Handler(Looper.getMainLooper()).postDelayed({
@@ -771,8 +771,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
sessionRule.delegateDuringNextWait(object : StorageDelegate {
@@ -803,7 +803,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
val option = prompt.options[0]
val login = option.value
@@ -813,13 +813,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo("user1x")
+ equalTo("user1x"),
)
assertThat(
"Password should match",
login.password,
- equalTo("pass1x")
+ equalTo("pass1x"),
)
return GeckoResult.fromValue(prompt.dismiss())
@@ -834,8 +834,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
mainSession.loadTestPath(FORMS3_HTML_PATH)
@@ -849,13 +849,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo("user1x")
+ equalTo("user1x"),
)
assertThat(
"Password should match",
login.password,
- equalTo("pass1x")
+ equalTo("pass1x"),
)
saveHandled.complete(null)
@@ -866,7 +866,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -878,13 +878,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo("user1x")
+ equalTo("user1x"),
)
assertThat(
"Password should match",
login.password,
- equalTo("pass1x")
+ equalTo("pass1x"),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -908,8 +908,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
mainSession.loadTestPath(FORMS3_HTML_PATH)
@@ -923,13 +923,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo("user1x")
+ equalTo("user1x"),
)
assertThat(
"Password should match",
login.password,
- equalTo("pass1xmod")
+ equalTo("pass1xmod"),
)
saveHandled.complete(null)
@@ -940,7 +940,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -952,13 +952,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo("user1x")
+ equalTo("user1x"),
)
assertThat(
"Password should match",
login.password,
- equalTo("pass1x")
+ equalTo("pass1x"),
)
val modLogin = LoginEntry.Builder()
@@ -990,8 +990,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
val saveHandled = GeckoResult<Void>()
@@ -1016,19 +1016,19 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(forEachCall(pass1, pass2))
+ equalTo(forEachCall(pass1, pass2)),
)
assertThat(
"GUID should match",
login.guid,
- equalTo(forEachCall(null, guid))
+ equalTo(forEachCall(null, guid)),
)
val savedLogin = LoginEntry.Builder()
@@ -1053,7 +1053,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -1065,13 +1065,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(forEachCall(pass1, pass2))
+ equalTo(forEachCall(pass1, pass2)),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -1124,7 +1124,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled
override fun onCreditCardSave(
session: GeckoSession,
- request: AutocompleteRequest<CreditCardSaveOption>
+ request: AutocompleteRequest<CreditCardSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Session should not be null", session, notNullValue())
@@ -1136,22 +1136,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
cc.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
cc.number,
- equalTo(ccNumber)
+ equalTo(ccNumber),
)
assertThat(
"Credit card expiration month should match",
cc.expirationMonth,
- equalTo(ccExpMonth)
+ equalTo(ccExpMonth),
)
assertThat(
"Credit card expiration year should match",
cc.expirationYear,
- equalTo(ccExpYear)
+ equalTo(ccExpYear),
)
return GeckoResult.fromValue(request.confirm(option))
@@ -1203,7 +1203,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled
override fun onCreditCardSave(
session: GeckoSession,
- request: AutocompleteRequest<CreditCardSaveOption>
+ request: AutocompleteRequest<CreditCardSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Session should not be null", session, notNullValue())
@@ -1215,22 +1215,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
cc.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
cc.number,
- equalTo(ccNumber)
+ equalTo(ccNumber),
)
assertThat(
"Credit card expiration month should match",
cc.expirationMonth,
- equalTo(ccExpMonth)
+ equalTo(ccExpMonth),
)
assertThat(
"Credit card expiration year should match",
cc.expirationYear,
- equalTo(ccExpYear)
+ equalTo(ccExpYear),
)
return GeckoResult.fromValue(request.confirm(option))
@@ -1290,7 +1290,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled
override fun onCreditCardSave(
session: GeckoSession,
- request: AutocompleteRequest<CreditCardSaveOption>
+ request: AutocompleteRequest<CreditCardSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Session should not be null", session, notNullValue())
@@ -1302,22 +1302,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
cc.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
cc.number,
- equalTo(ccNumber)
+ equalTo(ccNumber),
)
assertThat(
"Credit card expiration month should match",
cc.expirationMonth,
- equalTo(ccExpMonth)
+ equalTo(ccExpMonth),
)
assertThat(
"Credit card expiration year should match",
cc.expirationYear,
- equalTo(ccExpYear)
+ equalTo(ccExpYear),
)
return GeckoResult.fromValue(request.dismiss())
@@ -1353,7 +1353,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled
override fun onCreditCardSave(
session: GeckoSession,
- request: AutocompleteRequest<CreditCardSaveOption>
+ request: AutocompleteRequest<CreditCardSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Session should not be null", session, notNullValue())
@@ -1365,22 +1365,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
cc.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
cc.number,
- equalTo(ccNumber)
+ equalTo(ccNumber),
)
assertThat(
"Credit card expiration month should match",
cc.expirationMonth,
- equalTo(ccExpMonth)
+ equalTo(ccExpMonth),
)
assertThat(
"Credit card expiration year should match",
cc.expirationYear,
- equalTo(ccExpYear)
+ equalTo(ccExpYear),
)
val modifiedCreditCard = CreditCard.Builder()
@@ -1438,22 +1438,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
creditCard.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
creditCard.number,
- equalTo(forEachCall(ccNumber1, ccNumber2))
+ equalTo(forEachCall(ccNumber1, ccNumber2)),
)
assertThat(
"Credit card expiration month should match",
creditCard.expirationMonth,
- equalTo(forEachCall(ccExpMonth1, ccExpMonth2))
+ equalTo(forEachCall(ccExpMonth1, ccExpMonth2)),
)
assertThat(
"Credit card expiration year should match",
creditCard.expirationYear,
- equalTo(forEachCall(ccExpYear1, ccExpYear2))
+ equalTo(forEachCall(ccExpYear1, ccExpYear2)),
)
val savedCC = CreditCard.Builder()
@@ -1477,7 +1477,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onCreditCardSave(
session: GeckoSession,
- request: AutocompleteRequest<CreditCardSaveOption>
+ request: AutocompleteRequest<CreditCardSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Session should not be null", session, notNullValue())
@@ -1489,22 +1489,22 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Credit card name should match",
cc.name,
- equalTo(ccName)
+ equalTo(ccName),
)
assertThat(
"Credit card number should match",
cc.number,
- equalTo(forEachCall(ccNumber1, ccNumber2))
+ equalTo(forEachCall(ccNumber1, ccNumber2)),
)
assertThat(
"Credit card expiration month should match",
cc.expirationMonth,
- equalTo(forEachCall(ccExpMonth1, ccExpMonth2))
+ equalTo(forEachCall(ccExpMonth1, ccExpMonth2)),
)
assertThat(
"Credit card expiration year should match",
cc.expirationYear,
- equalTo(forEachCall(ccExpYear1, ccExpYear2))
+ equalTo(forEachCall(ccExpYear1, ccExpYear2)),
)
return GeckoResult.fromValue(request.confirm(option))
@@ -1550,8 +1550,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
val usedHandled = GeckoResult<Void>()
@@ -1583,25 +1583,25 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Used fields should match",
usedFields,
- equalTo(UsedField.PASSWORD)
+ equalTo(UsedField.PASSWORD),
)
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass1)
+ equalTo(pass1),
)
assertThat(
"GUID should match",
login.guid,
- equalTo(guid)
+ equalTo(guid),
)
usedHandled.complete(null)
@@ -1625,7 +1625,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(false)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
return null
}
@@ -1660,8 +1660,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
val user1 = "user1x"
@@ -1693,7 +1693,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(false)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
return null
}
@@ -1703,25 +1703,25 @@ class AutocompleteTest : BaseSessionTest() {
mainSession.waitForPageStop()
mainSession.evaluateJS("document.querySelector('#user1').focus()")
mainSession.evaluateJS(
- "document.querySelector('#user1').value = '$user1'"
+ "document.querySelector('#user1').value = '$user1'",
)
mainSession.pressKey(KeyEvent.KEYCODE_TAB)
val pass = mainSession.evaluateJS(
- "document.querySelector('#pass1').value"
+ "document.querySelector('#pass1').value",
) as String
if (autofillEnabled) {
assertThat(
"Password should match",
pass,
- equalTo(pass1)
+ equalTo(pass1),
)
} else {
assertThat(
"Password should not be filled",
pass,
- equalTo("")
+ equalTo(""),
)
}
}
@@ -1746,8 +1746,8 @@ class AutocompleteTest : BaseSessionTest() {
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
"dom.disable_open_during_load" to false,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
// Test:
@@ -1824,13 +1824,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(username)
+ equalTo(username),
)
assertThat(
"Password should match",
login.password,
- equalTo(password)
+ equalTo(password),
)
handle.complete(null)
@@ -1841,25 +1841,25 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Used fields should match",
usedFields,
- equalTo(UsedField.PASSWORD)
+ equalTo(UsedField.PASSWORD),
)
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass1)
+ equalTo(pass1),
)
assertThat(
"GUID should match",
login.guid,
- equalTo(user1)
+ equalTo(user1),
)
usedHandled.complete(null)
@@ -1873,7 +1873,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -1885,13 +1885,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass1)
+ equalTo(pass1),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -1915,7 +1915,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -1927,13 +1927,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user2)
+ equalTo(user2),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass2)
+ equalTo(pass2),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -1955,14 +1955,14 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSelect(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSelectOption>
+ prompt: AutocompleteRequest<LoginSelectOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
assertThat(
"There should be two options",
prompt.options.size,
- equalTo(2)
+ equalTo(2),
)
var usernames = arrayOf(user1, user2)
@@ -1975,12 +1975,12 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(usernames[i])
+ equalTo(usernames[i]),
)
assertThat(
"Password should match",
login.password,
- equalTo(passwords[i])
+ equalTo(passwords[i]),
)
}
@@ -2002,13 +2002,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Filled username should match",
session3.evaluateJS("document.querySelector('#user1').value") as String,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Filled password should match",
session3.evaluateJS("document.querySelector('#pass1').value") as String,
- equalTo(pass1)
+ equalTo(pass1),
)
// Submit the selection.
@@ -2024,8 +2024,8 @@ class AutocompleteTest : BaseSessionTest() {
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
"dom.disable_open_during_load" to false,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
// Test:
@@ -2103,13 +2103,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(username)
+ equalTo(username),
)
assertThat(
"Password should match",
login.password,
- equalTo(password)
+ equalTo(password),
)
handle.complete(null)
@@ -2126,7 +2126,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -2138,13 +2138,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass1)
+ equalTo(pass1),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -2168,7 +2168,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -2180,13 +2180,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user2)
+ equalTo(user2),
)
assertThat(
"Password should match",
login.password,
- equalTo(pass2)
+ equalTo(pass2),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -2208,14 +2208,14 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSelect(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSelectOption>
+ prompt: AutocompleteRequest<LoginSelectOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
assertThat(
"There should be two options",
prompt.options.size,
- equalTo(2)
+ equalTo(2),
)
var usernames = arrayOf(user1, user2)
@@ -2228,12 +2228,12 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(usernames[i])
+ equalTo(usernames[i]),
)
assertThat(
"Password should match",
login.password,
- equalTo(passwords[i])
+ equalTo(passwords[i]),
)
}
@@ -2244,7 +2244,7 @@ class AutocompleteTest : BaseSessionTest() {
.formActionOrigin(login.formActionOrigin)
.username(userMod)
.password(passMod)
- .build()
+ .build(),
)
Handler(Looper.getMainLooper()).postDelayed({
@@ -2265,13 +2265,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Filled username should match",
session3.evaluateJS("document.querySelector('#user1').value") as String,
- equalTo(userMod)
+ equalTo(userMod),
)
assertThat(
"Filled password should match",
session3.evaluateJS("document.querySelector('#pass1').value") as String,
- equalTo(passMod)
+ equalTo(passMod),
)
// Submit the selection.
@@ -2289,8 +2289,8 @@ class AutocompleteTest : BaseSessionTest() {
"signon.generation.enabled" to true,
"signon.generation.available" to true,
"dom.disable_open_during_load" to false,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
// Test:
@@ -2322,13 +2322,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
assertThat(
"Password should match",
login.password,
- equalTo(genPass)
+ equalTo(genPass),
)
saveHandled1.complete(null)
@@ -2345,14 +2345,14 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled
override fun onLoginSelect(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSelectOption>
+ prompt: AutocompleteRequest<LoginSelectOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
assertThat(
"There should be one option",
prompt.options.size,
- equalTo(1)
+ equalTo(1),
)
val option = prompt.options[0]
@@ -2361,14 +2361,14 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Hint should match",
option.hint,
- equalTo(SelectOption.Hint.GENERATED)
+ equalTo(SelectOption.Hint.GENERATED),
)
assertThat("Login should not be null", login, notNullValue())
assertThat(
"Password should not be empty",
login.password,
- not(isEmptyOrNullString())
+ not(isEmptyOrNullString()),
)
genPass = login.password
@@ -2386,7 +2386,7 @@ class AutocompleteTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoginSave(
session: GeckoSession,
- prompt: AutocompleteRequest<LoginSaveOption>
+ prompt: AutocompleteRequest<LoginSaveOption>,
): GeckoResult<PromptDelegate.PromptResponse>? {
assertThat("Session should not be null", session, notNullValue())
@@ -2398,7 +2398,7 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Username should match",
login.username,
- equalTo(user1)
+ equalTo(user1),
)
// TODO: The flag is only set for login entry updates yet.
@@ -2412,13 +2412,13 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Password should not be empty",
login.password,
- not(isEmptyOrNullString())
+ not(isEmptyOrNullString()),
)
assertThat(
"Password should match",
login.password,
- equalTo(genPass)
+ equalTo(genPass),
)
return GeckoResult.fromValue(prompt.confirm(option))
@@ -2433,23 +2433,23 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"Filled username should match",
mainSession.evaluateJS("document.querySelector('#user1').value") as String,
- equalTo(user1)
+ equalTo(user1),
)
val filledPass = mainSession.evaluateJS(
- "document.querySelector('#pass1').value"
+ "document.querySelector('#pass1').value",
) as String
assertThat(
"Password should not be empty",
filledPass,
- not(isEmptyOrNullString())
+ not(isEmptyOrNullString()),
)
assertThat(
"Filled password should match",
filledPass,
- equalTo(genPass)
+ equalTo(genPass),
)
// Submit the selection.
@@ -2464,8 +2464,8 @@ class AutocompleteTest : BaseSessionTest() {
// Enable login management since it's disabled in automation.
"signon.rememberSignons" to true,
"signon.autofillForms.http" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
val user = arrayOf("user1x", "user2x")
@@ -2486,7 +2486,7 @@ class AutocompleteTest : BaseSessionTest() {
.formActionOrigin(origin)
.username(user[1])
.password(pass[1])
- .build()
+ .build(),
)
sessionRule.delegateUntilTestEnd(object : StorageDelegate {
@@ -2510,7 +2510,7 @@ class AutocompleteTest : BaseSessionTest() {
assertThat(
"There should be two options",
prompt.options.size,
- equalTo(2)
+ equalTo(2),
)
prompt.setDelegate(promptInstanceDelegate)
Handler(Looper.getMainLooper()).postDelayed({
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt
index f6588db12bb96151ac47e404de2ac6e896f9eb66..f1adc7bf1e9c7f169a57f4f3e58370febc59c317 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt
@@ -28,7 +28,7 @@ class AutofillDelegateTest : BaseSessionTest() {
@JvmStatic
val parameters: List<Array<out Any>> = listOf(
arrayOf("#inProcess"),
- arrayOf("#oop")
+ arrayOf("#oop"),
)
}
@@ -50,8 +50,8 @@ class AutofillDelegateTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"signon.rememberSignons" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
mainSession.loadUri(pageUrl)
@@ -66,7 +66,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -87,7 +87,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeUpdate(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
}
@@ -95,7 +95,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onSessionCommit(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
val autofillSession = mainSession.autofillSession
assertThat(
@@ -103,28 +103,28 @@ class AutofillDelegateTest : BaseSessionTest() {
countAutofillNodes({
autofillSession.dataFor(it).value == "user1x"
}),
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Values should match",
countAutofillNodes({
autofillSession.dataFor(it).value == "pass1x"
}),
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Values should match",
countAutofillNodes({
autofillSession.dataFor(it).value == "e@mail.com"
}),
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Values should match",
countAutofillNodes({
autofillSession.dataFor(it).value == "1"
}),
- equalTo(1)
+ equalTo(1),
)
}
})
@@ -134,8 +134,8 @@ class AutofillDelegateTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"signon.rememberSignons" to true,
- "signon.userInputRequiredToCapture.enabled" to false
- )
+ "signon.userInputRequiredToCapture.enabled" to false,
+ ),
)
mainSession.loadTestPath(FORMS_ID_VALUE_HTML_PATH)
@@ -148,7 +148,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -166,7 +166,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeUpdate(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
}
@@ -174,14 +174,14 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onSessionCommit(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat(
"Values should match",
countAutofillNodes({
mainSession.autofillSession.dataFor(it).value == "pass1x"
}),
- equalTo(1)
+ equalTo(1),
)
}
})
@@ -198,7 +198,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -212,7 +212,7 @@ class AutofillDelegateTest : BaseSessionTest() {
"#pass2" to "baz",
"#email1" to "a@b.c",
"#number1" to "24",
- "#tel1" to "42"
+ "#tel1" to "42",
)
// Set up promises to monitor the values changing.
@@ -221,7 +221,7 @@ class AutofillDelegateTest : BaseSessionTest() {
mainSession.evaluatePromiseJS(
"""
window.getDataForAllFrames('${entry.key}', '${entry.value}')
- """
+ """,
)
}
@@ -243,13 +243,13 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should have HTML tag",
child.tag,
- not(isEmptyOrNullString())
+ not(isEmptyOrNullString()),
)
if (domain != "") {
assertThat(
"Web domain should match its parent.",
child.domain,
- equalTo(domain)
+ equalTo(domain),
)
}
@@ -258,7 +258,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Input should be focusable",
child.focusable,
- equalTo(true)
+ equalTo(true),
)
assertThat("Should have HTML tag", child.tag, equalTo("input"))
@@ -277,7 +277,7 @@ class AutofillDelegateTest : BaseSessionTest() {
else -> "bar"
}
else -> "bar"
- }
+ },
)
}
@@ -295,7 +295,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"input event should be dispatched with InputEvent interface",
eventInterface,
- equalTo("InputEvent")
+ equalTo("InputEvent"),
)
}
}
@@ -311,7 +311,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -326,7 +326,7 @@ class AutofillDelegateTest : BaseSessionTest() {
private fun countAutofillNodes(
cond: (Autofill.Node) -> Boolean =
{ it.inputType != Autofill.InputType.NONE },
- root: Autofill.Node? = null
+ root: Autofill.Node? = null,
): Int {
val node = if (root !== null) root else mainSession.autofillSession.root
return (if (cond(node)) 1 else 0) +
@@ -342,35 +342,35 @@ class AutofillDelegateTest : BaseSessionTest() {
mainSession.loadUri(pageUrl)
sessionRule.waitUntilCalled(object :
- Autofill.Delegate,
- ShouldContinue,
- GeckoSession.ProgressDelegate {
- var nodeCount = 0
-
- // Continue waiting util we get all 16 nodes
- override fun shouldContinue(): Boolean = nodeCount < 16
-
- @AssertCalled(count = 1)
- override fun onSessionStart(session: GeckoSession) {}
-
- @AssertCalled(count = -1)
- override fun onNodeAdd(
- session: GeckoSession,
- node: Autofill.Node,
- data: Autofill.NodeData
- ) {
- assertThat("Node should be valid", node, notNullValue())
- nodeCount = countAutofillNodes()
- }
+ Autofill.Delegate,
+ ShouldContinue,
+ GeckoSession.ProgressDelegate {
+ var nodeCount = 0
- @AssertCalled(count = 1)
- override fun onPageStop(session: GeckoSession, success: Boolean) {}
- })
+ // Continue waiting util we get all 16 nodes
+ override fun shouldContinue(): Boolean = nodeCount < 16
+
+ @AssertCalled(count = 1)
+ override fun onSessionStart(session: GeckoSession) {}
+
+ @AssertCalled(count = -1)
+ override fun onNodeAdd(
+ session: GeckoSession,
+ node: Autofill.Node,
+ data: Autofill.NodeData,
+ ) {
+ assertThat("Node should be valid", node, notNullValue())
+ nodeCount = countAutofillNodes()
+ }
+
+ @AssertCalled(count = 1)
+ override fun onPageStop(session: GeckoSession, success: Boolean) {}
+ })
assertThat(
"Initial auto-fill count should match",
countAutofillNodes(),
- equalTo(16)
+ equalTo(16),
)
// Now wait for the nodes to clear.
@@ -386,45 +386,45 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should not have auto-fill fields",
countAutofillNodes(),
- equalTo(0)
+ equalTo(0),
)
mainSession.goBack()
sessionRule.waitUntilCalled(object :
- Autofill.Delegate,
- GeckoSession.ProgressDelegate,
- ShouldContinue {
- var nodeCount = 0
- override fun shouldContinue(): Boolean = nodeCount < 16
-
- @AssertCalled(count = 1)
- override fun onSessionStart(session: GeckoSession) {}
-
- @AssertCalled(count = -1)
- override fun onNodeAdd(
- session: GeckoSession,
- node: Autofill.Node,
- data: Autofill.NodeData
- ) {
- assertThat("Node should be valid", node, notNullValue())
- nodeCount = countAutofillNodes()
- }
+ Autofill.Delegate,
+ GeckoSession.ProgressDelegate,
+ ShouldContinue {
+ var nodeCount = 0
+ override fun shouldContinue(): Boolean = nodeCount < 16
+
+ @AssertCalled(count = 1)
+ override fun onSessionStart(session: GeckoSession) {}
+
+ @AssertCalled(count = -1)
+ override fun onNodeAdd(
+ session: GeckoSession,
+ node: Autofill.Node,
+ data: Autofill.NodeData,
+ ) {
+ assertThat("Node should be valid", node, notNullValue())
+ nodeCount = countAutofillNodes()
+ }
- @AssertCalled(count = 1)
- override fun onPageStop(session: GeckoSession, success: Boolean) {}
- })
+ @AssertCalled(count = 1)
+ override fun onPageStop(session: GeckoSession, success: Boolean) {}
+ })
assertThat(
"Should have auto-fill fields again",
countAutofillNodes(),
- equalTo(16)
+ equalTo(16),
)
var focused = mainSession.autofillSession.focused
assertThat(
"Should not have focused field",
countAutofillNodes({ it == focused }),
- equalTo(0)
+ equalTo(0),
)
mainSession.evaluateJS("document.querySelector('#pass2').focus()")
@@ -434,7 +434,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -444,7 +444,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should have one focused field",
countAutofillNodes({ it == focused }),
- equalTo(1)
+ equalTo(1),
)
// The focused field, its siblings, its parent, and the root node should
// be visible.
@@ -454,7 +454,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should have nine visible nodes",
countAutofillNodes({ node -> mainSession.autofillSession.isVisible(node) }),
- equalTo(8)
+ equalTo(8),
)
mainSession.evaluateJS("document.querySelector('#pass2').blur()")
@@ -463,7 +463,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeBlur(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -473,7 +473,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should not have focused field",
countAutofillNodes({ it == focused }),
- equalTo(0)
+ equalTo(0),
)
}
@@ -490,14 +490,14 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = -1)
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -529,7 +529,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"autofill hint count",
checkAutofillChild(root),
- equalTo(4)
+ equalTo(4),
)
}
@@ -550,7 +550,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -563,7 +563,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -573,7 +573,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should have one focused field",
countAutofillNodes({ it == focused }),
- equalTo(1)
+ equalTo(1),
)
// Make sure we get NODE_BLURRED when inactive
@@ -583,7 +583,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeBlur(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -596,7 +596,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -606,7 +606,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"Should have one focused field",
countAutofillNodes({ focused == it }),
- equalTo(1)
+ equalTo(1),
)
}
@@ -619,7 +619,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeAdd(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {}
@AssertCalled(count = 1)
@@ -643,7 +643,7 @@ class AutofillDelegateTest : BaseSessionTest() {
assertThat(
"autofill hint count",
checkAutofillChild(root),
- equalTo(6)
+ equalTo(6),
)
}
@@ -662,7 +662,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
}
@@ -691,7 +691,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
screenRect = node.screenRect
}
@@ -704,7 +704,7 @@ class AutofillDelegateTest : BaseSessionTest() {
override fun onNodeFocus(
session: GeckoSession,
node: Autofill.Node,
- data: Autofill.NodeData
+ data: Autofill.NodeData,
) {
assertThat("ID should be valid", node, notNullValue())
// iframe's input element should consider iframe's offset. 200 is enough offset.
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
index 8c326169d83a21f37b1d81b38bba371a2a352b2c..d2964aa54bd41bbf0660720edd9765ef810080bf 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
@@ -182,7 +182,7 @@ open class BaseSessionTest(noErrorCollector: Boolean = false) {
assertThat(
"Read parcel matches written parcel",
parcel.dataPosition(),
- Matchers.equalTo(pos)
+ Matchers.equalTo(pos),
)
} finally {
parcel.recycle()
@@ -240,14 +240,14 @@ open class BaseSessionTest(noErrorCollector: Boolean = false) {
// Create a Promise to listen to the key event, and wait on it below.
val promise = this.evaluatePromiseJS(
"""new Promise(r => window.addEventListener(
- 'keyup', r, { once: true }))"""
+ 'keyup', r, { once: true }))""",
)
val time = SystemClock.uptimeMillis()
val keyEvent = KeyEvent(time, time, KeyEvent.ACTION_DOWN, keyCode, 0)
this.textInput.onKeyDown(keyCode, keyEvent)
this.textInput.onKeyUp(
keyCode,
- KeyEvent.changeAction(keyEvent, KeyEvent.ACTION_UP)
+ KeyEvent.changeAction(keyEvent, KeyEvent.ACTION_UP),
)
promise.value
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt
index 866ed65c3514d121c2307a8830cc2e7caa2ab183..d0ad03a439c83d5c6bfe9a050fb4ea90af903914 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt
@@ -32,7 +32,7 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Expected number of default providers",
contentBlocking.safeBrowsingProviders.size,
- equalTo(2)
+ equalTo(2),
)
assertThat("Google legacy provider is present", google, notNullValue())
assertThat("Google provider is present", google4, notNullValue())
@@ -41,50 +41,50 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Default provider values are sensible",
google.getHashUrl,
- containsString("/safebrowsing-dummy/")
+ containsString("/safebrowsing-dummy/"),
)
assertThat(
"Default provider values are sensible",
google.advisoryUrl,
- startsWith("https://developers.google.com/")
+ startsWith("https://developers.google.com/"),
)
assertThat(
"Default provider values are sensible",
google4.getHashUrl,
- containsString("/safebrowsing4-dummy/")
+ containsString("/safebrowsing4-dummy/"),
)
assertThat(
"Default provider values are sensible",
google4.updateUrl,
- containsString("/safebrowsing4-dummy/")
+ containsString("/safebrowsing4-dummy/"),
)
assertThat(
"Default provider values are sensible",
google4.dataSharingUrl,
- startsWith("https://safebrowsing.googleapis.com/")
+ startsWith("https://safebrowsing.googleapis.com/"),
)
// Checks that the pref value is also consistent with the runtime settings
val originalPrefs = sessionRule.getPrefs(
"browser.safebrowsing.provider.google4.updateURL",
"browser.safebrowsing.provider.google4.gethashURL",
- "browser.safebrowsing.provider.google4.lists"
+ "browser.safebrowsing.provider.google4.lists",
)
assertThat(
"Initial prefs value is correct",
originalPrefs[0] as String,
- equalTo(google4.updateUrl)
+ equalTo(google4.updateUrl),
)
assertThat(
"Initial prefs value is correct",
originalPrefs[1] as String,
- equalTo(google4.getHashUrl)
+ equalTo(google4.getHashUrl),
)
assertThat(
"Initial prefs value is correct",
originalPrefs[2] as String,
- equalTo(google4.lists.joinToString(","))
+ equalTo(google4.lists.joinToString(",")),
)
// Makes sure we can override a default value
@@ -105,28 +105,28 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Override value is correct",
override.updateUrl,
- equalTo("http://test-update-url.com")
+ equalTo("http://test-update-url.com"),
)
assertThat(
"Override value is correct",
override.getHashUrl,
- equalTo("http://test-get-hash-url.com")
+ equalTo("http://test-get-hash-url.com"),
)
assertThat(
"Custom provider value is correct",
custom.updateUrl,
- equalTo("http://test-custom-update-url.com")
+ equalTo("http://test-custom-update-url.com"),
)
assertThat(
"Custom provider value is correct",
custom.getHashUrl,
- equalTo("http://test-custom-get-hash-url.com")
+ equalTo("http://test-custom-get-hash-url.com"),
)
assertThat(
"Custom provider value is correct",
custom.lists,
- equalTo(arrayOf("a", "b", "c"))
+ equalTo(arrayOf("a", "b", "c")),
)
contentBlocking.setSafeBrowsingProviders(override, custom)
@@ -136,33 +136,33 @@ class ContentBlockingControllerTest : BaseSessionTest() {
"browser.safebrowsing.provider.google4.gethashURL",
"browser.safebrowsing.provider.custom-provider.updateURL",
"browser.safebrowsing.provider.custom-provider.gethashURL",
- "browser.safebrowsing.provider.custom-provider.lists"
+ "browser.safebrowsing.provider.custom-provider.lists",
)
assertThat(
"Pref value is set correctly",
prefs[0] as String,
- equalTo("http://test-update-url.com")
+ equalTo("http://test-update-url.com"),
)
assertThat(
"Pref value is set correctly",
prefs[1] as String,
- equalTo("http://test-get-hash-url.com")
+ equalTo("http://test-get-hash-url.com"),
)
assertThat(
"Pref value is set correctly",
prefs[2] as String,
- equalTo("http://test-custom-update-url.com")
+ equalTo("http://test-custom-update-url.com"),
)
assertThat(
"Pref value is set correctly",
prefs[3] as String,
- equalTo("http://test-custom-get-hash-url.com")
+ equalTo("http://test-custom-get-hash-url.com"),
)
assertThat(
"Pref value is set correctly",
prefs[4] as String,
- equalTo("a,b,c")
+ equalTo("a,b,c"),
)
// Restore defaults
@@ -172,23 +172,23 @@ class ContentBlockingControllerTest : BaseSessionTest() {
val restoredPrefs = sessionRule.getPrefs(
"browser.safebrowsing.provider.google4.updateURL",
"browser.safebrowsing.provider.google4.gethashURL",
- "browser.safebrowsing.provider.google4.lists"
+ "browser.safebrowsing.provider.google4.lists",
)
assertThat(
"Restored prefs value is correct",
restoredPrefs[0] as String,
- equalTo(originalPrefs[0])
+ equalTo(originalPrefs[0]),
)
assertThat(
"Restored prefs value is correct",
restoredPrefs[1] as String,
- equalTo(originalPrefs[1])
+ equalTo(originalPrefs[1]),
)
assertThat(
"Restored prefs value is correct",
restoredPrefs[2] as String,
- equalTo(originalPrefs[2])
+ equalTo(originalPrefs[2]),
)
}
@@ -203,7 +203,7 @@ class ContentBlockingControllerTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentBlocked(
session: GeckoSession,
- event: ContentBlocking.BlockEvent
+ event: ContentBlocking.BlockEvent,
) {
}
})
@@ -217,13 +217,13 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Category must match",
it.category,
- equalTo(ContentBlockingController.Event.BLOCKED_TRACKING_CONTENT)
+ equalTo(ContentBlockingController.Event.BLOCKED_TRACKING_CONTENT),
)
assertThat("Blocked must be true", it.blocked, equalTo(true))
assertThat("Count must be at least 1", it.count, not(0))
}
}
- }
+ },
)
}
@@ -236,18 +236,18 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Expect correct default value which is off",
contentBlocking.cookieBannerMode,
- equalTo(CookieBannerMode.COOKIE_BANNER_MODE_DISABLED)
+ equalTo(CookieBannerMode.COOKIE_BANNER_MODE_DISABLED),
)
assertThat(
"Expect correct default value for private browsing",
contentBlocking.cookieBannerModePrivateBrowsing,
- equalTo(CookieBannerMode.COOKIE_BANNER_MODE_REJECT)
+ equalTo(CookieBannerMode.COOKIE_BANNER_MODE_REJECT),
)
// Checks that the pref value is also consistent with the runtime settings
val originalPrefs = sessionRule.getPrefs(
"cookiebanners.service.mode",
- "cookiebanners.service.mode.privateBrowsing"
+ "cookiebanners.service.mode.privateBrowsing",
)
assertThat("Initial value is correct", originalPrefs[0] as Int, equalTo(contentBlocking.cookieBannerMode))
@@ -258,7 +258,7 @@ class ContentBlockingControllerTest : BaseSessionTest() {
val actualPrefs = sessionRule.getPrefs(
"cookiebanners.service.mode",
- "cookiebanners.service.mode.privateBrowsing"
+ "cookiebanners.service.mode.privateBrowsing",
)
assertThat("Initial value is correct", actualPrefs[0] as Int, equalTo(contentBlocking.cookieBannerMode))
@@ -273,30 +273,30 @@ class ContentBlockingControllerTest : BaseSessionTest() {
assertThat(
"Expect correct default value which is off",
contentBlocking.cookieBannerDetectOnlyMode,
- equalTo(false)
+ equalTo(false),
)
// Checks that the pref value is also consistent with the runtime settings
val originalPrefs = sessionRule.getPrefs(
- "cookiebanners.service.detectOnly"
+ "cookiebanners.service.detectOnly",
)
assertThat(
"Initial value is correct",
originalPrefs[0] as Boolean,
- equalTo(contentBlocking.cookieBannerDetectOnlyMode)
+ equalTo(contentBlocking.cookieBannerDetectOnlyMode),
)
contentBlocking.cookieBannerDetectOnlyMode = true
val actualPrefs = sessionRule.getPrefs(
- "cookiebanners.service.detectOnly"
+ "cookiebanners.service.detectOnly",
)
assertThat(
"Initial value is correct",
actualPrefs[0] as Boolean,
- equalTo(contentBlocking.cookieBannerDetectOnlyMode)
+ equalTo(contentBlocking.cookieBannerDetectOnlyMode),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt
index bba9740594d68a70e113123c21ac2dfc39ecee23..f560a2af22593c108a682ae8dd112ef22c044392 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt
@@ -32,7 +32,7 @@ class ContentDelegateChildTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
x,
y,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(event)
}
@@ -51,17 +51,17 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be audio.",
element.type,
- equalTo(ContextElement.TYPE_AUDIO)
+ equalTo(ContextElement.TYPE_AUDIO),
)
assertThat(
"The element source should be the mp3 file.",
element.srcUri,
- endsWith("owl.mp3")
+ endsWith("owl.mp3"),
)
}
})
@@ -84,16 +84,16 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be video.",
element.type,
- equalTo(ContextElement.TYPE_VIDEO)
+ equalTo(ContextElement.TYPE_VIDEO),
)
assertNull(
"Buffered blob should not have a srcUri.",
- element.srcUri
+ element.srcUri,
)
}
})
@@ -114,22 +114,22 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be image.",
element.type,
- equalTo(ContextElement.TYPE_IMAGE)
+ equalTo(ContextElement.TYPE_IMAGE),
)
assertThat(
"Alternate text should match.",
element.altText,
- equalTo("An orange circle.")
+ equalTo("An orange circle."),
)
assertThat(
"The element source should begin with blob.",
element.srcUri,
- startsWith("blob:")
+ startsWith("blob:"),
)
}
})
@@ -149,22 +149,22 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be image.",
element.type,
- equalTo(ContextElement.TYPE_IMAGE)
+ equalTo(ContextElement.TYPE_IMAGE),
)
assertThat(
"Alternate text should match.",
element.altText,
- equalTo("Test Image")
+ equalTo("Test Image"),
)
assertThat(
"The element source should be the image file.",
element.srcUri,
- endsWith("test.gif")
+ endsWith("test.gif"),
)
}
})
@@ -184,22 +184,22 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be image.",
element.type,
- equalTo(ContextElement.TYPE_IMAGE)
+ equalTo(ContextElement.TYPE_IMAGE),
)
assertThat(
"Alternate text should match.",
element.altText,
- equalTo("Test Image")
+ equalTo("Test Image"),
)
assertThat(
"The element source should be the image file.",
element.srcUri,
- endsWith("test.gif")
+ endsWith("test.gif"),
)
}
})
@@ -218,27 +218,27 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be none.",
element.type,
- equalTo(ContextElement.TYPE_NONE)
+ equalTo(ContextElement.TYPE_NONE),
)
assertThat(
"The element link title should be the title of the anchor.",
element.title,
- equalTo("Hello Link Title")
+ equalTo("Hello Link Title"),
)
assertThat(
"The element link URI should be the href of the anchor.",
element.linkUri,
- endsWith("hello.html")
+ endsWith("hello.html"),
)
assertThat(
"The element link text content should be the text content of the anchor.",
element.textContent,
- equalTo("Hello World")
+ equalTo("Hello World"),
)
}
})
@@ -260,17 +260,17 @@ class ContentDelegateChildTest : BaseSessionTest() {
session: GeckoSession,
screenX: Int,
screenY: Int,
- element: ContextElement
+ element: ContextElement,
) {
assertThat(
"Type should be video.",
element.type,
- equalTo(ContextElement.TYPE_VIDEO)
+ equalTo(ContextElement.TYPE_VIDEO),
)
assertThat(
"The element source should be the video file.",
element.srcUri,
- endsWith("short.mp4")
+ endsWith("short.mp4"),
)
}
})
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt
index 2d17b8e2a6c56e9e4f9d0ff746137fa59b03baf7..65a07d384df3689a57efaa2b59c8e6cfaf4afee6 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt
@@ -41,7 +41,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"Title should match",
title,
- equalTo(forEachCall("Title1", "Title2"))
+ equalTo(forEachCall("Title1", "Title2")),
)
}
})
@@ -65,17 +65,17 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"Filename matches as expected",
response.headers["Content-Disposition"],
- equalTo(fileHeader)
+ equalTo(fileHeader),
)
assertThat(
"Request external response matches as expected.",
requestExternal,
- equalTo(response.requestExternalApp)
+ equalTo(response.requestExternalApp),
)
assertThat(
"Skipping the confirmation matches as expected.",
skipConfirmation,
- equalTo(response.skipConfirmation)
+ equalTo(response.skipConfirmation),
)
}
@@ -125,7 +125,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"Session should be closed after a crash",
session.isOpen,
- equalTo(false)
+ equalTo(false),
)
}
})
@@ -182,7 +182,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"Session should be closed after being killed",
session.isOpen,
- equalTo(false)
+ equalTo(false),
)
}
})
@@ -406,14 +406,14 @@ class ContentDelegateTest : BaseSessionTest() {
@Test fun cookieBannerDetectedEvent() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "cookiebanners.service.mode" to CookieBannerMode.COOKIE_BANNER_MODE_REJECT
- )
+ "cookiebanners.service.mode" to CookieBannerMode.COOKIE_BANNER_MODE_REJECT,
+ ),
)
val detectHandled = GeckoResult<Void>()
mainSession.delegateUntilTestEnd(object : GeckoSession.ContentDelegate {
override fun onCookieBannerDetected(
- session: GeckoSession
+ session: GeckoSession,
) {
detectHandled.complete(null)
}
@@ -429,14 +429,14 @@ class ContentDelegateTest : BaseSessionTest() {
@Test fun cookieBannerHandledEvent() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "cookiebanners.service.mode" to CookieBannerMode.COOKIE_BANNER_MODE_REJECT
- )
+ "cookiebanners.service.mode" to CookieBannerMode.COOKIE_BANNER_MODE_REJECT,
+ ),
)
val handleHandled = GeckoResult<Void>()
mainSession.delegateUntilTestEnd(object : GeckoSession.ContentDelegate {
override fun onCookieBannerHandled(
- session: GeckoSession
+ session: GeckoSession,
) {
handleHandled.complete(null)
}
@@ -486,8 +486,8 @@ class ContentDelegateTest : BaseSessionTest() {
"dom.max_chrome_script_run_time" to 1,
"dom.max_ext_content_script_run_time" to 1,
"dom.ipc.cpow.timeout" to 100,
- "browser.hangNotification.waitPeriod" to timeout
- )
+ "browser.hangNotification.waitPeriod" to timeout,
+ ),
)
}
@@ -505,7 +505,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did not complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Started")
+ equalTo("Started"),
)
}
})
@@ -525,7 +525,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did not complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Started")
+ equalTo("Started"),
)
}
})
@@ -552,7 +552,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Finished")
+ equalTo("Finished"),
)
}
})
@@ -576,7 +576,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did not complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Started")
+ equalTo("Started"),
)
}
})
@@ -600,7 +600,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Finished")
+ equalTo("Finished"),
)
}
})
@@ -630,7 +630,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"The script did not complete.",
mainSession.evaluateJS("document.getElementById(\"content\").innerHTML") as String,
- equalTo("Started")
+ equalTo("Started"),
)
}
})
@@ -645,7 +645,7 @@ class ContentDelegateTest : BaseSessionTest() {
val pwaSession = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.displayMode(GeckoSessionSettings.DISPLAY_MODE_FULLSCREEN)
- .build()
+ .build(),
)
pwaSession.loadTestPath(HELLO_HTML_PATH)
pwaSession.waitForPageStop()
@@ -654,7 +654,7 @@ class ContentDelegateTest : BaseSessionTest() {
assertThat(
"display-mode should be fullscreen",
matches,
- equalTo(true)
+ equalTo(true),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt
index 7b7aa4de1bb8644cf3ab43e36eedff9112675b3c..6a79df617389214dc0d79ebbc5bf7eabb507b640 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt
@@ -50,7 +50,7 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"Screenshot is not null",
it,
- notNullValue()
+ notNullValue(),
)
assertThat("Widths are the same", comparisonImage.width, equalTo(it.width))
assertThat("Heights are the same", comparisonImage.height, equalTo(it.height))
@@ -170,13 +170,13 @@ class DynamicToolbarTest : BaseSessionTest() {
new Promise(resolve => {
window.visualViewport.addEventListener('resize', resolve(window.visualViewport.height));
});
- """.trimIndent()
+ """.trimIndent(),
)
assertThat(
"The visual viewport height should be changed in response to the dynamc toolbar transition",
promise.value as Double,
- closeTo(expectedViewportHeight, .01)
+ closeTo(expectedViewportHeight, .01),
)
}
}
@@ -196,7 +196,7 @@ class DynamicToolbarTest : BaseSessionTest() {
val originalHeight = mainSession.evaluateJS(
"""
getComputedStyle(document.querySelector('#fixed-element')).height
- """.trimIndent()
+ """.trimIndent(),
) as String
// Set the vertical clipping value to the middle of toolbar transition.
@@ -205,13 +205,13 @@ class DynamicToolbarTest : BaseSessionTest() {
var height = mainSession.evaluateJS(
"""
getComputedStyle(document.querySelector('#fixed-element')).height
- """.trimIndent()
+ """.trimIndent(),
) as String
assertThat(
"The %-based height should be the static in the middle of toolbar tansition",
height,
- equalTo(originalHeight)
+ equalTo(originalHeight),
)
// Set the vertical clipping value to hide the toolbar completely.
@@ -219,7 +219,7 @@ class DynamicToolbarTest : BaseSessionTest() {
height = mainSession.evaluateJS(
"""
getComputedStyle(document.querySelector('#fixed-element')).height
- """.trimIndent()
+ """.trimIndent(),
) as String
val scale = mainSession.evaluateJS("window.visualViewport.scale") as Double
@@ -227,7 +227,7 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"The %-based height should be now recomputed based on the screen height",
height,
- equalTo(expectedHeight.toString() + "px")
+ equalTo(expectedHeight.toString() + "px"),
)
}
@@ -254,7 +254,7 @@ class DynamicToolbarTest : BaseSessionTest() {
// unexpected resize event(s) will be caught in the next loop.
requestAnimationFrame(() => { resolve(fired); });
});
- """.trimIndent()
+ """.trimIndent(),
)
// Simulate the dynamic toolbar is going to be hidden.
@@ -262,7 +262,7 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"'resize' event on window should not be fired in response to the dynamc toolbar transition",
promise.value as Boolean,
- equalTo(false)
+ equalTo(false),
)
}
@@ -271,14 +271,14 @@ class DynamicToolbarTest : BaseSessionTest() {
new Promise(resolve => {
window.addEventListener('resize', () => { resolve(true); }, { once: true });
});
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.display?.run { setVerticalClipping(-dynamicToolbarMaxHeight) }
assertThat(
"'resize' event on window should be fired when the dynamc toolbar is completely hidden",
promise.value as Boolean,
- equalTo(true)
+ equalTo(true),
)
}
@@ -305,7 +305,7 @@ class DynamicToolbarTest : BaseSessionTest() {
new Promise(resolve => {
window.visualViewport.addEventListener('resize', resolve(window.innerHeight));
});
- """.trimIndent()
+ """.trimIndent(),
)
// Simulate the dynamic toolbar is going to be hidden.
@@ -313,7 +313,7 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"window.innerHeight should not be changed in response to the dynamc toolbar transition",
promise.value as Double,
- closeTo(SCREEN_HEIGHT / 2 / pixelRatio, .01)
+ closeTo(SCREEN_HEIGHT / 2 / pixelRatio, .01),
)
}
@@ -322,14 +322,14 @@ class DynamicToolbarTest : BaseSessionTest() {
new Promise(resolve => {
window.addEventListener('resize', () => { resolve(window.innerHeight); }, { once: true });
});
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.display?.run { setVerticalClipping(-dynamicToolbarMaxHeight) }
assertThat(
"window.innerHeight should be changed when the dynamc toolbar is completely hidden",
promise.value as Double,
- closeTo(SCREEN_HEIGHT / pixelRatio, .01)
+ closeTo(SCREEN_HEIGHT / pixelRatio, .01),
)
}
@@ -348,7 +348,7 @@ class DynamicToolbarTest : BaseSessionTest() {
val promise = mainSession.evaluatePromiseJS(
"""
new Promise(resolve => window.addEventListener('resize', () => resolve(true)));
- """.trimIndent()
+ """.trimIndent(),
)
// Do some setVerticalClipping calls that we might try to queue two window resize events.
@@ -426,7 +426,7 @@ class DynamicToolbarTest : BaseSessionTest() {
target.style.height = '$style';
document.body.appendChild(target);
parseFloat(getComputedStyle(target).height);
- """.trimIndent()
+ """.trimIndent(),
) as Double
return viewportHeight
@@ -451,21 +451,21 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"svh value at the initial state",
smallViewportHeight,
- closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1)
+ closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1),
)
var largeViewportHeight = getComputedViewportHeight("100lvh")
assertThat(
"lvh value at the initial state",
largeViewportHeight,
- closeTo(SCREEN_HEIGHT / scale / pixelRatio, 0.1)
+ closeTo(SCREEN_HEIGHT / scale / pixelRatio, 0.1),
)
var dynamicViewportHeight = getComputedViewportHeight("100dvh")
assertThat(
"dvh value at the initial state",
dynamicViewportHeight,
- closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1)
+ closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1),
)
// Move down the toolbar at a fourth of its position.
@@ -475,21 +475,21 @@ class DynamicToolbarTest : BaseSessionTest() {
assertThat(
"svh value during toolbar transition",
smallViewportHeight,
- closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1)
+ closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight) / scale / pixelRatio, 0.1),
)
largeViewportHeight = getComputedViewportHeight("100lvh")
assertThat(
"lvh value during toolbar transition",
largeViewportHeight,
- closeTo(SCREEN_HEIGHT / scale / pixelRatio, 0.1)
+ closeTo(SCREEN_HEIGHT / scale / pixelRatio, 0.1),
)
dynamicViewportHeight = getComputedViewportHeight("100dvh")
assertThat(
"dvh value during toolbar transition",
dynamicViewportHeight,
- closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight + dynamicToolbarMaxHeight / 4) / scale / pixelRatio, 0.1)
+ closeTo((SCREEN_HEIGHT - dynamicToolbarMaxHeight + dynamicToolbarMaxHeight / 4) / scale / pixelRatio, 0.1),
)
}
@@ -523,7 +523,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
50f,
70f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(down)
var move = MotionEvent.obtain(
@@ -532,7 +532,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_MOVE,
50f,
30f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(move)
var up = MotionEvent.obtain(
@@ -541,7 +541,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_UP,
50f,
10f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(up)
mainSession.flushApzRepaints()
@@ -554,7 +554,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
50f,
10f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(down)
move = MotionEvent.obtain(
@@ -563,7 +563,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_MOVE,
50f,
30f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(move)
up = MotionEvent.obtain(
@@ -572,7 +572,7 @@ class DynamicToolbarTest : BaseSessionTest() {
MotionEvent.ACTION_UP,
50f,
70f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(up)
mainSession.flushApzRepaints()
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ExtensionActionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ExtensionActionTest.kt
index 0e440e487b761fe5202d602ee285d5fe9c0e887a..833d8091faad91f5861c4af3a8641036b899a6c5 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ExtensionActionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ExtensionActionTest.kt
@@ -34,7 +34,7 @@ class ExtensionActionTest : BaseSessionTest() {
@JvmStatic
val parameters = listOf(
arrayOf("#pageAction"),
- arrayOf("#browserAction")
+ arrayOf("#browserAction"),
)
}
@@ -58,12 +58,12 @@ class ExtensionActionTest : BaseSessionTest() {
val backgroundPortResult = GeckoResult<WebExtension.Port>()
extension = sessionRule.waitForResult(
- controller.installBuiltIn("resource://android/assets/web_extensions/actions/")
+ controller.installBuiltIn("resource://android/assets/web_extensions/actions/"),
)
// Another dummy extension, only used to check restrictions related to setting
// another extension url as a popup url, and so there is no delegate needed for it.
otherExtension = sessionRule.waitForResult(
- controller.installBuiltIn("resource://android/assets/web_extensions/dummy/")
+ controller.installBuiltIn("resource://android/assets/web_extensions/dummy/"),
)
mainSession.webExtensionController.setMessageDelegate(
@@ -73,7 +73,7 @@ class ExtensionActionTest : BaseSessionTest() {
windowPortResult.complete(port)
}
},
- "browser"
+ "browser",
)
extension!!.setMessageDelegate(
object : WebExtension.MessageDelegate {
@@ -81,7 +81,7 @@ class ExtensionActionTest : BaseSessionTest() {
backgroundPortResult.complete(port)
}
},
- "browser"
+ "browser",
)
sessionRule.addExternalDelegateDuringNextWait(
@@ -97,7 +97,7 @@ class ExtensionActionTest : BaseSessionTest() {
assertEquals(action.title, "Test action default")
pageActionDefaultResult.complete(action)
}
- }
+ },
)
mainSession.loadUri("http://example.com")
@@ -176,7 +176,7 @@ class ExtensionActionTest : BaseSessionTest() {
tester(action)
result.complete(null)
}
- }
+ },
)
sessionRule.waitForResult(result)
@@ -198,8 +198,8 @@ class ExtensionActionTest : BaseSessionTest() {
}
setPopupResult.completeExceptionally(
IllegalArgumentException(
- "Expected \"${popupUrl}\" to be ${ expectedResString }"
- )
+ "Expected \"${popupUrl}\" to be ${ expectedResString }",
+ ),
)
} else {
setPopupResult.complete(null)
@@ -208,8 +208,8 @@ class ExtensionActionTest : BaseSessionTest() {
// We should NOT receive the expected message result.
setPopupResult.completeExceptionally(
IllegalArgumentException(
- "Received unexpected result for: ${json.getString("type")} ${json.getString("resultFor")}"
- )
+ "Received unexpected result for: ${json.getString("type")} ${json.getString("resultFor")}",
+ ),
)
}
}
@@ -219,7 +219,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopupCheckRestrictions",
"popup": "$popupUrl"
- }"""
+ }""",
)
json.put("type", type)
@@ -255,7 +255,7 @@ class ExtensionActionTest : BaseSessionTest() {
tester(resolved)
result.complete(null)
}
- }
+ },
)
sessionRule.waitForResult(result)
@@ -280,7 +280,7 @@ class ExtensionActionTest : BaseSessionTest() {
override fun onBrowserAction(
extension: WebExtension,
session: GeckoSession?,
- action: WebExtension.Action
+ action: WebExtension.Action,
) {
assertEquals(action.title, "Test action default")
result.complete(null)
@@ -292,7 +292,7 @@ class ExtensionActionTest : BaseSessionTest() {
override fun onPageAction(
extension: WebExtension,
session: GeckoSession?,
- action: WebExtension.Action
+ action: WebExtension.Action,
) {
assertEquals(action.title, "Test action default")
result.complete(null)
@@ -325,7 +325,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setTitle",
"title": "overridden title"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "overridden title")
assertEquals(action.enabled, true)
@@ -340,7 +340,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setBadgeText",
"text": "12"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.badgeText, "12")
@@ -369,7 +369,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "$actionName",
"color": $color
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.badgeText, "")
@@ -407,7 +407,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setTitle",
"title": "new default title"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "new default title")
assertEquals(action.badgeText, "")
@@ -419,7 +419,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setTitle",
"title": "test override"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "test override")
assertEquals(action.badgeText, "")
@@ -431,7 +431,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setTitle",
"title": null
- }"""
+ }""",
) { action ->
assertEquals(action.title, "new default title")
assertEquals(action.badgeText, "")
@@ -443,7 +443,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setTitle",
"title": null
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.badgeText, "")
@@ -471,7 +471,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setIcon",
"path": "button/icon.svg"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -515,7 +515,7 @@ class ExtensionActionTest : BaseSessionTest() {
"19": "button/geo-19.png",
"38": "button/geo-38.png"
}
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -555,7 +555,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setIcon",
"path": "invalid/path/image.png"
- }"""
+ }""",
) { action ->
action.icon!!.getBitmap(38).accept({
error.completeExceptionally(RuntimeException("Should not succeed."))
@@ -588,7 +588,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopup",
"popup": "test-popup.html"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -613,13 +613,13 @@ class ExtensionActionTest : BaseSessionTest() {
object : WebExtension.ActionDelegate {
override fun onOpenPopup(
extension: WebExtension,
- popupAction: WebExtension.Action
+ popupAction: WebExtension.Action,
): GeckoResult<GeckoSession>? {
assertEquals(extension, this@ExtensionActionTest.extension)
openPopup.complete(null)
return null
}
- }
+ },
)
// openPopup needs user activation
@@ -641,8 +641,8 @@ class ExtensionActionTest : BaseSessionTest() {
// We should NOT receive onClicked here
pong.completeExceptionally(
IllegalArgumentException(
- "Received unexpected: ${json.getString("method")}"
- )
+ "Received unexpected: ${json.getString("method")}",
+ ),
)
}
}
@@ -654,7 +654,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopup",
"popup": "test-popup.html"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -668,7 +668,7 @@ class ExtensionActionTest : BaseSessionTest() {
extension!!.setActionDelegate(object : WebExtension.ActionDelegate {
override fun onTogglePopup(
extension: WebExtension,
- popupAction: WebExtension.Action
+ popupAction: WebExtension.Action,
): GeckoResult<GeckoSession>? {
assertEquals(extension, this@ExtensionActionTest.extension)
assertEquals(popupAction, action)
@@ -688,8 +688,8 @@ class ExtensionActionTest : BaseSessionTest() {
JSONObject(
"""{
"type": "ping"
- }"""
- )
+ }""",
+ ),
)
sessionRule.waitForResult(pong)
@@ -711,7 +711,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopup",
"popup": null
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -732,7 +732,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopup",
"popup": "test-popup-messaging.html"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -746,17 +746,17 @@ class ExtensionActionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(extension!!.id, sender.webExtension.id)
assertEquals(
WebExtension.MessageSender.ENV_TYPE_EXTENSION,
- sender.environmentType
+ sender.environmentType,
)
assertEquals(sender.isTopLevel, true)
assertEquals(
"${extension!!.metaData.baseUrl}test-popup-messaging.html",
- sender.url
+ sender.url,
)
assertEquals(sender.session, popupSession)
messages.add(message as String)
@@ -772,12 +772,12 @@ class ExtensionActionTest : BaseSessionTest() {
assertEquals(extension!!.id, port.sender.webExtension.id)
assertEquals(
WebExtension.MessageSender.ENV_TYPE_EXTENSION,
- port.sender.environmentType
+ port.sender.environmentType,
)
assertEquals(true, port.sender.isTopLevel)
assertEquals(
"${extension!!.metaData.baseUrl}test-popup-messaging.html",
- port.sender.url
+ port.sender.url,
)
assertEquals(port.sender.session, popupSession)
portResult.complete(port)
@@ -787,14 +787,14 @@ class ExtensionActionTest : BaseSessionTest() {
popupSession.webExtensionController.setMessageDelegate(
extension!!,
messageDelegate,
- "browser"
+ "browser",
)
val action = sessionRule.waitForResult(actionResult)
extension!!.setActionDelegate(object : WebExtension.ActionDelegate {
override fun onTogglePopup(
extension: WebExtension,
- popupAction: WebExtension.Action
+ popupAction: WebExtension.Action,
): GeckoResult<GeckoSession>? {
assertEquals(extension, this@ExtensionActionTest.extension)
assertEquals(popupAction, action)
@@ -811,9 +811,9 @@ class ExtensionActionTest : BaseSessionTest() {
equalTo(
listOf(
"testPopupMessage",
- "response: TEST_RESPONSE"
- )
- )
+ "response: TEST_RESPONSE",
+ ),
+ ),
)
val port = sessionRule.waitForResult(portResult)
@@ -830,7 +830,7 @@ class ExtensionActionTest : BaseSessionTest() {
assertThat(
"Message should match",
portMessage,
- equalTo("testPopupPortMessage")
+ equalTo("testPopupPortMessage"),
)
}
@@ -850,7 +850,7 @@ class ExtensionActionTest : BaseSessionTest() {
"""{
"action": "setPopup",
"popup": "test-popup.html"
- }"""
+ }""",
) { action ->
assertEquals(action.title, "Test action default")
assertEquals(action.enabled, true)
@@ -862,7 +862,7 @@ class ExtensionActionTest : BaseSessionTest() {
extension!!.setActionDelegate(object : WebExtension.ActionDelegate {
override fun onTogglePopup(
extension: WebExtension,
- popupAction: WebExtension.Action
+ popupAction: WebExtension.Action,
): GeckoResult<GeckoSession>? {
assertEquals(extension, this@ExtensionActionTest.extension)
assertEquals(popupAction, action)
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt
index bfff47a7b56bfeaf1e228c18b230b7e170b7ed56..beff344ef703c1dc532465fbf2fda0c548540bda 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt
@@ -29,7 +29,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("dolore")
+ equalTo("dolore"),
)
assertThat("Flags should be correct", result.flags, equalTo(0))
@@ -39,8 +39,8 @@ class FinderTest : BaseSessionTest() {
null,
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -50,7 +50,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("dolore")
+ equalTo("dolore"),
)
assertThat(
"Flags should be correct",
@@ -58,8 +58,8 @@ class FinderTest : BaseSessionTest() {
equalTo(
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
// And again using same flags.
@@ -68,8 +68,8 @@ class FinderTest : BaseSessionTest() {
null,
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -79,7 +79,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("dolore")
+ equalTo("dolore"),
)
assertThat(
"Flags should be correct",
@@ -87,8 +87,8 @@ class FinderTest : BaseSessionTest() {
equalTo(
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
// And again but go forward.
@@ -96,8 +96,8 @@ class FinderTest : BaseSessionTest() {
mainSession.finder.find(
null,
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -107,15 +107,15 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("dolore")
+ equalTo("dolore"),
)
assertThat(
"Flags should be correct",
result.flags,
equalTo(
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
}
@@ -132,7 +132,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("foo")
+ equalTo("foo"),
)
assertThat("Flags should be correct", result.flags, equalTo(0))
@@ -152,15 +152,15 @@ class FinderTest : BaseSessionTest() {
result = sessionRule.waitForResult(
mainSession.finder.find(
null,
- GeckoSession.FINDER_FIND_MATCH_CASE
- )
+ GeckoSession.FINDER_FIND_MATCH_CASE,
+ ),
)
assertThat("Total count should be correct", result.total, equalTo(2))
assertThat(
"Flags should be correct",
result.flags,
- equalTo(GeckoSession.FINDER_FIND_MATCH_CASE)
+ equalTo(GeckoSession.FINDER_FIND_MATCH_CASE),
)
}
@@ -175,15 +175,15 @@ class FinderTest : BaseSessionTest() {
result = sessionRule.waitForResult(
mainSession.finder.find(
null,
- GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Total count should be correct", result.total, equalTo(2))
assertThat(
"Flags should be correct",
result.flags,
- equalTo(GeckoSession.FINDER_FIND_WHOLE_WORD)
+ equalTo(GeckoSession.FINDER_FIND_WHOLE_WORD),
)
}
@@ -194,15 +194,15 @@ class FinderTest : BaseSessionTest() {
val result = sessionRule.waitForResult(
mainSession.finder.find(
"nim",
- GeckoSession.FINDER_FIND_LINKS_ONLY
- )
+ GeckoSession.FINDER_FIND_LINKS_ONLY,
+ ),
)
assertThat("Total count should be correct", result.total, equalTo(1))
assertThat(
"Flags should be correct",
result.flags,
- equalTo(GeckoSession.FINDER_FIND_LINKS_ONLY)
+ equalTo(GeckoSession.FINDER_FIND_LINKS_ONLY),
)
}
@@ -217,7 +217,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Match should be selected",
mainSession.evaluateJS("window.getSelection().toString()") as String,
- equalTo("Lore")
+ equalTo("Lore"),
)
mainSession.finder.clear()
@@ -225,7 +225,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Match should be cleared",
mainSession.evaluateJS("window.getSelection().isCollapsed") as Boolean,
- equalTo(true)
+ equalTo(true),
)
}
@@ -243,7 +243,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("trace")
+ equalTo("trace"),
)
assertThat("Flags should be correct", result.flags, equalTo(0))
@@ -253,8 +253,8 @@ class FinderTest : BaseSessionTest() {
null,
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -264,7 +264,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("trace")
+ equalTo("trace"),
)
assertThat(
"Flags should be correct",
@@ -272,8 +272,8 @@ class FinderTest : BaseSessionTest() {
equalTo(
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
// And again using same flags.
@@ -282,8 +282,8 @@ class FinderTest : BaseSessionTest() {
null,
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -293,7 +293,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("trace")
+ equalTo("trace"),
)
assertThat(
"Flags should be correct",
@@ -301,8 +301,8 @@ class FinderTest : BaseSessionTest() {
equalTo(
GeckoSession.FINDER_FIND_BACKWARDS
or GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
// And again but go forward.
@@ -310,8 +310,8 @@ class FinderTest : BaseSessionTest() {
mainSession.finder.find(
null,
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Should be found", result.found, equalTo(true))
@@ -321,15 +321,15 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("trace")
+ equalTo("trace"),
)
assertThat(
"Flags should be correct",
result.flags,
equalTo(
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
}
@@ -342,8 +342,8 @@ class FinderTest : BaseSessionTest() {
mainSession.finder.find(
"SpiderMonkey",
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
for (count in 1..4) {
@@ -354,7 +354,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("SpiderMonkey")
+ equalTo("SpiderMonkey"),
)
// And again.
@@ -362,8 +362,8 @@ class FinderTest : BaseSessionTest() {
mainSession.finder.find(
null,
GeckoSession.FINDER_FIND_MATCH_CASE
- or GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ or GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
}
}
@@ -381,7 +381,7 @@ class FinderTest : BaseSessionTest() {
assertThat(
"Search string should be correct",
result.searchString,
- equalTo("foo")
+ equalTo("foo"),
)
assertThat("Flags should be correct", result.flags, equalTo(0))
@@ -401,15 +401,15 @@ class FinderTest : BaseSessionTest() {
result = sessionRule.waitForResult(
mainSession.finder.find(
null,
- GeckoSession.FINDER_FIND_MATCH_CASE
- )
+ GeckoSession.FINDER_FIND_MATCH_CASE,
+ ),
)
assertThat("Total count should be correct", result.total, equalTo(13))
assertThat(
"Flags should be correct",
result.flags,
- equalTo(GeckoSession.FINDER_FIND_MATCH_CASE)
+ equalTo(GeckoSession.FINDER_FIND_MATCH_CASE),
)
}
@@ -424,15 +424,15 @@ class FinderTest : BaseSessionTest() {
result = sessionRule.waitForResult(
mainSession.finder.find(
null,
- GeckoSession.FINDER_FIND_WHOLE_WORD
- )
+ GeckoSession.FINDER_FIND_WHOLE_WORD,
+ ),
)
assertThat("Total count should be correct", result.total, equalTo(1))
assertThat(
"Flags should be correct",
result.flags,
- equalTo(GeckoSession.FINDER_FIND_WHOLE_WORD)
+ equalTo(GeckoSession.FINDER_FIND_WHOLE_WORD),
)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt
index 3a98ef7fb18ec90283d73d6a53aab56d48514eb5..c05820012d39e8b3b91857a1ae9b4bc795b6c0de 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt
@@ -89,14 +89,14 @@ class GeckoAppShellTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<GeckoSession.PermissionDelegate.ContentPermission>
+ perms: MutableList<GeckoSession.PermissionDelegate.ContentPermission>,
) {
// Result of first clock settings change
if (onLoadRequestCount == 0) {
assertThat(
"Should use a 24 hour clock.",
GeckoAppShell.getIs24HourFormat(),
- equalTo(true)
+ equalTo(true),
)
onLoadRequestCount++
@@ -110,7 +110,7 @@ class GeckoAppShellTest : BaseSessionTest() {
assertThat(
"Should use a 12 hour clock.",
GeckoAppShell.getIs24HourFormat(),
- equalTo(false)
+ equalTo(false),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt
index a4d18e8d501283285230eff239e96af894ed9911..d7169c0266b67ab40f217d306ae7e13e60278d44 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt
@@ -44,7 +44,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Session is open",
mainSession.isOpen,
- equalTo(true)
+ equalTo(true),
)
}
@@ -57,7 +57,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
@Setting.List(
Setting(key = Setting.Key.USE_PRIVATE_MODE, value = "true"),
Setting(key = Setting.Key.DISPLAY_MODE, value = "DISPLAY_MODE_MINIMAL_UI"),
- Setting(key = Setting.Key.ALLOW_JAVASCRIPT, value = "false")
+ Setting(key = Setting.Key.ALLOW_JAVASCRIPT, value = "false"),
)
@Setting(key = Setting.Key.USE_TRACKING_PROTECTION, value = "true")
@Test
@@ -65,22 +65,22 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"USE_PRIVATE_MODE should be set",
mainSession.settings.usePrivateMode,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"DISPLAY_MODE should be set",
mainSession.settings.displayMode,
- equalTo(GeckoSessionSettings.DISPLAY_MODE_MINIMAL_UI)
+ equalTo(GeckoSessionSettings.DISPLAY_MODE_MINIMAL_UI),
)
assertThat(
"USE_TRACKING_PROTECTION should be set",
mainSession.settings.useTrackingProtection,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"ALLOW_JAVASCRIPT should be set",
mainSession.settings.allowJavascript,
- equalTo(false)
+ equalTo(false),
)
}
@@ -103,7 +103,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
@NullDelegate.List(
NullDelegate(ContentDelegate::class),
- NullDelegate(NavigationDelegate::class)
+ NullDelegate(NavigationDelegate::class),
)
@NullDelegate(ScrollDelegate::class)
@Test
@@ -111,23 +111,23 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Content delegate should be null",
mainSession.contentDelegate,
- nullValue()
+ nullValue(),
)
assertThat(
"Navigation delegate should be null",
mainSession.navigationDelegate,
- nullValue()
+ nullValue(),
)
assertThat(
"Scroll delegate should be null",
mainSession.scrollDelegate,
- nullValue()
+ nullValue(),
)
assertThat(
"Progress delegate should not be null",
mainSession.progressDelegate,
- notNullValue()
+ notNullValue(),
)
}
@@ -138,7 +138,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Progress delegate should be null",
mainSession.progressDelegate,
- nullValue()
+ nullValue(),
)
}
@@ -149,7 +149,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Progress delegate should be null",
mainSession.progressDelegate,
- nullValue()
+ nullValue(),
)
mainSession.open()
@@ -215,7 +215,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: ProgressDelegate.SecurityInformation
+ securityInfo: ProgressDelegate.SecurityInformation,
) {
counter++
}
@@ -237,7 +237,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.waitUntilCalled(
ProgressDelegate::class,
"onPageStart",
- "onPageStop"
+ "onPageStop",
)
var counter = 0
@@ -313,7 +313,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: ProgressDelegate.SecurityInformation
+ securityInfo: ProgressDelegate.SecurityInformation,
) {
counter++
}
@@ -413,12 +413,12 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Counter should be correct",
info.counter,
- equalTo(forEachCall(1, 2))
+ equalTo(forEachCall(1, 2)),
)
assertThat(
"Order should equal counter",
info.order,
- equalTo(info.counter)
+ equalTo(info.counter),
)
counter++
}
@@ -733,7 +733,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
@@ -830,12 +830,12 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Counter should be correct",
info.counter,
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Order should equal counter",
info.order,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -976,12 +976,12 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Counter should be correct",
info.counter,
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Order should equal counter",
info.order,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -1044,28 +1044,28 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
var waitCounter = 0
sessionRule.delegateUntilTestEnd(object :
- ProgressDelegate,
- NavigationDelegate {
- @AssertCalled(count = 1, order = [2])
- override fun onPageStart(session: GeckoSession, url: String) {
- testCounter++
- }
+ ProgressDelegate,
+ NavigationDelegate {
+ @AssertCalled(count = 1, order = [2])
+ override fun onPageStart(session: GeckoSession, url: String) {
+ testCounter++
+ }
- @AssertCalled(count = 1, order = [4])
- override fun onPageStop(session: GeckoSession, success: Boolean) {
- testCounter++
- }
+ @AssertCalled(count = 1, order = [4])
+ override fun onPageStop(session: GeckoSession, success: Boolean) {
+ testCounter++
+ }
- @AssertCalled(count = 2, order = [1, 3])
- override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
- testCounter++
- }
+ @AssertCalled(count = 2, order = [1, 3])
+ override fun onCanGoBack(session: GeckoSession, canGoBack: Boolean) {
+ testCounter++
+ }
- @AssertCalled(count = 2, order = [1, 3])
- override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
- testCounter++
- }
- })
+ @AssertCalled(count = 2, order = [1, 3])
+ override fun onCanGoForward(session: GeckoSession, canGoForward: Boolean) {
+ testCounter++
+ }
+ })
sessionRule.delegateDuringNextWait(object : ProgressDelegate {
@AssertCalled(count = 1, order = [1])
@@ -1085,7 +1085,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Text delegate should be overridden",
testCounter,
- equalTo(2)
+ equalTo(2),
)
assertThat("Wait delegate should be used", waitCounter, equalTo(2))
@@ -1120,7 +1120,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
@Test fun wrapSession() {
val session = sessionRule.wrapSession(
- GeckoSession(mainSession.settings)
+ GeckoSession(mainSession.settings),
)
sessionRule.openSession(session)
session.reload()
@@ -1134,7 +1134,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"New session has same settings",
newSession.settings,
- equalTo(mainSession.settings)
+ equalTo(mainSession.settings),
)
}
@@ -1177,7 +1177,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"New session has same settings",
newSession.settings,
- equalTo(mainSession.settings)
+ equalTo(mainSession.settings),
)
}
@@ -1476,19 +1476,19 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS string result should be correct",
sessionRule.evaluateExtensionJS("return 'foo';") as String,
- equalTo("foo")
+ equalTo("foo"),
)
assertThat(
"JS number result should be correct",
sessionRule.evaluateExtensionJS("return 1+1;") as Double,
- equalTo(2.0)
+ equalTo(2.0),
)
assertThat(
"JS boolean result should be correct",
sessionRule.evaluateExtensionJS("return !0;") as Boolean,
- equalTo(true)
+ equalTo(true),
)
val expected = JSONObject("{bar:42,baz:true,foo:'bar'}")
@@ -1497,20 +1497,20 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS object result should be correct",
actual.get(key),
- equalTo(expected.get(key))
+ equalTo(expected.get(key)),
)
}
assertThat(
"JS array result should be correct",
sessionRule.evaluateExtensionJS("return [1,2,3];") as JSONArray,
- equalTo(JSONArray("[1,2,3]"))
+ equalTo(JSONArray("[1,2,3]")),
)
assertThat(
"Can access extension APIS",
sessionRule.evaluateExtensionJS("return !!browser.runtime;") as Boolean,
- equalTo(true)
+ equalTo(true),
)
assertThat(
@@ -1519,9 +1519,9 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
"""
return true;
// Comments at the end are allowed
- """.trimIndent()
+ """.trimIndent(),
) as Boolean,
- equalTo(true)
+ equalTo(true),
)
try {
@@ -1531,7 +1531,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Syntax errors are reported",
e.message,
- containsString("SyntaxError")
+ containsString("SyntaxError"),
)
}
}
@@ -1543,19 +1543,19 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS string result should be correct",
mainSession.evaluateJS("'foo'") as String,
- equalTo("foo")
+ equalTo("foo"),
)
assertThat(
"JS number result should be correct",
mainSession.evaluateJS("1+1") as Double,
- equalTo(2.0)
+ equalTo(2.0),
)
assertThat(
"JS boolean result should be correct",
mainSession.evaluateJS("!0") as Boolean,
- equalTo(true)
+ equalTo(true),
)
val expected = JSONObject("{bar:42,baz:true,foo:'bar'}")
@@ -1564,20 +1564,20 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS object result should be correct",
actual.get(key),
- equalTo(expected.get(key))
+ equalTo(expected.get(key)),
)
}
assertThat(
"JS array result should be correct",
mainSession.evaluateJS("[1,2,3]") as JSONArray,
- equalTo(JSONArray("[1,2,3]"))
+ equalTo(JSONArray("[1,2,3]")),
)
assertThat(
"JS DOM object result should be correct",
mainSession.evaluateJS("document.body.tagName") as String,
- equalTo("BODY")
+ equalTo("BODY"),
)
}
@@ -1588,7 +1588,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS DOM window result should be correct",
(mainSession.evaluateJS("window.location.pathname")) as String,
- equalTo(HELLO_HTML_PATH)
+ equalTo(HELLO_HTML_PATH),
)
}
@@ -1600,7 +1600,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Variable should be set",
mainSession.evaluateJS("this.foo") as Double,
- equalTo(42.0)
+ equalTo(42.0),
)
val newSession = sessionRule.createOpenSession()
@@ -1611,7 +1611,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"New session should have separate JS context",
result,
- nullValue()
+ nullValue(),
)
}
@@ -1622,13 +1622,13 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Can get resolved promise",
mainSession.evaluatePromiseJS(
- "new Promise(resolve => resolve('foo'))"
+ "new Promise(resolve => resolve('foo'))",
).value as String,
- equalTo("foo")
+ equalTo("foo"),
)
val promise = mainSession.evaluatePromiseJS(
- "new Promise(r => window.resolve = r)"
+ "new Promise(r => window.resolve = r)",
)
mainSession.evaluateJS("window.resolve('bar')")
@@ -1636,7 +1636,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Can wait for promise to resolve",
promise.value as String,
- equalTo("bar")
+ equalTo("bar"),
)
}
@@ -1655,7 +1655,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"JS blocking result should be correct",
mainSession.evaluateJS("alert(); 'foo'") as String,
- equalTo("foo")
+ equalTo("foo"),
)
}
@@ -1699,7 +1699,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Undefined pref should have null value",
sessionRule.getPrefs("invalid.pref")[0],
- equalTo(JSONObject.NULL)
+ equalTo(JSONObject.NULL),
)
}
@@ -1708,15 +1708,15 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
mapOf(
"test.pref.bool" to true,
"test.pref.int" to 1,
- "test.pref.foo" to "foo"
- )
+ "test.pref.foo" to "foo",
+ ),
)
var prefs = sessionRule.getPrefs(
"test.pref.bool",
"test.pref.int",
"test.pref.foo",
- "test.pref.bar"
+ "test.pref.bar",
)
assertThat("Prefs should be set", prefs[0] as Boolean, equalTo(true))
@@ -1727,15 +1727,15 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"test.pref.foo" to "bar",
- "test.pref.bar" to "baz"
- )
+ "test.pref.bar" to "baz",
+ ),
)
prefs = sessionRule.getPrefs(
"test.pref.bool",
"test.pref.int",
"test.pref.foo",
- "test.pref.bar"
+ "test.pref.bar",
)
assertThat("New prefs should be set", prefs[0] as Boolean, equalTo(true))
@@ -1752,14 +1752,14 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
mapOf(
"test.pref.bool" to true,
"test.pref.int" to 1,
- "test.pref.foo" to "foo"
- )
+ "test.pref.foo" to "foo",
+ ),
)
var prefs = sessionRule.getPrefs(
"test.pref.bool",
"test.pref.int",
- "test.pref.foo"
+ "test.pref.foo",
)
assertThat("Prefs should be set before wait", prefs[0] as Boolean, equalTo(true))
@@ -1772,7 +1772,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
prefs = sessionRule.getPrefs(
"test.pref.bool",
"test.pref.int",
- "test.pref.foo"
+ "test.pref.foo",
)
assertThat("Prefs should be cleared after wait", prefs[0], equalTo(JSONObject.NULL))
@@ -1787,21 +1787,21 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"test.pref.int" to 1,
- "test.pref.foo" to "foo"
- )
+ "test.pref.foo" to "foo",
+ ),
)
sessionRule.setPrefsDuringNextWait(
mapOf(
"test.pref.foo" to "bar",
- "test.pref.bar" to "baz"
- )
+ "test.pref.bar" to "baz",
+ ),
)
var prefs = sessionRule.getPrefs(
"test.pref.int",
"test.pref.foo",
- "test.pref.bar"
+ "test.pref.bar",
)
assertThat("Prefs should be overridden", prefs[0] as Int, equalTo(1))
@@ -1814,7 +1814,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
prefs = sessionRule.getPrefs(
"test.pref.int",
"test.pref.foo",
- "test.pref.bar"
+ "test.pref.bar",
)
assertThat("Overriden prefs should be restored", prefs[0] as Int, equalTo(1))
@@ -1829,7 +1829,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"waitForJS should return correct result",
mainSession.waitForJS("alert(), 'foo'") as String,
- equalTo("foo")
+ equalTo("foo"),
)
mainSession.forCallbacksDuringWait(object : PromptDelegate {
@@ -1846,7 +1846,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"waitForJS should wait for promises",
mainSession.waitForJS("Promise.resolve('foo')") as String,
- equalTo("foo")
+ equalTo("foo"),
)
}
@@ -1904,14 +1904,14 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat("Second argument should be correct", bar, equalTo("bar"))
return 42
}
- }
+ },
)
assertThat("Delegate should be registered", delegate, notNullValue())
assertThat(
"Delegate return value should be correct",
delegate.onDelegate("foo", "bar"),
- equalTo(42)
+ equalTo(42),
)
sessionRule.performTestEndCheck()
}
@@ -1927,7 +1927,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onDelegate(foo: String, bar: String): Int {
return 42
}
- }
+ },
)
sessionRule.performTestEndCheck()
}
@@ -1942,7 +1942,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
Runnable::class,
{ newDelegate -> delegate = newDelegate },
{ delegate = null },
- Runnable { }
+ Runnable { },
)
assertThat("Delegate should be registered", delegate, notNullValue())
@@ -1972,7 +1972,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onDelegate(foo: String, bar: String): Int {
return 24
}
- }
+ },
)
sessionRule.addExternalDelegateUntilTestEnd(
@@ -1984,14 +1984,14 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
override fun onDelegate(foo: String, bar: String): Int {
return 42
}
- }
+ },
)
assertThat("Wait delegate should be registered", delegate, notNullValue())
assertThat(
"Wait delegate return value should be correct",
delegate?.onDelegate("", ""),
- equalTo(24)
+ equalTo(24),
)
mainSession.reload()
@@ -2001,7 +2001,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
assertThat(
"Test delegate return value should be correct",
delegate?.onDelegate("", ""),
- equalTo(42)
+ equalTo(42),
)
sessionRule.performTestEndCheck()
}
@@ -2066,14 +2066,14 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) {
"cookiebanners.service.mode" to CookieBannerMode.COOKIE_BANNER_MODE_REJECT,
"cookiebanners.listService.testSkipRemoteSettings" to true,
"cookiebanners.listService.testRules" to testRules,
- "cookiebanners.service.detectOnly" to false
- )
+ "cookiebanners.service.detectOnly" to false,
+ ),
)
var prefs = sessionRule.getPrefs(
"cookiebanners.service.mode",
"cookiebanners.listService.testSkipRemoteSettings",
"cookiebanners.listService.testRules",
- "cookiebanners.service.detectOnly"
+ "cookiebanners.service.detectOnly",
)
assertThat("Cookie banner service mode should be correct", prefs[0] as Int, equalTo(1))
assertThat("Cookie banner remote settings should be skipped", prefs[1] as Boolean, equalTo(true))
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt
index 1f89e979bafb9eeb66efb66bfed3d3e2810d4f77..82af2c6475abeecae568358660fd1079fd3a38dc 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoViewTest.kt
@@ -69,7 +69,7 @@ class GeckoViewTest : BaseSessionTest() {
assertThat(
"The new session should be correctly set.",
it.view.session,
- equalTo(newSession)
+ equalTo(newSession),
)
}
}
@@ -80,7 +80,7 @@ class GeckoViewTest : BaseSessionTest() {
assertThat(
"View should be attached",
ViewCompat.isAttachedToWindow(it.view),
- equalTo(true)
+ equalTo(true),
)
it.view.session!!.acquireDisplay()
}
@@ -119,8 +119,8 @@ class GeckoViewTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"dom.ipc.processPriorityManager.backgroundGracePeriodMS" to 0,
- "dom.ipc.processPriorityManager.backgroundPerceivableGracePeriodMS" to 0
- )
+ "dom.ipc.processPriorityManager.backgroundPerceivableGracePeriodMS" to 0,
+ ),
)
val otherSession = sessionRule.createOpenSession()
@@ -139,7 +139,7 @@ class GeckoViewTest : BaseSessionTest() {
waitUntilContentProcessPriority(
high = listOf(mainSession),
- low = listOf(otherSession)
+ low = listOf(otherSession),
)
return otherSession
@@ -187,7 +187,7 @@ class GeckoViewTest : BaseSessionTest() {
waitUntilContentProcessPriority(
high = listOf(otherSession),
- low = listOf(mainSession)
+ low = listOf(mainSession),
)
// After releasing otherSession, both sessions should be low priority
@@ -195,21 +195,21 @@ class GeckoViewTest : BaseSessionTest() {
waitUntilContentProcessPriority(
high = listOf(),
- low = listOf(mainSession, otherSession)
+ low = listOf(mainSession, otherSession),
)
// Test that re-setting mainSession in the view raises the priority again
it.view.setSession(mainSession)
waitUntilContentProcessPriority(
high = listOf(mainSession),
- low = listOf(otherSession)
+ low = listOf(otherSession),
)
// Setting the session to active should also raise priority
otherSession.setActive(true)
waitUntilContentProcessPriority(
high = listOf(mainSession, otherSession),
- low = listOf()
+ low = listOf(),
)
}
}
@@ -227,7 +227,7 @@ class GeckoViewTest : BaseSessionTest() {
waitUntilContentProcessPriority(
high = listOf(mainSession, otherSession),
- low = listOf()
+ low = listOf(),
)
// Setting priorityHint to PRIORITY_DEFAULT should lower priority
@@ -235,7 +235,7 @@ class GeckoViewTest : BaseSessionTest() {
waitUntilContentProcessPriority(
high = listOf(mainSession),
- low = listOf(otherSession)
+ low = listOf(otherSession),
)
}
@@ -260,7 +260,7 @@ class GeckoViewTest : BaseSessionTest() {
"#user1" to "username@example.com",
"#user2" to "username@example.com",
"#pass1" to "test-password",
- "#pass2" to "test-password"
+ "#pass2" to "test-password",
)
// Set up promises to monitor the values changing.
@@ -269,7 +269,7 @@ class GeckoViewTest : BaseSessionTest() {
mainSession.evaluatePromiseJS(
"""
window.getDataForAllFrames('${entry.key}', '${entry.value}')
- """
+ """,
)
}
@@ -303,7 +303,7 @@ class GeckoViewTest : BaseSessionTest() {
assertThat(
"input event should be dispatched with InputEvent interface",
eventInterface,
- equalTo("InputEvent")
+ equalTo("InputEvent"),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt
index 7f236216d250a1059bf96096c4fe4dbc50dbb48d..4c51a4d65c7be8c655f1f23c2ff4d70785f4d17f 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt
@@ -71,7 +71,7 @@ class GeolocationTest : BaseSessionTest() {
sessionRule.delegateDuringNextWait(object : GeckoSession.PermissionDelegate {
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: GeckoSession.PermissionDelegate.ContentPermission
+ perm: GeckoSession.PermissionDelegate.ContentPermission,
):
GeckoResult<Int> {
return GeckoResult.fromValue(GeckoSession.PermissionDelegate.ContentPermission.VALUE_ALLOW)
@@ -79,7 +79,7 @@ class GeolocationTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: GeckoSession.PermissionDelegate.Callback
+ callback: GeckoSession.PermissionDelegate.Callback,
) {
callback.grant()
}
@@ -98,7 +98,7 @@ class GeolocationTest : BaseSessionTest() {
error => reject(error.code),
{maximumAge: $maximumAge,
timeout: $timeout,
- enableHighAccuracy: $enableHighAccuracy }))"""
+ enableHighAccuracy: $enableHighAccuracy }))""",
).value as JSONObject
}
@@ -111,7 +111,7 @@ class GeolocationTest : BaseSessionTest() {
position => resolve(
{latitude: position.coords.latitude, longitude: position.coords.longitude})),
error => reject(error.code)
- }, "750"))"""
+ }, "750"))""",
).value as JSONObject
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/HistoryDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/HistoryDelegateTest.kt
index 0189c84b87717f43d8d8bb0b2a645f07a9ed3c85..a4ec7c3139f9528fab8a7f121c407dc18c240cf6 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/HistoryDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/HistoryDelegateTest.kt
@@ -34,14 +34,14 @@ class HistoryDelegateTest : BaseSessionTest() {
session: GeckoSession,
url: String,
lastVisitedURL: String?,
- flags: Int
+ flags: Int,
): GeckoResult<Boolean>? {
assertThat("Should pass visited URL", url, equalTo(testUri))
assertThat("Should not pass last visited URL", lastVisitedURL, nullValue())
assertThat(
"Should set visit flags",
flags,
- equalTo(GeckoSession.HistoryDelegate.VISIT_TOP_LEVEL)
+ equalTo(GeckoSession.HistoryDelegate.VISIT_TOP_LEVEL),
)
return GeckoResult.fromValue(true)
}
@@ -49,19 +49,19 @@ class HistoryDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun getVisited(
session: GeckoSession,
- urls: Array<String>
+ urls: Array<String>,
): GeckoResult<BooleanArray>? {
val expected = arrayOf(
"https://mozilla.org/",
"https://getfirefox.com/",
"https://bugzilla.mozilla.org/",
"https://testpilot.firefox.com/",
- "https://accounts.firefox.com/"
+ "https://accounts.firefox.com/",
)
assertThat(
"Should pass URLs to check",
urls.sorted(),
- equalTo(expected.sorted())
+ equalTo(expected.sorted()),
)
val visits = BooleanArray(urls.size, {
@@ -80,7 +80,7 @@ class HistoryDelegateTest : BaseSessionTest() {
mainSession.waitUntilCalled(
GeckoSession.HistoryDelegate::class,
"onVisited",
- "getVisited"
+ "getVisited",
)
// Sometimes link changes are not applied immediately, wait for a little bit
@@ -91,19 +91,19 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"Mozilla should be visited",
mainSession.getLinkColor("#mozilla"),
- equalTo(VISITED_COLOR)
+ equalTo(VISITED_COLOR),
)
assertThat(
"Test Pilot should be visited",
mainSession.getLinkColor("#testpilot"),
- equalTo(VISITED_COLOR)
+ equalTo(VISITED_COLOR),
)
assertThat(
"Bugzilla should be unvisited",
mainSession.getLinkColor("#bugzilla"),
- equalTo(UNVISITED_COLOR)
+ equalTo(UNVISITED_COLOR),
)
}
@@ -118,17 +118,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have one entry",
state.size,
- equalTo(1)
+ equalTo(1),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO_HTML_PATH)
+ endsWith(HELLO_HTML_PATH),
)
assertThat(
"History index should be 0",
state.currentIndex,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -141,17 +141,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO2_HTML_PATH)
+ endsWith(HELLO2_HTML_PATH),
)
assertThat(
"History index should be 1",
state.currentIndex,
- equalTo(1)
+ equalTo(1),
)
}
})
@@ -164,17 +164,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO_HTML_PATH)
+ endsWith(HELLO_HTML_PATH),
)
assertThat(
"History index should be 0",
state.currentIndex,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -187,17 +187,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO2_HTML_PATH)
+ endsWith(HELLO2_HTML_PATH),
)
assertThat(
"History index should be 1",
state.currentIndex,
- equalTo(1)
+ equalTo(1),
)
}
})
@@ -210,17 +210,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO_HTML_PATH)
+ endsWith(HELLO_HTML_PATH),
)
assertThat(
"History index should be 1",
state.currentIndex,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -233,17 +233,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO2_HTML_PATH)
+ endsWith(HELLO2_HTML_PATH),
)
assertThat(
"History index should be 1",
state.currentIndex,
- equalTo(1)
+ equalTo(1),
)
}
})
@@ -262,17 +262,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have one entry",
state.size,
- equalTo(1)
+ equalTo(1),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO_HTML_PATH)
+ endsWith(HELLO_HTML_PATH),
)
assertThat(
"History index should be 0",
state.currentIndex,
- equalTo(0)
+ equalTo(0),
)
}
})
@@ -285,17 +285,17 @@ class HistoryDelegateTest : BaseSessionTest() {
assertThat(
"History should have two entries",
state.size,
- equalTo(2)
+ equalTo(2),
)
assertThat(
"URLs should match",
state[state.currentIndex].uri,
- endsWith(HELLO2_HTML_PATH)
+ endsWith(HELLO2_HTML_PATH),
)
assertThat(
"History index should be 1",
state.currentIndex,
- equalTo(1)
+ equalTo(1),
)
}
})
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt
index 64df1ce57edbaf57506796806daf1438f10b1669..6d535b8ad1471596771de98b0fe6f112e8d55581 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt
@@ -17,7 +17,7 @@ class TestImage(
val type: String?,
val sizes: String?,
val widths: Array<Int>?,
- val heights: Array<Int>?
+ val heights: Array<Int>?,
)
@RunWith(AndroidJUnit4::class)
@@ -29,7 +29,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/icon",
"16x16 32x32 64x64",
arrayOf(16, 32, 64),
- arrayOf(16, 32, 64)
+ arrayOf(16, 32, 64),
)
val kValidTestImage2 = TestImage(
@@ -37,7 +37,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/png",
"128x128",
arrayOf(128),
- arrayOf(128)
+ arrayOf(128),
)
val kValidTestImage3 = TestImage(
@@ -45,7 +45,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/jpg",
"256x256",
arrayOf(256),
- arrayOf(256)
+ arrayOf(256),
)
val kValidTestImage4 = TestImage(
@@ -53,7 +53,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/png",
"300x128",
arrayOf(300),
- arrayOf(128)
+ arrayOf(128),
)
val kValidTestImage5 = TestImage(
@@ -61,7 +61,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/svg",
"any",
arrayOf(0),
- arrayOf(0)
+ arrayOf(0),
)
val kValidTestImage6 = TestImage(
@@ -69,7 +69,7 @@ class ImageResourceTest : BaseSessionTest() {
null,
null,
null,
- null
+ null,
)
}
@@ -77,24 +77,24 @@ class ImageResourceTest : BaseSessionTest() {
assertThat(
"Path should match",
image.src,
- equalTo(base.path)
+ equalTo(base.path),
)
assertThat(
"Type should match",
image.type,
- equalTo(base.type)
+ equalTo(base.type),
)
assertThat(
"Sizes should match",
image.sizes?.size,
- equalTo(base.widths?.size)
+ equalTo(base.widths?.size),
)
assertThat(
"Sizes should match",
image.sizes?.size,
- equalTo(base.heights?.size)
+ equalTo(base.heights?.size),
)
if (image.sizes == null) {
@@ -104,12 +104,12 @@ class ImageResourceTest : BaseSessionTest() {
assertThat(
"Sizes widths should match",
image.sizes!![i].width,
- equalTo(base.widths!![i])
+ equalTo(base.widths!![i]),
)
assertThat(
"Sizes heights should match",
image.sizes!![i].height,
- equalTo(base.heights!![i])
+ equalTo(base.heights!![i]),
)
}
}
@@ -146,7 +146,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/icon",
"16x16 32",
arrayOf(16),
- arrayOf(16)
+ arrayOf(16),
)
testValidImage(invalidImage1)
@@ -155,7 +155,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/icon",
"16x16 32xa32",
arrayOf(16),
- arrayOf(16)
+ arrayOf(16),
)
testValidImage(invalidImage2)
@@ -164,7 +164,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/icon",
"",
null,
- null
+ null,
)
testValidImage(invalidImage3)
@@ -173,7 +173,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/icon",
"abxab",
null,
- null
+ null,
)
testValidImage(invalidImage4)
}
@@ -185,8 +185,8 @@ class ImageResourceTest : BaseSessionTest() {
kValidTestImage1,
kValidTestImage2,
kValidTestImage3,
- kValidTestImage4
- )
+ kValidTestImage4,
+ ),
)
// 16, 32, 64
verifyEqual(collection.getBest(10)!!, kValidTestImage1)
@@ -217,8 +217,8 @@ class ImageResourceTest : BaseSessionTest() {
kValidTestImage2,
kValidTestImage3,
kValidTestImage4,
- kValidTestImage5
- )
+ kValidTestImage5,
+ ),
)
// any
verifyEqual(collection.getBest(10)!!, kValidTestImage5)
@@ -245,8 +245,8 @@ class ImageResourceTest : BaseSessionTest() {
kValidTestImage2,
kValidTestImage3,
kValidTestImage4,
- kValidTestImage6
- )
+ kValidTestImage6,
+ ),
)
// null, handled as any
verifyEqual(collection.getBest(10)!!, kValidTestImage6)
@@ -273,7 +273,7 @@ class ImageResourceTest : BaseSessionTest() {
"image/gif",
"any",
arrayOf(0),
- arrayOf(0)
+ arrayOf(0),
)
val collection = buildCollection(arrayOf(testImage))
val image = collection.getBest(actualWidth)
@@ -286,21 +286,21 @@ class ImageResourceTest : BaseSessionTest() {
assertThat(
"Bitmap should be non-null",
bitmap,
- notNullValue()
+ notNullValue(),
)
assertThat(
"Bitmap width should match",
bitmap!!.getWidth(),
- equalTo(actualWidth)
+ equalTo(actualWidth),
)
assertThat(
"Bitmap height should match",
bitmap.getHeight(),
- equalTo(actualHeight)
+ equalTo(actualHeight),
)
GeckoResult.fromValue(null)
- }
+ },
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt
index b8c0a0671ae14e1aceacfae13b27001ee7bd05db..cfe0bcaf12e11976f3badf1ee63262eeded8632d 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt
@@ -38,7 +38,7 @@ class InputResultDetailTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
x,
y,
- 0
+ 0,
)
val result = mainSession.panZoomController.onTouchEventForDetailResult(down)
@@ -49,7 +49,7 @@ class InputResultDetailTest : BaseSessionTest() {
MotionEvent.ACTION_UP,
x,
y,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(up)
@@ -62,22 +62,22 @@ class InputResultDetailTest : BaseSessionTest() {
actual: InputResultDetail,
expectedHandledResult: Int,
expectedScrollableDirections: Int,
- expectedOverscrollDirections: Int
+ expectedOverscrollDirections: Int,
) {
assertThat(
testName + ": The handled result",
actual.handledResult(),
- equalTo(expectedHandledResult)
+ equalTo(expectedHandledResult),
)
assertThat(
testName + ": The scrollable directions",
actual.scrollableDirections(),
- equalTo(expectedScrollableDirections)
+ equalTo(expectedScrollableDirections),
)
assertThat(
testName + ": The overscroll directions",
actual.overscrollDirections(),
- equalTo(expectedOverscrollDirections)
+ equalTo(expectedOverscrollDirections),
)
}
@@ -139,7 +139,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
expectedPlace,
expectedScrollableDirections,
- expectedOverscrollDirections
+ expectedOverscrollDirections,
)
}
}
@@ -164,7 +164,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
// Prepare a resize event listener.
@@ -175,7 +175,7 @@ class InputResultDetailTest : BaseSessionTest() {
resolve(true);
}, { once: true });
});
- """.trimIndent()
+ """.trimIndent(),
)
// Hide the dynamic toolbar.
@@ -190,7 +190,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_TOP,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
}
@@ -207,7 +207,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
}
@@ -224,7 +224,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- PanZoomController.OVERSCROLL_FLAG_HORIZONTAL
+ PanZoomController.OVERSCROLL_FLAG_HORIZONTAL,
)
}
@@ -241,7 +241,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- PanZoomController.OVERSCROLL_FLAG_VERTICAL
+ PanZoomController.OVERSCROLL_FLAG_VERTICAL,
)
}
@@ -256,7 +256,7 @@ class InputResultDetailTest : BaseSessionTest() {
resolve(true);
}, { once: true });
});
- """.trimIndent()
+ """.trimIndent(),
)
// Scroll to the bottom edge of the scroll container.
@@ -264,7 +264,7 @@ class InputResultDetailTest : BaseSessionTest() {
"""
const scroll = document.getElementById('scroll');
scroll.scrollTo(0, scroll.scrollHeight);
- """.trimIndent()
+ """.trimIndent(),
)
assertThat("scroll", scrollPromise.value as Boolean, equalTo(true))
mainSession.flushApzRepaints()
@@ -284,7 +284,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED_CONTENT,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- PanZoomController.OVERSCROLL_FLAG_VERTICAL
+ PanZoomController.OVERSCROLL_FLAG_VERTICAL,
)
// Scroll to the bottom edge
@@ -298,7 +298,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
}
@@ -306,7 +306,7 @@ class InputResultDetailTest : BaseSessionTest() {
@Test
fun testOverscrollBehaviorNoneOnNonRoot() {
var files = arrayOf(
- OVERSCROLL_BEHAVIOR_NONE_NON_ROOT_HTML_PATH
+ OVERSCROLL_BEHAVIOR_NONE_NON_ROOT_HTML_PATH,
)
for (file in files) {
@@ -319,7 +319,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED_CONTENT,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- PanZoomController.OVERSCROLL_FLAG_NONE
+ PanZoomController.OVERSCROLL_FLAG_NONE,
)
// Scroll to the bottom edge so that the container is no longer scrollable downwards.
@@ -333,7 +333,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED_CONTENT,
PanZoomController.SCROLLABLE_FLAG_TOP,
- PanZoomController.OVERSCROLL_FLAG_NONE
+ PanZoomController.OVERSCROLL_FLAG_NONE,
)
}
}
@@ -344,7 +344,7 @@ class InputResultDetailTest : BaseSessionTest() {
sessionRule.display?.run { setDynamicToolbarMaxHeight(20) }
var files = arrayOf(
- OVERSCROLL_BEHAVIOR_NONE_NON_ROOT_HTML_PATH
+ OVERSCROLL_BEHAVIOR_NONE_NON_ROOT_HTML_PATH,
)
for (file in files) {
@@ -357,7 +357,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED_CONTENT,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- PanZoomController.OVERSCROLL_FLAG_NONE
+ PanZoomController.OVERSCROLL_FLAG_NONE,
)
// Scroll to the bottom edge so that the container is no longer scrollable downwards.
@@ -373,7 +373,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_HANDLED,
PanZoomController.SCROLLABLE_FLAG_BOTTOM,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
}
}
@@ -396,8 +396,8 @@ class InputResultDetailTest : BaseSessionTest() {
fun testFractionalScrollPortSize() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "browser.viewport.desktopWidth" to 980
- )
+ "browser.viewport.desktopWidth" to 980,
+ ),
)
sessionRule.display?.run { setDynamicToolbarMaxHeight(59) }
@@ -411,7 +411,7 @@ class InputResultDetailTest : BaseSessionTest() {
value,
PanZoomController.INPUT_RESULT_UNHANDLED,
PanZoomController.SCROLLABLE_FLAG_NONE,
- (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL)
+ (PanZoomController.OVERSCROLL_FLAG_HORIZONTAL or PanZoomController.OVERSCROLL_FLAG_VERTICAL),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt
index 2ac455df2ad0caf676fb713bf51cdfe4d79dca1a..69deac1c89a908117db8da8eaeb60b1fa8d35637 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt
@@ -19,7 +19,7 @@ class LocaleTest : BaseSessionTest() {
assertThat(
"Requested locale is found",
sessionRule.requestedLocales.indexOf("en-GB"),
- greaterThanOrEqualTo(0)
+ greaterThanOrEqualTo(0),
)
}
@@ -28,7 +28,7 @@ class LocaleTest : BaseSessionTest() {
assertThat(
"Locales have no duplicates",
sessionRule.requestedLocales,
- equalTo(listOf("en-GB", "en-US", "en-FR"))
+ equalTo(listOf("en-GB", "en-US", "en-FR")),
)
}
@@ -37,7 +37,7 @@ class LocaleTest : BaseSessionTest() {
assertThat(
"Locales are formatted properly",
sessionRule.requestedLocales,
- equalTo(listOf("en-GB", "en-US", "en-FR"))
+ equalTo(listOf("en-GB", "en-US", "en-FR")),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateTest.kt
index 1f0009bf6baf68149d79d6041ae8e165588893ae..19488835e3361a311337bdf3ee73115e6db387f2 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateTest.kt
@@ -29,7 +29,7 @@ class MediaDelegateTest : BaseSessionTest() {
uri: String,
video: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
audio: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
- callback: GeckoSession.PermissionDelegate.MediaCallback
+ callback: GeckoSession.PermissionDelegate.MediaCallback,
) {
if (!(allowAudio || allowCamera)) {
callback.reject()
@@ -52,7 +52,7 @@ class MediaDelegateTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: GeckoSession.PermissionDelegate.Callback
+ callback: GeckoSession.PermissionDelegate.Callback,
) {
callback.grant()
}
@@ -62,7 +62,7 @@ class MediaDelegateTest : BaseSessionTest() {
@GeckoSessionTestRule.AssertCalled(count = 1)
override fun onRecordingStatusChanged(
session: GeckoSession,
- devices: Array<org.mozilla.geckoview.GeckoSession.MediaDelegate.RecordingDevice>
+ devices: Array<org.mozilla.geckoview.GeckoSession.MediaDelegate.RecordingDevice>,
) {
var audioActive = false
var cameraActive = false
@@ -78,13 +78,13 @@ class MediaDelegateTest : BaseSessionTest() {
assertThat(
"Camera is ${if (allowCamera) { "active" } else { "inactive" }}",
cameraActive,
- Matchers.equalTo(allowCamera)
+ Matchers.equalTo(allowCamera),
)
assertThat(
"Audio is ${if (allowAudio) { "active" } else { "inactive" }}",
audioActive,
- Matchers.equalTo(allowAudio)
+ Matchers.equalTo(allowAudio),
)
}
})
@@ -117,13 +117,13 @@ class MediaDelegateTest : BaseSessionTest() {
return true;
})
- """.trimMargin()
+ """.trimMargin(),
) as Boolean
assertThat(
"Stream should be active and id should not be empty.",
isActive,
- Matchers.equalTo(true)
+ Matchers.equalTo(true),
)
}
@@ -134,7 +134,7 @@ class MediaDelegateTest : BaseSessionTest() {
mainSession.waitForPageStop()
val devices = mainSession.waitForJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
).asJSList<JSONObject>()
val audioDevice = devices.find { map -> map.getString("kind") == "audioinput" }
if (audioDevice != null) {
@@ -150,7 +150,7 @@ class MediaDelegateTest : BaseSessionTest() {
mainSession.waitForPageStop()
val devices = mainSession.waitForJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
).asJSList<JSONObject>()
val videoDevice = devices.find { map -> map.getString("kind") == "videoinput" }
@@ -166,7 +166,7 @@ class MediaDelegateTest : BaseSessionTest() {
mainSession.waitForPageStop()
val devices = mainSession.waitForJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
).asJSList<JSONObject>()
val audioDevice = devices.find { map -> map.getString("kind") == "audioinput" }
val videoDevice = devices.find { map -> map.getString("kind") == "videoinput" }
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateXOriginTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateXOriginTest.kt
index 495c366e844e132fcb8515363d810c81c936abca..2caa71fc712167a32f6b1ea0f42d61843d43786d 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateXOriginTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaDelegateXOriginTest.kt
@@ -29,7 +29,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
uri: String,
video: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
audio: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
- callback: GeckoSession.PermissionDelegate.MediaCallback
+ callback: GeckoSession.PermissionDelegate.MediaCallback,
) {
if (!(allowAudio || allowCamera)) {
callback.reject()
@@ -52,7 +52,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: GeckoSession.PermissionDelegate.Callback
+ callback: GeckoSession.PermissionDelegate.Callback,
) {
callback.grant()
}
@@ -62,7 +62,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
@GeckoSessionTestRule.AssertCalled(count = 1)
override fun onRecordingStatusChanged(
session: GeckoSession,
- devices: Array<MediaDelegate.RecordingDevice>
+ devices: Array<MediaDelegate.RecordingDevice>,
) {
var audioActive = false
var cameraActive = false
@@ -78,13 +78,13 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
assertThat(
"Camera is ${if (allowCamera) { "active" } else { "inactive" }}",
cameraActive,
- Matchers.equalTo(allowCamera)
+ Matchers.equalTo(allowCamera),
)
assertThat(
"Audio is ${if (allowAudio) { "active" } else { "inactive" }}",
audioActive,
- Matchers.equalTo(allowAudio)
+ Matchers.equalTo(allowAudio),
)
}
})
@@ -118,7 +118,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
uri: String,
video: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
audio: Array<out GeckoSession.PermissionDelegate.MediaSource>?,
- callback: GeckoSession.PermissionDelegate.MediaCallback
+ callback: GeckoSession.PermissionDelegate.MediaCallback,
) {
callback.reject()
}
@@ -127,7 +127,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: GeckoSession.PermissionDelegate.Callback
+ callback: GeckoSession.PermissionDelegate.Callback,
) {
callback.reject()
}
@@ -137,7 +137,7 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
@GeckoSessionTestRule.AssertCalled(count = 0)
override fun onRecordingStatusChanged(
session: GeckoSession,
- devices: Array<org.mozilla.geckoview.GeckoSession.MediaDelegate.RecordingDevice>
+ devices: Array<org.mozilla.geckoview.GeckoSession.MediaDelegate.RecordingDevice>,
) {}
})
@@ -170,13 +170,13 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
mainSession.waitForPageStop()
val devices = mainSession.waitForJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
).asJSList<JSONObject>()
val audioDevice = devices.find { map -> map.getString("kind") == "audioinput" }
val videoDevice = devices.find { map -> map.getString("kind") == "videoinput" }
requestRecordingPermission(
allowAudio = audioDevice != null,
- allowCamera = videoDevice != null
+ allowCamera = videoDevice != null,
)
}
@@ -185,13 +185,13 @@ class MediaDelegateXOriginTest : BaseSessionTest() {
mainSession.waitForPageStop()
val devices = mainSession.waitForJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
).asJSList<JSONObject>()
val audioDevice = devices.find { map -> map.getString("kind") == "audioinput" }
val videoDevice = devices.find { map -> map.getString("kind") == "videoinput" }
requestRecordingPermissionNoAllow(
allowAudio = audioDevice != null,
- allowCamera = videoDevice != null
+ allowCamera = videoDevice != null,
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
index 8fcbd6821119858d7851bdce4e882c15dd77f1fb..a173b76432986512b2eb757f92aae9373b0bf081 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
@@ -20,7 +20,7 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled
class Metadata(
title: String?,
artist: String?,
- album: String?
+ album: String?,
) :
MediaSession.Metadata(title, artist, album, null)
@@ -48,18 +48,18 @@ class MediaSessionTest : BaseSessionTest() {
Metadata(
DOM_TEST_TITLE1,
DOM_TEST_ARTIST1,
- DOM_TEST_ALBUM1
+ DOM_TEST_ALBUM1,
),
Metadata(
DOM_TEST_TITLE2,
DOM_TEST_ARTIST2,
- DOM_TEST_ALBUM2
+ DOM_TEST_ALBUM2,
),
Metadata(
DOM_TEST_TITLE3,
DOM_TEST_ARTIST3,
- DOM_TEST_ALBUM3
- )
+ DOM_TEST_ALBUM3,
+ ),
)
}
@@ -68,8 +68,8 @@ class MediaSessionTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"media.mediacontrol.stopcontrol.aftermediaends" to false,
- "dom.media.mediasession.enabled" to true
- )
+ "dom.media.mediasession.enabled" to true,
+ ),
)
}
@@ -88,7 +88,7 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
val onPlayCalled = arrayOf(
GeckoResult<Void>(),
@@ -96,7 +96,7 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
val onPauseCalled = arrayOf(
GeckoResult<Void>(),
@@ -104,7 +104,7 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
// Test:
@@ -116,13 +116,13 @@ class MediaSessionTest : BaseSessionTest() {
val completedStep2 = GeckoResult.allOf(
onActivatedCalled[0],
onMetadataCalled[0],
- onPlayCalled[0]
+ onPlayCalled[0],
)
// 3. Pause playback of track 1.
// a. Ensure onPause (1) is called.
val completedStep3 = GeckoResult.allOf(
- onPauseCalled[0]
+ onPauseCalled[0],
)
// 4. Resume playback (1).
@@ -130,13 +130,13 @@ class MediaSessionTest : BaseSessionTest() {
// b. Ensure onPlay (1) is called.
val completedStep4 = GeckoResult.allOf(
onPlayCalled[1],
- onMetadataCalled[1]
+ onMetadataCalled[1],
)
// 5. Wait for track 1 end.
// a. Ensure onPause (1) is called.
val completedStep5 = GeckoResult.allOf(
- onPauseCalled[1]
+ onPauseCalled[1],
)
// 6. Play next track (2).
@@ -144,7 +144,7 @@ class MediaSessionTest : BaseSessionTest() {
// b. Ensure onPlay (2) is called.
val completedStep6 = GeckoResult.allOf(
onMetadataCalled[2],
- onPlayCalled[2]
+ onPlayCalled[2],
)
// 7. Play next track (3).
@@ -154,7 +154,7 @@ class MediaSessionTest : BaseSessionTest() {
val completedStep7 = GeckoResult.allOf(
onPauseCalled[2],
onMetadataCalled[3],
- onPlayCalled[3]
+ onPlayCalled[3],
)
// 8. Play previous track (2).
@@ -162,18 +162,18 @@ class MediaSessionTest : BaseSessionTest() {
// b. Ensure onMetadata (2) is called.
// c. Ensure onPlay (2) is called.
val completedStep8a = GeckoResult.allOf(
- onPauseCalled[3]
+ onPauseCalled[3],
)
// Without the split, this seems to race and we don't get the pause event.
val completedStep8b = GeckoResult.allOf(
onMetadataCalled[4],
- onPlayCalled[4]
+ onPlayCalled[4],
)
// 9. Wait for track 2 end.
// a. Ensure onPause (2) is called.
val completedStep9 = GeckoResult.allOf(
- onPauseCalled[4]
+ onPauseCalled[4],
)
val path = MEDIA_SESSION_DOM1_PATH
@@ -187,7 +187,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onActivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onActivatedCalled[0].complete(null)
mediaSession1 = mediaSession
@@ -196,7 +196,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(false)
override fun onDeactivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
}
@@ -204,7 +204,7 @@ class MediaSessionTest : BaseSessionTest() {
override fun onFeatures(
session: GeckoSession,
mediaSession: MediaSession,
- features: Long
+ features: Long,
) {
val play = (features and MediaSession.Feature.PLAY) != 0L
val pause = (features and MediaSession.Feature.PAUSE) != 0L
@@ -215,7 +215,7 @@ class MediaSessionTest : BaseSessionTest() {
assertThat(
"Playback constrols should be supported",
play && pause && stop && next && prev,
- equalTo(true)
+ equalTo(true),
)
}
@@ -223,7 +223,7 @@ class MediaSessionTest : BaseSessionTest() {
override fun onMetadata(
session: GeckoSession,
mediaSession: MediaSession,
- meta: MediaSession.Metadata
+ meta: MediaSession.Metadata,
) {
assertThat(
"Title should match",
@@ -234,9 +234,9 @@ class MediaSessionTest : BaseSessionTest() {
DOM_META[0].title,
DOM_META[1].title,
DOM_META[2].title,
- DOM_META[1].title
- )
- )
+ DOM_META[1].title,
+ ),
+ ),
)
assertThat(
"Artist should match",
@@ -247,9 +247,9 @@ class MediaSessionTest : BaseSessionTest() {
DOM_META[0].artist,
DOM_META[1].artist,
DOM_META[2].artist,
- DOM_META[1].artist
- )
- )
+ DOM_META[1].artist,
+ ),
+ ),
)
assertThat(
"Album should match",
@@ -260,14 +260,14 @@ class MediaSessionTest : BaseSessionTest() {
DOM_META[0].album,
DOM_META[1].album,
DOM_META[2].album,
- DOM_META[1].album
- )
- )
+ DOM_META[1].album,
+ ),
+ ),
)
assertThat(
"Artwork image should be non-null",
meta.artwork!!.getBitmap(200),
- notNullValue()
+ notNullValue(),
)
onMetadataCalled[sessionRule.currentCall.counter - 1]
@@ -278,31 +278,31 @@ class MediaSessionTest : BaseSessionTest() {
override fun onPositionState(
session: GeckoSession,
mediaSession: MediaSession,
- state: MediaSession.PositionState
+ state: MediaSession.PositionState,
) {
assertThat(
"Duration should match",
state.duration,
- closeTo(TEST_DURATION1, 0.01)
+ closeTo(TEST_DURATION1, 0.01),
)
assertThat(
"Playback rate should match",
state.playbackRate,
- closeTo(1.0, 0.01)
+ closeTo(1.0, 0.01),
)
assertThat(
"Position should be >= 0",
state.position,
- greaterThanOrEqualTo(0.0)
+ greaterThanOrEqualTo(0.0),
)
}
@AssertCalled(count = 5, order = [2])
override fun onPlay(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPlayCalled[sessionRule.currentCall.counter - 1]
.complete(null)
@@ -311,7 +311,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 5)
override fun onPause(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPauseCalled[sessionRule.currentCall.counter - 1]
.complete(null)
@@ -358,7 +358,7 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
val onPauseCalled = arrayOf(
GeckoResult<Void>(),
@@ -366,7 +366,7 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
// Test:
@@ -376,25 +376,25 @@ class MediaSessionTest : BaseSessionTest() {
// b. Ensure onPlay (1) is called.
val completedStep2 = GeckoResult.allOf(
onActivatedCalled[0],
- onPlayCalled[0]
+ onPlayCalled[0],
)
// 3. Pause playback of track 1.
// a. Ensure onPause (1) is called.
val completedStep3 = GeckoResult.allOf(
- onPauseCalled[0]
+ onPauseCalled[0],
)
// 4. Resume playback (1).
// b. Ensure onPlay (1) is called.
val completedStep4 = GeckoResult.allOf(
- onPlayCalled[1]
+ onPlayCalled[1],
)
// 5. Wait for track 1 end.
// a. Ensure onPause (1) is called.
val completedStep5 = GeckoResult.allOf(
- onPauseCalled[1]
+ onPauseCalled[1],
)
val path = MEDIA_SESSION_DEFAULT1_PATH
@@ -408,7 +408,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onActivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onActivatedCalled[0].complete(null)
mediaSession1 = mediaSession
@@ -417,7 +417,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 2, order = [2])
override fun onPlay(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPlayCalled[sessionRule.currentCall.counter - 1]
.complete(null)
@@ -426,7 +426,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onPause(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPauseCalled[sessionRule.currentCall.counter - 1]
.complete(null)
@@ -450,7 +450,7 @@ class MediaSessionTest : BaseSessionTest() {
val onActivatedCalled = arrayOf(
arrayOf(GeckoResult<Void>()),
- arrayOf(GeckoResult<Void>())
+ arrayOf(GeckoResult<Void>()),
)
val onMetadataCalled = arrayOf(
arrayOf(
@@ -458,15 +458,15 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
),
arrayOf(
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
- )
+ GeckoResult<Void>(),
+ ),
)
val onPlayCalled = arrayOf(
arrayOf(
@@ -474,15 +474,15 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
),
arrayOf(
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
- )
+ GeckoResult<Void>(),
+ ),
)
val onPauseCalled = arrayOf(
arrayOf(
@@ -490,15 +490,15 @@ class MediaSessionTest : BaseSessionTest() {
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
),
arrayOf(
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
GeckoResult<Void>(),
- GeckoResult<Void>()
- )
+ GeckoResult<Void>(),
+ ),
)
// Test:
@@ -511,13 +511,13 @@ class MediaSessionTest : BaseSessionTest() {
val completedStep2 = GeckoResult.allOf(
onActivatedCalled[0][0],
onMetadataCalled[0][0],
- onPlayCalled[0][0]
+ onPlayCalled[0][0],
)
// 3. Session1: Pause playback of track 1.
// a. Session1: Ensure onPause (1) is called.
val completedStep3 = GeckoResult.allOf(
- onPauseCalled[0][0]
+ onPauseCalled[0][0],
)
// 4. Session2: Load DOM Media Session page with 3 audio tracks.
@@ -529,13 +529,13 @@ class MediaSessionTest : BaseSessionTest() {
val completedStep5 = GeckoResult.allOf(
onActivatedCalled[1][0],
onMetadataCalled[1][0],
- onPlayCalled[1][0]
+ onPlayCalled[1][0],
)
// 6. Session2: Pause playback of track 1.
// a. Session2: Ensure onPause (1) is called.
val completedStep6 = GeckoResult.allOf(
- onPauseCalled[1][0]
+ onPauseCalled[1][0],
)
// 7. Session1: Play next track (2).
@@ -543,13 +543,13 @@ class MediaSessionTest : BaseSessionTest() {
// b. Session1: Ensure onPlay (2) is called.
val completedStep7 = GeckoResult.allOf(
onMetadataCalled[0][1],
- onPlayCalled[0][1]
+ onPlayCalled[0][1],
)
// 8. Session1: wait for track 1 end.
// a. Ensure onPause (1) is called.
val completedStep8 = GeckoResult.allOf(
- onPauseCalled[0][1]
+ onPauseCalled[0][1],
)
val path = MEDIA_SESSION_DOM1_PATH
@@ -562,7 +562,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onActivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onActivatedCalled[0][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -571,7 +571,7 @@ class MediaSessionTest : BaseSessionTest() {
assertThat(
"Should be active",
mediaSession1?.isActive,
- equalTo(true)
+ equalTo(true),
)
}
@@ -579,24 +579,24 @@ class MediaSessionTest : BaseSessionTest() {
override fun onPositionState(
session: GeckoSession,
mediaSession: MediaSession,
- state: MediaSession.PositionState
+ state: MediaSession.PositionState,
) {
assertThat(
"Duration should match",
state.duration,
- closeTo(TEST_DURATION1, 0.01)
+ closeTo(TEST_DURATION1, 0.01),
)
assertThat(
"Playback rate should match",
state.playbackRate,
- closeTo(1.0, 0.01)
+ closeTo(1.0, 0.01),
)
assertThat(
"Position should be >= 0",
state.position,
- greaterThanOrEqualTo(0.0)
+ greaterThanOrEqualTo(0.0),
)
}
@@ -604,7 +604,7 @@ class MediaSessionTest : BaseSessionTest() {
override fun onFeatures(
session: GeckoSession,
mediaSession: MediaSession,
- features: Long
+ features: Long,
) {
val play = (features and MediaSession.Feature.PLAY) != 0L
val pause = (features and MediaSession.Feature.PAUSE) != 0L
@@ -615,7 +615,7 @@ class MediaSessionTest : BaseSessionTest() {
assertThat(
"Playback constrols should be supported",
play && pause && stop && next && prev,
- equalTo(true)
+ equalTo(true),
)
}
@@ -623,7 +623,7 @@ class MediaSessionTest : BaseSessionTest() {
override fun onMetadata(
session: GeckoSession,
mediaSession: MediaSession,
- meta: MediaSession.Metadata
+ meta: MediaSession.Metadata,
) {
val count = sessionRule.currentCall.counter
if (count < 3) {
@@ -637,9 +637,9 @@ class MediaSessionTest : BaseSessionTest() {
equalTo(
forEachCall(
DOM_META[0].title,
- DOM_META[1].title
- )
- )
+ DOM_META[1].title,
+ ),
+ ),
)
assertThat(
"Artist should match",
@@ -647,9 +647,9 @@ class MediaSessionTest : BaseSessionTest() {
equalTo(
forEachCall(
DOM_META[0].artist,
- DOM_META[1].artist
- )
- )
+ DOM_META[1].artist,
+ ),
+ ),
)
assertThat(
"Album should match",
@@ -657,21 +657,21 @@ class MediaSessionTest : BaseSessionTest() {
equalTo(
forEachCall(
DOM_META[0].album,
- DOM_META[1].album
- )
- )
+ DOM_META[1].album,
+ ),
+ ),
)
assertThat(
"Artwork image should be non-null",
meta.artwork!!.getBitmap(200),
- notNullValue()
+ notNullValue(),
)
}
@AssertCalled(count = 2)
override fun onPlay(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPlayCalled[0][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -680,7 +680,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onPause(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPauseCalled[0][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -691,7 +691,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onActivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onActivatedCalled[1][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -700,12 +700,12 @@ class MediaSessionTest : BaseSessionTest() {
assertThat(
"Should be active",
mediaSession1!!.isActive,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Should be active",
mediaSession2!!.isActive,
- equalTo(true)
+ equalTo(true),
)
}
@@ -713,7 +713,7 @@ class MediaSessionTest : BaseSessionTest() {
override fun onMetadata(
session: GeckoSession,
mediaSession: MediaSession,
- meta: MediaSession.Metadata
+ meta: MediaSession.Metadata,
) {
val count = sessionRule.currentCall.counter
if (count < 2) {
@@ -726,34 +726,34 @@ class MediaSessionTest : BaseSessionTest() {
meta.title,
equalTo(
forEachCall(
- DOM_META[0].title
- )
- )
+ DOM_META[0].title,
+ ),
+ ),
)
assertThat(
"Artist should match",
meta.artist,
equalTo(
forEachCall(
- DOM_META[0].artist
- )
- )
+ DOM_META[0].artist,
+ ),
+ ),
)
assertThat(
"Album should match",
meta.album,
equalTo(
forEachCall(
- DOM_META[0].album
- )
- )
+ DOM_META[0].album,
+ ),
+ ),
)
}
@AssertCalled(count = 1)
override fun onPlay(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPlayCalled[1][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -762,7 +762,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onPause(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPauseCalled[1][sessionRule.currentCall.counter - 1]
.complete(null)
@@ -796,8 +796,8 @@ class MediaSessionTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"media.autoplay.default" to 0,
- "full-screen-api.allow-trusted-requests-only" to false
- )
+ "full-screen-api.allow-trusted-requests-only" to false,
+ ),
)
val onActivatedCalled = GeckoResult<Void>()
@@ -805,7 +805,7 @@ class MediaSessionTest : BaseSessionTest() {
val onPauseCalled = GeckoResult<Void>()
val onFullscreenCalled = arrayOf(
GeckoResult<Void>(),
- GeckoResult<Void>()
+ GeckoResult<Void>(),
)
// Test:
@@ -816,25 +816,25 @@ class MediaSessionTest : BaseSessionTest() {
// b. Ensure onPlay is called.
val completedStep2 = GeckoResult.allOf(
onActivatedCalled,
- onPlayCalled
+ onPlayCalled,
)
// 3. Enter fullscreen of the video.
// a. Ensure onFullscreen is called.
val completedStep3 = GeckoResult.allOf(
- onFullscreenCalled[0]
+ onFullscreenCalled[0],
)
// 4. Exit fullscreen of the video.
// a. Ensure onFullscreen is called.
val completedStep4 = GeckoResult.allOf(
- onFullscreenCalled[1]
+ onFullscreenCalled[1],
)
// 5. Pause the video.
// a. Ensure onPause is called.
val completedStep5 = GeckoResult.allOf(
- onPauseCalled
+ onPauseCalled,
)
var mediaSession1: MediaSession? = null
@@ -846,7 +846,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onActivated(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
mediaSession1 = mediaSession
@@ -855,14 +855,14 @@ class MediaSessionTest : BaseSessionTest() {
assertThat(
"Should be active",
mediaSession.isActive,
- equalTo(true)
+ equalTo(true),
)
}
@AssertCalled(count = 1, order = [2])
override fun onPlay(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPlayCalled.complete(null)
}
@@ -870,7 +870,7 @@ class MediaSessionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onPause(
session: GeckoSession,
- mediaSession: MediaSession
+ mediaSession: MediaSession,
) {
onPauseCalled.complete(null)
}
@@ -880,49 +880,49 @@ class MediaSessionTest : BaseSessionTest() {
session: GeckoSession,
mediaSession: MediaSession,
enabled: Boolean,
- meta: MediaSession.ElementMetadata?
+ meta: MediaSession.ElementMetadata?,
) {
if (sessionRule.currentCall.counter == 1) {
assertThat(
"Fullscreen should be enabled",
enabled,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Element metadata should exist",
meta,
- notNullValue()
+ notNullValue(),
)
assertThat(
"Duration should match",
meta!!.duration,
- closeTo(WEBM_TEST_DURATION, 0.01)
+ closeTo(WEBM_TEST_DURATION, 0.01),
)
assertThat(
"Width should match",
meta.width,
- equalTo(WEBM_TEST_WIDTH)
+ equalTo(WEBM_TEST_WIDTH),
)
assertThat(
"Height should match",
meta.height,
- equalTo(WEBM_TEST_HEIGHT)
+ equalTo(WEBM_TEST_HEIGHT),
)
assertThat(
"Audio track count should match",
meta.audioTrackCount,
- equalTo(1)
+ equalTo(1),
)
assertThat(
"Video track count should match",
meta.videoTrackCount,
- equalTo(1)
+ equalTo(1),
)
} else {
assertThat(
"Fullscreen should be disabled",
enabled,
- equalTo(false)
+ equalTo(false),
)
}
@@ -941,7 +941,7 @@ class MediaSessionTest : BaseSessionTest() {
// 3.
session1.evaluateJS(
- "document.querySelector('video').requestFullscreen()"
+ "document.querySelector('video').requestFullscreen()",
)
sessionRule.waitForResult(completedStep3)
@@ -962,8 +962,8 @@ class MediaSessionTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"media.autoplay.default" to 0,
- "full-screen-api.allow-trusted-requests-only" to false
- )
+ "full-screen-api.allow-trusted-requests-only" to false,
+ ),
)
val path = VIDEO_WEBM_PATH
@@ -977,17 +977,17 @@ class MediaSessionTest : BaseSessionTest() {
session: GeckoSession,
mediaSession: MediaSession,
enabled: Boolean,
- meta: MediaSession.ElementMetadata?
+ meta: MediaSession.ElementMetadata?,
) {
assertThat(
"Fullscreen should be enabled",
enabled,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Element metadata should exist",
meta,
- notNullValue()
+ notNullValue(),
)
resultFullscreen.complete(null)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
index 277d4b14a47efa45811cbfa4314050f9152717c2..9820f90eadfc8656ac5ff7d6d16ebabf059929b1 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
@@ -59,25 +59,25 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoader: TestLoader,
expectedCategory: Int,
expectedError: Int,
- errorPageUrl: String?
+ errorPageUrl: String?,
) {
sessionRule.delegateDuringNextWait(
object : ProgressDelegate, NavigationDelegate, ContentDelegate {
@AssertCalled(count = 1, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"URI should be " + testLoader.getUri(),
request.uri,
- equalTo(testLoader.getUri())
+ equalTo(testLoader.getUri()),
)
assertThat(
"App requested this load",
request.isDirectNavigation,
- equalTo(true)
+ equalTo(true),
)
return null
}
@@ -87,7 +87,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URI should be " + testLoader.getUri(),
url,
- equalTo(testLoader.getUri())
+ equalTo(testLoader.getUri()),
)
}
@@ -95,17 +95,17 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
assertThat(
"Error category should match",
error.category,
- equalTo(expectedCategory)
+ equalTo(expectedCategory),
)
assertThat(
"Error code should match",
error.code,
- equalTo(expectedError)
+ equalTo(expectedError),
)
return GeckoResult.fromValue(errorPageUrl)
}
@@ -114,7 +114,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should fail", success, equalTo(false))
}
- }
+ },
)
mainSession.load(testLoader)
@@ -126,7 +126,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, equalTo(testLoader.getUri()))
}
@@ -142,7 +142,7 @@ class NavigationDelegateTest : BaseSessionTest() {
fun testLoadExpectError(
testUri: String,
expectedCategory: Int,
- expectedError: Int
+ expectedError: Int,
) {
testLoadExpectError(TestLoader().uri(testUri), expectedCategory, expectedError)
}
@@ -150,19 +150,19 @@ class NavigationDelegateTest : BaseSessionTest() {
fun testLoadExpectError(
testLoader: TestLoader,
expectedCategory: Int,
- expectedError: Int
+ expectedError: Int,
) {
testLoadErrorWithErrorPage(
testLoader,
expectedCategory,
expectedError,
- createTestUrl(HELLO_HTML_PATH)
+ createTestUrl(HELLO_HTML_PATH),
)
testLoadErrorWithErrorPage(
testLoader,
expectedCategory,
expectedError,
- null
+ null,
)
}
@@ -170,7 +170,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testUri: String,
expectedCategory: Int,
expectedError: Int,
- errorPageUrl: String?
+ errorPageUrl: String?,
) {
sessionRule.delegateDuringNextWait(
object : ProgressDelegate, NavigationDelegate, ContentDelegate {
@@ -184,17 +184,17 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
assertThat(
"Error category should match",
error.category,
- equalTo(expectedCategory)
+ equalTo(expectedCategory),
)
assertThat(
"Error code should match",
error.code,
- equalTo(expectedError)
+ equalTo(expectedError),
)
return GeckoResult.fromValue(errorPageUrl)
}
@@ -202,7 +202,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(false)
override fun onPageStop(session: GeckoSession, success: Boolean) {
}
- }
+ },
)
mainSession.loadUri(testUri)
@@ -221,7 +221,7 @@ class NavigationDelegateTest : BaseSessionTest() {
fun testLoadEarlyError(
testUri: String,
expectedCategory: Int,
- expectedError: Int
+ expectedError: Int,
) {
testLoadEarlyErrorWithErrorPage(testUri, expectedCategory, expectedError, createTestUrl(HELLO_HTML_PATH))
testLoadEarlyErrorWithErrorPage(testUri, expectedCategory, expectedError, null)
@@ -234,7 +234,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
"file:///test.mozilla",
WebRequestError.ERROR_CATEGORY_URI,
- WebRequestError.ERROR_FILE_NOT_FOUND
+ WebRequestError.ERROR_FILE_NOT_FOUND,
)
val promise = mainSession.evaluatePromiseJS("document.addCertException(false)")
@@ -255,7 +255,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
UNKNOWN_HOST_URI,
WebRequestError.ERROR_CATEGORY_URI,
- WebRequestError.ERROR_UNKNOWN_HOST
+ WebRequestError.ERROR_UNKNOWN_HOST,
)
}
@@ -269,28 +269,28 @@ class NavigationDelegateTest : BaseSessionTest() {
.uri("file:///")
.flags(GeckoSession.LOAD_FLAGS_EXTERNAL),
WebRequestError.ERROR_CATEGORY_UNKNOWN,
- WebRequestError.ERROR_UNKNOWN
+ WebRequestError.ERROR_UNKNOWN,
)
testLoadExpectError(
TestLoader()
.uri("resource://gre/")
.flags(GeckoSession.LOAD_FLAGS_EXTERNAL),
WebRequestError.ERROR_CATEGORY_UNKNOWN,
- WebRequestError.ERROR_UNKNOWN
+ WebRequestError.ERROR_UNKNOWN,
)
testLoadExpectError(
TestLoader()
.uri("about:about")
.flags(GeckoSession.LOAD_FLAGS_EXTERNAL),
WebRequestError.ERROR_CATEGORY_UNKNOWN,
- WebRequestError.ERROR_UNKNOWN
+ WebRequestError.ERROR_UNKNOWN,
)
testLoadExpectError(
TestLoader()
.uri("resource://android/assets/web_extensions/")
.flags(GeckoSession.LOAD_FLAGS_EXTERNAL),
WebRequestError.ERROR_CATEGORY_UNKNOWN,
- WebRequestError.ERROR_UNKNOWN
+ WebRequestError.ERROR_UNKNOWN,
)
}
@@ -298,7 +298,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadEarlyError(
INVALID_URI,
WebRequestError.ERROR_CATEGORY_URI,
- WebRequestError.ERROR_MALFORMED_URI
+ WebRequestError.ERROR_MALFORMED_URI,
)
}
@@ -306,7 +306,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadEarlyError(
"http://localhost:1/",
WebRequestError.ERROR_CATEGORY_NETWORK,
- WebRequestError.ERROR_PORT_BLOCKED
+ WebRequestError.ERROR_PORT_BLOCKED,
)
}
@@ -322,7 +322,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
uri,
WebRequestError.ERROR_CATEGORY_SECURITY,
- WebRequestError.ERROR_SECURITY_BAD_CERT
+ WebRequestError.ERROR_SECURITY_BAD_CERT,
)
mainSession.waitForJS("document.addCertException(false)")
@@ -336,7 +336,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: ProgressDelegate.SecurityInformation
+ securityInfo: ProgressDelegate.SecurityInformation,
) {
assertThat("Should be exception", securityInfo.isException, equalTo(true))
assertThat("Should not be secure", securityInfo.isSecure, equalTo(false))
@@ -347,7 +347,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat("Load should succeed", success, equalTo(true))
sessionRule.removeAllCertOverrides()
}
- }
+ },
)
mainSession.evaluateJS("location.reload()")
mainSession.waitForPageStop()
@@ -361,7 +361,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
UNKNOWN_HOST_URI,
WebRequestError.ERROR_CATEGORY_URI,
- WebRequestError.ERROR_UNKNOWN_HOST
+ WebRequestError.ERROR_UNKNOWN_HOST,
)
mainSession.evaluateJS("document.allowDeprecatedTls = false")
@@ -373,7 +373,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
uri,
WebRequestError.ERROR_CATEGORY_SECURITY,
- WebRequestError.ERROR_SECURITY_SSL
+ WebRequestError.ERROR_SECURITY_SSL,
)
mainSession.delegateDuringNextWait(object : ProgressDelegate, NavigationDelegate {
@@ -455,7 +455,7 @@ class NavigationDelegateTest : BaseSessionTest() {
val privateSession = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.usePrivateMode(true)
- .build()
+ .build(),
)
privateSession.loadUri(secureUri)
@@ -540,7 +540,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("The URLs must match", request.uri, equalTo(forEachCall(uri, httpsUri)))
@@ -552,7 +552,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URI should be " + uri,
url,
- equalTo(uri)
+ equalTo(uri),
)
}
@@ -567,7 +567,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat("URI should match", request.uri, equalTo(forEachCall(iFrameUri, iFrameHttpsUri)))
return GeckoResult.allow()
}
- }
+ },
)
mainSession.load(testLoader)
@@ -600,7 +600,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("The URLs must match", request.uri, equalTo(forEachCall(uri, httpsUri)))
@@ -612,7 +612,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URI should be " + uri,
url,
- equalTo(uri)
+ equalTo(uri),
)
}
@@ -620,12 +620,12 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
assertThat(
"Error code should match",
error.code,
- equalTo(WebRequestError.ERROR_HTTPS_ONLY)
+ equalTo(WebRequestError.ERROR_HTTPS_ONLY),
)
return GeckoResult.fromValue(createTestUrl(HELLO_HTML_PATH))
}
@@ -634,7 +634,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should fail", success, equalTo(false))
}
- }
+ },
)
mainSession.load(testLoader)
@@ -645,7 +645,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, equalTo(httpsUri))
}
@@ -661,7 +661,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2, order = [1, 3])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("The URLs must match", request.uri, equalTo(forEachCall(uri, httpsUri)))
@@ -672,12 +672,12 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
assertThat(
"Error code should match",
error.code,
- equalTo(WebRequestError.ERROR_HTTPS_ONLY)
+ equalTo(WebRequestError.ERROR_HTTPS_ONLY),
)
return GeckoResult.fromValue(null)
}
@@ -686,7 +686,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onPageStop(session: GeckoSession, success: Boolean) {
assertThat("Load should fail", success, equalTo(false))
}
- }
+ },
)
mainSession.load(testLoader)
@@ -697,7 +697,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
// We set http scheme only in case it's not iFrame
@@ -709,11 +709,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
mainSession.waitForJS("document.reloadWithHttpsOnlyException()")
@@ -742,13 +742,13 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"URI should be HTTP then redirected to HTTPS",
request.uri,
- equalTo(forEachCall(http_uri, https_uri))
+ equalTo(forEachCall(http_uri, https_uri)),
)
return null
}
@@ -776,7 +776,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadEarlyError(
UNKNOWN_PROTOCOL_URI,
WebRequestError.ERROR_CATEGORY_URI,
- WebRequestError.ERROR_UNKNOWN_PROTOCOL
+ WebRequestError.ERROR_UNKNOWN_PROTOCOL,
)
}
@@ -799,7 +799,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onSubframeLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("URI should not be null", request.uri, notNullValue())
@@ -823,12 +823,12 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 3)
override fun onContentBlocked(
session: GeckoSession,
- event: ContentBlocking.BlockEvent
+ event: ContentBlocking.BlockEvent,
) {
assertThat(
"Category should be set",
event.antiTrackingCategory,
- equalTo(category)
+ equalTo(category),
)
assertThat("URI should not be null", event.uri, notNullValue())
assertThat("URI should match", event.uri, endsWith("tracker.js"))
@@ -837,7 +837,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(false)
override fun onContentLoaded(session: GeckoSession, event: ContentBlocking.BlockEvent) {
}
- }
+ },
)
mainSession.settings.useTrackingProtection = false
@@ -850,7 +850,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(false)
override fun onContentBlocked(
session: GeckoSession,
- event: ContentBlocking.BlockEvent
+ event: ContentBlocking.BlockEvent,
) {
}
@@ -859,12 +859,12 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Category should be set",
event.antiTrackingCategory,
- equalTo(category)
+ equalTo(category),
)
assertThat("URI should not be null", event.uri, notNullValue())
assertThat("URI should match", event.uri, endsWith("tracker.js"))
}
- }
+ },
)
}
@@ -887,7 +887,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2, order = [1, 2])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
@@ -895,28 +895,28 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URL should match",
request.uri,
- equalTo(forEachCall(request.uri, redirectUri))
+ equalTo(forEachCall(request.uri, redirectUri)),
)
assertThat(
"Trigger URL should be null",
request.triggerUri,
- nullValue()
+ nullValue(),
)
assertThat(
"From app should be correct",
request.isDirectNavigation,
- equalTo(forEachCall(true, false))
+ equalTo(forEachCall(true, false)),
)
assertThat("Target should not be null", request.target, notNullValue())
assertThat(
"Target should match",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT)
+ equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT),
)
assertThat(
"Redirect flag is set",
request.isRedirect,
- equalTo(forEachCall(false, true))
+ equalTo(forEachCall(false, true)),
)
return null
}
@@ -938,7 +938,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
@@ -952,7 +952,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onSubframeLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
@@ -961,7 +961,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"isRedirect should match",
request.isRedirect,
- equalTo(forEachCall(false, true))
+ equalTo(forEachCall(false, true)),
)
return null
}
@@ -985,7 +985,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2, order = [1, 2])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
@@ -993,33 +993,33 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URL should match",
request.uri,
- equalTo(forEachCall(request.uri, redirectUri))
+ equalTo(forEachCall(request.uri, redirectUri)),
)
assertThat(
"Trigger URL should be null",
request.triggerUri,
- nullValue()
+ nullValue(),
)
assertThat(
"From app should be correct",
request.isDirectNavigation,
- equalTo(forEachCall(true, false))
+ equalTo(forEachCall(true, false)),
)
assertThat("Target should not be null", request.target, notNullValue())
assertThat(
"Target should match",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT)
+ equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT),
)
assertThat(
"Redirect flag is set",
request.isRedirect,
- equalTo(forEachCall(false, true))
+ equalTo(forEachCall(false, true)),
)
return forEachCall(GeckoResult.allow(), GeckoResult.deny())
}
- }
+ },
)
mainSession.loadUri(uri)
@@ -1031,7 +1031,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onPageStart(session: GeckoSession, url: String) {
assertThat("URL should match", url, equalTo(uri))
}
- }
+ },
)
}
@@ -1048,14 +1048,14 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2, order = [1, 2])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("URL should match", request.uri, equalTo(forEachCall(uri, redirectUri)))
assertThat(
"From app should be correct",
request.isDirectNavigation,
- equalTo(forEachCall(true, false))
+ equalTo(forEachCall(true, false)),
)
return null
}
@@ -1071,7 +1071,7 @@ class NavigationDelegateTest : BaseSessionTest() {
mainSession.load(
Loader()
.uri(phishingUri + "?bypass=true")
- .flags(GeckoSession.LOAD_FLAGS_BYPASS_CLASSIFIER)
+ .flags(GeckoSession.LOAD_FLAGS_BYPASS_CLASSIFIER),
)
mainSession.waitForPageStop()
@@ -1081,11 +1081,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
}
@@ -1102,7 +1102,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
phishingUri + "?block=true",
WebRequestError.ERROR_CATEGORY_SAFEBROWSING,
- WebRequestError.ERROR_SAFEBROWSING_PHISHING_URI
+ WebRequestError.ERROR_SAFEBROWSING_PHISHING_URI,
)
sessionRule.runtime.settings.contentBlocking.setSafeBrowsing(ContentBlocking.SafeBrowsing.NONE)
@@ -1116,11 +1116,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
}
@@ -1136,7 +1136,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
malwareUri + "?block=true",
WebRequestError.ERROR_CATEGORY_SAFEBROWSING,
- WebRequestError.ERROR_SAFEBROWSING_MALWARE_URI
+ WebRequestError.ERROR_SAFEBROWSING_MALWARE_URI,
)
sessionRule.runtime.settings.contentBlocking.setSafeBrowsing(ContentBlocking.SafeBrowsing.NONE)
@@ -1150,11 +1150,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
}
@@ -1169,7 +1169,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
unwantedUri + "?block=true",
WebRequestError.ERROR_CATEGORY_SAFEBROWSING,
- WebRequestError.ERROR_SAFEBROWSING_UNWANTED_URI
+ WebRequestError.ERROR_SAFEBROWSING_UNWANTED_URI,
)
sessionRule.runtime.settings.contentBlocking.setSafeBrowsing(ContentBlocking.SafeBrowsing.NONE)
@@ -1183,11 +1183,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
}
@@ -1203,7 +1203,7 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoadExpectError(
harmfulUri + "?block=true",
WebRequestError.ERROR_CATEGORY_SAFEBROWSING,
- WebRequestError.ERROR_SAFEBROWSING_HARMFUL_URI
+ WebRequestError.ERROR_SAFEBROWSING_HARMFUL_URI,
)
sessionRule.runtime.settings.contentBlocking.setSafeBrowsing(ContentBlocking.SafeBrowsing.NONE)
@@ -1217,11 +1217,11 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
- }
+ },
)
}
@@ -1232,7 +1232,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Mobile user agent should match the default user agent",
userAgent,
- equalTo(GeckoSession.getDefaultUserAgent())
+ equalTo(GeckoSession.getDefaultUserAgent()),
)
}
@@ -1246,14 +1246,14 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be set to mobile",
getUserAgent(),
- containsString(mobileSubStr)
+ containsString(mobileSubStr),
)
var userAgent = sessionRule.waitForResult(mainSession.userAgent)
assertThat(
"User agent should be reported as mobile",
userAgent,
- containsString(mobileSubStr)
+ containsString(mobileSubStr),
)
mainSession.settings.userAgentMode = GeckoSessionSettings.USER_AGENT_MODE_DESKTOP
@@ -1264,14 +1264,14 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be set to desktop",
getUserAgent(),
- containsString(desktopSubStr)
+ containsString(desktopSubStr),
)
userAgent = sessionRule.waitForResult(mainSession.userAgent)
assertThat(
"User agent should be reported as desktop",
userAgent,
- containsString(desktopSubStr)
+ containsString(desktopSubStr),
)
mainSession.settings.userAgentMode = GeckoSessionSettings.USER_AGENT_MODE_MOBILE
@@ -1282,14 +1282,14 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be set to mobile",
getUserAgent(),
- containsString(mobileSubStr)
+ containsString(mobileSubStr),
)
userAgent = sessionRule.waitForResult(mainSession.userAgent)
assertThat(
"User agent should be reported as mobile",
userAgent,
- containsString(mobileSubStr)
+ containsString(mobileSubStr),
)
val vrSubStr = "Mobile VR"
@@ -1301,14 +1301,14 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be set to VR",
getUserAgent(),
- containsString(vrSubStr)
+ containsString(vrSubStr),
)
userAgent = sessionRule.waitForResult(mainSession.userAgent)
assertThat(
"User agent should be reported as VR",
userAgent,
- containsString(vrSubStr)
+ containsString(vrSubStr),
)
}
@@ -1327,7 +1327,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should match override",
getUserAgent(newSession),
- equalTo("Test user agent override")
+ equalTo("Test user agent override"),
)
}
@@ -1342,7 +1342,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be reported as mobile",
getUserAgent(),
- containsString(mobileSubStr)
+ containsString(mobileSubStr),
)
mainSession.settings.userAgentOverride = overrideUserAgent
@@ -1353,7 +1353,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be reported as override",
getUserAgent(),
- equalTo(overrideUserAgent)
+ equalTo(overrideUserAgent),
)
mainSession.settings.userAgentMode = GeckoSessionSettings.USER_AGENT_MODE_VR
@@ -1364,7 +1364,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should still be reported as override even when USER_AGENT_MODE is set",
getUserAgent(),
- equalTo(overrideUserAgent)
+ equalTo(overrideUserAgent),
)
mainSession.settings.userAgentOverride = null
@@ -1375,7 +1375,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should now be reported as VR",
getUserAgent(),
- containsString(vrSubStr)
+ containsString(vrSubStr),
)
sessionRule.delegateDuringNextWait(object : NavigationDelegate {
@@ -1391,7 +1391,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should be reported as override after being set in onLoadRequest",
getUserAgent(),
- equalTo(overrideUserAgent)
+ equalTo(overrideUserAgent),
)
sessionRule.delegateDuringNextWait(object : NavigationDelegate {
@@ -1407,7 +1407,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"User agent should again be reported as VR after disabling override in onLoadRequest",
getUserAgent(),
- containsString(vrSubStr)
+ containsString(vrSubStr),
)
}
@@ -1427,7 +1427,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"innerWidth should be equal to $mobileInnerWidth",
innerWidth,
- closeTo(mobileInnerWidth, 0.1)
+ closeTo(mobileInnerWidth, 0.1),
)
mainSession.settings.viewportMode = GeckoSessionSettings.VIEWPORT_MODE_DESKTOP
@@ -1439,7 +1439,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"innerWidth should be equal to $desktopInnerWidth",
innerWidth,
- closeTo(desktopInnerWidth, 0.1)
+ closeTo(desktopInnerWidth, 0.1),
)
mainSession.loadTestPath(HELLO_HTML_PATH)
@@ -1449,7 +1449,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"after navigation innerWidth should be equal to $desktopInnerWidth",
innerWidth,
- closeTo(desktopInnerWidth, 0.1)
+ closeTo(desktopInnerWidth, 0.1),
)
mainSession.loadTestPath(VIEWPORT_PATH)
@@ -1459,7 +1459,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"after navigting back innerWidth should be equal to $desktopInnerWidth",
innerWidth,
- closeTo(desktopInnerWidth, 0.1)
+ closeTo(desktopInnerWidth, 0.1),
)
mainSession.settings.viewportMode = GeckoSessionSettings.VIEWPORT_MODE_MOBILE
@@ -1471,7 +1471,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"innerWidth should be equal to $mobileInnerWidth again",
innerWidth,
- closeTo(mobileInnerWidth, 0.1)
+ closeTo(mobileInnerWidth, 0.1),
)
}
@@ -1483,7 +1483,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
@@ -1492,18 +1492,18 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Trigger URL should be null",
request.triggerUri,
- nullValue()
+ nullValue(),
)
assertThat(
"App requested this load",
request.isDirectNavigation,
- equalTo(true)
+ equalTo(true),
)
assertThat("Target should not be null", request.target, notNullValue())
assertThat(
"Target should match",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT)
+ equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT),
)
assertThat("Redirect flag is not set", request.isRedirect, equalTo(false))
assertThat("Should not have a user gesture", request.hasUserGesture, equalTo(false))
@@ -1514,7 +1514,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("Session should not be null", session, notNullValue())
assertThat("URL should not be null", url, notNullValue())
@@ -1550,7 +1550,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match the provided data URL", url, equalTo(dataUrl))
}
@@ -1582,7 +1582,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
onLocationCount++
}
@@ -1593,7 +1593,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Should get callback for first load",
onLocationCount,
- equalTo(1)
+ equalTo(1),
)
mainSession.reload()
@@ -1603,7 +1603,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Should not get callback for second load",
onLocationCount,
- equalTo(1)
+ equalTo(1),
)
}
@@ -1623,12 +1623,12 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat(
"URL should be a data URL",
url,
- equalTo(createDataUri(dataString, mimeType))
+ equalTo(createDataUri(dataString, mimeType)),
)
}
@@ -1648,7 +1648,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should be a data URL", url, startsWith("data:"))
}
@@ -1677,7 +1677,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, equalTo(createDataUri(bytes, "text/html")))
}
@@ -1691,19 +1691,19 @@ class NavigationDelegateTest : BaseSessionTest() {
private fun createDataUri(
data: String,
- mimeType: String?
+ mimeType: String?,
): String {
return String.format("data:%s,%s", mimeType ?: "", data)
}
private fun createDataUri(
bytes: ByteArray,
- mimeType: String?
+ mimeType: String?,
): String {
return String.format(
"data:%s;base64,%s",
mimeType ?: "",
- Base64.encodeToString(bytes, Base64.NO_WRAP)
+ Base64.encodeToString(bytes, Base64.NO_WRAP),
)
}
@@ -1719,7 +1719,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, equalTo(createDataUri(bytes, mimeType)))
}
@@ -1750,24 +1750,24 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("URI should match", request.uri, endsWith(HELLO_HTML_PATH))
assertThat(
"Trigger URL should be null",
request.triggerUri,
- nullValue()
+ nullValue(),
)
assertThat(
"Target should match",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT)
+ equalTo(NavigationDelegate.TARGET_WINDOW_CURRENT),
)
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -1776,7 +1776,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@@ -1810,7 +1810,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, endsWith(HELLO2_HTML_PATH))
}
@@ -1823,13 +1823,13 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 0, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -1838,7 +1838,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
@@ -1866,13 +1866,13 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 0, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -1881,7 +1881,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, endsWith(HELLO2_HTML_PATH))
}
@@ -1908,7 +1908,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
if (request.uri.endsWith(HELLO_HTML_PATH)) {
@@ -1949,24 +1949,24 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("URI should be correct", request.uri, endsWith(NEW_SESSION_CHILD_HTML_PATH))
assertThat(
"Trigger URL should match",
request.triggerUri,
- endsWith(NEW_SESSION_HTML_PATH)
+ endsWith(NEW_SESSION_HTML_PATH),
)
assertThat(
"Target should be correct",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_NEW)
+ equalTo(NavigationDelegate.TARGET_WINDOW_NEW),
)
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -2005,19 +2005,19 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat("URI should be correct", request.uri, endsWith(NEW_SESSION_CHILD_HTML_PATH))
assertThat(
"Trigger URL should be null",
request.triggerUri,
- endsWith(NEW_SESSION_HTML_PATH)
+ endsWith(NEW_SESSION_HTML_PATH),
)
assertThat(
"Target should be correct",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_NEW)
+ equalTo(NavigationDelegate.TARGET_WINDOW_NEW),
)
return null
}
@@ -2084,7 +2084,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"window.opener should be set",
newSession.evaluateJS("window.opener.location.pathname") as String,
- equalTo(NEW_SESSION_HTML_PATH)
+ equalTo(NEW_SESSION_HTML_PATH),
)
}
@@ -2102,7 +2102,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"window.opener should not be set",
newSession.evaluateJS("window.opener"),
- equalTo(JSONObject.NULL)
+ equalTo(JSONObject.NULL),
)
}
@@ -2116,7 +2116,7 @@ class NavigationDelegateTest : BaseSessionTest() {
mainSession.delegateDuringNextWait(object : NavigationDelegate {
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
// Pretend we handled the target="_blank" link click.
@@ -2138,18 +2138,18 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"URI must match",
request.uri,
- endsWith(forEachCall(NEW_SESSION_CHILD_HTML_PATH, NEW_SESSION_HTML_PATH))
+ endsWith(forEachCall(NEW_SESSION_CHILD_HTML_PATH, NEW_SESSION_HTML_PATH)),
)
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -2168,11 +2168,11 @@ class NavigationDelegateTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
document.querySelector('input[type=text]').focus()
- """
+ """,
)
mainSession.waitUntilCalled(
TextInputDelegate::class,
- "restartInput"
+ "restartInput",
)
val time = SystemClock.uptimeMillis()
@@ -2182,8 +2182,8 @@ class NavigationDelegateTest : BaseSessionTest() {
KeyEvent.KEYCODE_ENTER,
KeyEvent.changeAction(
keyEvent,
- KeyEvent.ACTION_UP
- )
+ KeyEvent.ACTION_UP,
+ ),
)
mainSession.waitUntilCalled(object : NavigationDelegate {
@@ -2193,17 +2193,17 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"URL should be correct",
request.uri,
- endsWith("form_blank.html?")
+ endsWith("form_blank.html?"),
)
assertThat(
"Trigger URL should match",
request.triggerUri,
- endsWith("form_blank.html")
+ endsWith("form_blank.html"),
)
assertThat(
"Target should be correct",
request.target,
- equalTo(NavigationDelegate.TARGET_WINDOW_NEW)
+ equalTo(NavigationDelegate.TARGET_WINDOW_NEW),
)
return null
}
@@ -2225,14 +2225,14 @@ class NavigationDelegateTest : BaseSessionTest() {
Loader()
.uri(uri)
.referrer(referrer)
- .flags(GeckoSession.LOAD_FLAGS_NONE)
+ .flags(GeckoSession.LOAD_FLAGS_NONE),
)
mainSession.waitForPageStop()
assertThat(
"Referrer should match",
mainSession.evaluateJS("document.referrer") as String,
- equalTo(referrer)
+ equalTo(referrer),
)
}
@@ -2248,14 +2248,14 @@ class NavigationDelegateTest : BaseSessionTest() {
Loader()
.uri(uri)
.referrer(mainSession)
- .flags(GeckoSession.LOAD_FLAGS_NONE)
+ .flags(GeckoSession.LOAD_FLAGS_NONE),
)
newSession.waitForPageStop()
assertThat(
"Referrer should match",
newSession.evaluateJS("document.referrer") as String,
- equalTo(referrer)
+ equalTo(referrer),
)
}
@@ -2271,7 +2271,7 @@ class NavigationDelegateTest : BaseSessionTest() {
Loader()
.uri(uri)
.referrer(mainSession)
- .flags(GeckoSession.LOAD_FLAGS_NONE)
+ .flags(GeckoSession.LOAD_FLAGS_NONE),
)
newSession.waitUntilCalled(object : NavigationDelegate {
@AssertCalled
@@ -2284,7 +2284,7 @@ class NavigationDelegateTest : BaseSessionTest() {
private fun loadUriHeaderTest(
headers: Map<String?, String?>,
additional: Map<String?, String?>,
- filter: Int = GeckoSession.HEADER_FILTER_CORS_SAFELISTED
+ filter: Int = GeckoSession.HEADER_FILTER_CORS_SAFELISTED,
) {
// First collect default headers with no override
mainSession.loadUri("$TEST_ENDPOINT/anything")
@@ -2308,7 +2308,7 @@ class NavigationDelegateTest : BaseSessionTest() {
Loader()
.uri("$TEST_ENDPOINT/anything")
.additionalHeaders(headers)
- .headerFilter(filter)
+ .headerFilter(filter),
)
mainSession.waitForPageStop()
@@ -2319,7 +2319,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Headers should match",
expected as Map<String?, String?>,
- equalTo(actualHeaders)
+ equalTo(actualHeaders),
)
}
@@ -2328,7 +2328,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"HashCode test",
a.hashCode() == b.hashCode(),
- equalTo(shouldBeEqual)
+ equalTo(shouldBeEqual),
)
}
@@ -2336,12 +2336,12 @@ class NavigationDelegateTest : BaseSessionTest() {
testLoaderEquals(
Loader().uri("http://test-uri-equals.com"),
Loader().uri("http://test-uri-equals.com"),
- true
+ true,
)
testLoaderEquals(
Loader().uri("http://test-uri-equals.com"),
Loader().uri("http://test-uri-equalsx.com"),
- false
+ false,
)
testLoaderEquals(
@@ -2353,7 +2353,7 @@ class NavigationDelegateTest : BaseSessionTest() {
.flags(GeckoSession.LOAD_FLAGS_BYPASS_CLASSIFIER)
.headerFilter(GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE)
.referrer("test-referrer"),
- true
+ true,
)
testLoaderEquals(
Loader().uri("http://test-uri-equals.com")
@@ -2364,7 +2364,7 @@ class NavigationDelegateTest : BaseSessionTest() {
.flags(GeckoSession.LOAD_FLAGS_BYPASS_CLASSIFIER)
.headerFilter(GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE)
.referrer("test-referrer"),
- false
+ false,
)
testLoaderEquals(
@@ -2372,14 +2372,14 @@ class NavigationDelegateTest : BaseSessionTest() {
.data("testtest", "text/plain"),
Loader().referrer(mainSession)
.data("testtest", "text/plain"),
- true
+ true,
)
testLoaderEquals(
Loader().referrer(mainSession)
.data("testtest", "text/plain"),
Loader().referrer("test-referrer")
.data("testtest", "text/plain"),
- false
+ false,
)
}
@@ -2387,18 +2387,18 @@ class NavigationDelegateTest : BaseSessionTest() {
// Basic test
loadUriHeaderTest(
mapOf("Header1" to "Value", "Header2" to "Value1, Value2"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("Header1" to "Value", "Header2" to "Value1, Value2"),
mapOf("Header1" to "Value", "Header2" to "Value1, Value2"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
// Empty value headers are ignored
loadUriHeaderTest(
mapOf("ValueLess1" to "", "ValueLess2" to null),
- mapOf()
+ mapOf(),
)
// Null key or special headers are ignored
@@ -2406,9 +2406,9 @@ class NavigationDelegateTest : BaseSessionTest() {
mapOf(
null to "BadNull",
"Connection" to "BadConnection",
- "Host" to "BadHost"
+ "Host" to "BadHost",
),
- mapOf()
+ mapOf(),
)
// Key or value cannot contain '\r\n'
@@ -2419,9 +2419,9 @@ class NavigationDelegateTest : BaseSessionTest() {
"this\r\nis invalid" to "test value",
"test key" to "this\r\n is a no-no",
"what" to "what\r\nhost:amazon.com",
- "Header3" to "Value1, Value2, Value3"
+ "Header3" to "Value1, Value2, Value3",
),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf(
@@ -2430,83 +2430,83 @@ class NavigationDelegateTest : BaseSessionTest() {
"this\r\nis invalid" to "test value",
"test key" to "this\r\n is a no-no",
"what" to "what\r\nhost:amazon.com",
- "Header3" to "Value1, Value2, Value3"
+ "Header3" to "Value1, Value2, Value3",
),
mapOf(
"Header1" to "Value",
"Header2" to "Value1, Value2",
- "Header3" to "Value1, Value2, Value3"
+ "Header3" to "Value1, Value2, Value3",
),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
loadUriHeaderTest(
mapOf(
"Header1" to "Value",
"Header2" to "Value1, Value2",
- "what" to "what\r\nhost:amazon.com"
+ "what" to "what\r\nhost:amazon.com",
),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf(
"Header1" to "Value",
"Header2" to "Value1, Value2",
- "what" to "what\r\nhost:amazon.com"
+ "what" to "what\r\nhost:amazon.com",
),
mapOf("Header1" to "Value", "Header2" to "Value1, Value2"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
loadUriHeaderTest(
mapOf("what" to "what\r\nhost:amazon.com"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("this\r\n" to "yes"),
- mapOf()
+ mapOf(),
)
// Connection and Host cannot be overriden, no matter the case spelling
loadUriHeaderTest(
mapOf("Header1" to "Value1", "ConnEction" to "test", "connection" to "test2"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("Header1" to "Value1", "ConnEction" to "test", "connection" to "test2"),
mapOf("Header1" to "Value1"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
loadUriHeaderTest(
mapOf("Header1" to "Value1", "connection" to "test2"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("Header1" to "Value1", "connection" to "test2"),
mapOf("Header1" to "Value1"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
loadUriHeaderTest(
mapOf("Header1 " to "Value1", "host" to "test2"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("Header1 " to "Value1", "host" to "test2"),
mapOf("Header1" to "Value1"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
loadUriHeaderTest(
mapOf("Header1" to "Value1", "host" to "test2"),
- mapOf()
+ mapOf(),
)
loadUriHeaderTest(
mapOf("Header1" to "Value1", "host" to "test2"),
mapOf("Header1" to "Value1"),
- GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE
+ GeckoSession.HEADER_FILTER_UNRESTRICTED_UNSAFE,
)
// Adding white space at the end of a forbidden header still prevents override
@@ -2515,15 +2515,15 @@ class NavigationDelegateTest : BaseSessionTest() {
"host" to "amazon.com",
"host " to "amazon.com",
"host\r" to "amazon.com",
- "host\r\n" to "amazon.com"
+ "host\r\n" to "amazon.com",
),
- mapOf()
+ mapOf(),
)
// '\r' or '\n' are forbidden character even when not following each other
loadUriHeaderTest(
mapOf("abc\ra\n" to "amazon.com"),
- mapOf()
+ mapOf(),
)
// CORS Safelist test
@@ -2532,15 +2532,15 @@ class NavigationDelegateTest : BaseSessionTest() {
"Accept-Language" to "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
"Accept" to "text/html",
"Content-Language" to "de-DE, en-CA",
- "Content-Type" to "multipart/form-data; boundary=something"
+ "Content-Type" to "multipart/form-data; boundary=something",
),
mapOf(
"Accept-Language" to "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
"Accept" to "text/html",
"Content-Language" to "de-DE, en-CA",
- "Content-Type" to "multipart/form-data; boundary=something"
+ "Content-Type" to "multipart/form-data; boundary=something",
),
- GeckoSession.HEADER_FILTER_CORS_SAFELISTED
+ GeckoSession.HEADER_FILTER_CORS_SAFELISTED,
)
// CORS safelist doesn't allow Content-type image/svg
@@ -2549,14 +2549,14 @@ class NavigationDelegateTest : BaseSessionTest() {
"Accept-Language" to "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
"Accept" to "text/html",
"Content-Language" to "de-DE, en-CA",
- "Content-Type" to "image/svg; boundary=something"
+ "Content-Type" to "image/svg; boundary=something",
),
mapOf(
"Accept-Language" to "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
"Accept" to "text/html",
- "Content-Language" to "de-DE, en-CA"
+ "Content-Language" to "de-DE, en-CA",
),
- GeckoSession.HEADER_FILTER_CORS_SAFELISTED
+ GeckoSession.HEADER_FILTER_CORS_SAFELISTED,
)
}
@@ -2579,7 +2579,7 @@ class NavigationDelegateTest : BaseSessionTest() {
mainSession.waitUntilCalled(
NavigationDelegate::class,
- "onNewSession"
+ "onNewSession",
)
UiThreadUtils.loopUntilIdle(sessionRule.env.defaultTimeoutMillis)
}
@@ -2590,8 +2590,8 @@ class NavigationDelegateTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
val controller = sessionRule.runtime.webExtensionController
@@ -2604,13 +2604,13 @@ class NavigationDelegateTest : BaseSessionTest() {
})
val extension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/page-history.xpi")
+ controller.install("https://example.org/tests/junit/page-history.xpi"),
)
assertThat(
"baseUrl should be a valid extension URL",
extension.metaData.baseUrl,
- startsWith("moz-extension://")
+ startsWith("moz-extension://"),
)
val url = extension.metaData.baseUrl + "page.html"
@@ -2634,7 +2634,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
currentUrl = url
}
@@ -2652,7 +2652,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"docShell should start out active",
mainSession.active,
- equalTo(true)
+ equalTo(true),
)
// This loads in the parent process
@@ -2669,7 +2669,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"docShell should be active after switching process",
mainSession.active,
- equalTo(true)
+ equalTo(true),
)
mainSession.loadUri(url)
@@ -2684,7 +2684,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"docShell should be active after switching process",
mainSession.active,
- equalTo(true)
+ equalTo(true),
)
mainSession.goBack()
@@ -2699,7 +2699,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"docShell should be active after switching process",
mainSession.active,
- equalTo(true)
+ equalTo(true),
)
settings.aboutConfigEnabled = aboutConfigEnabled
@@ -2715,13 +2715,13 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 0)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return null
}
@@ -2730,7 +2730,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URI should match", url, endsWith("#test1"))
}
@@ -2742,7 +2742,7 @@ class NavigationDelegateTest : BaseSessionTest() {
@AssertCalled(count = 0)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
):
GeckoResult<AllowOrDeny>? {
return null
@@ -2752,7 +2752,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URI should match", url, endsWith("#test2"))
}
@@ -2837,7 +2837,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"Load should not be direct",
request.isDirectNavigation,
- equalTo(false)
+ equalTo(false),
)
return GeckoResult.allow()
}
@@ -2875,17 +2875,17 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
assertThat(
"Error category should match",
error.category,
- equalTo(WebRequestError.ERROR_CATEGORY_URI)
+ equalTo(WebRequestError.ERROR_CATEGORY_URI),
)
assertThat(
"Error code should match",
error.code,
- equalTo(WebRequestError.ERROR_DATA_URI_TOO_LONG)
+ equalTo(WebRequestError.ERROR_DATA_URI_TOO_LONG),
)
assertThat("URLs should match", uri, equalTo(expectedUri))
return null
@@ -2924,7 +2924,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"We should not have a looper.",
Looper.myLooper(),
- equalTo(null)
+ equalTo(null),
)
mainSession.loadTestPath(HELLO_HTML_PATH)
}
@@ -2946,12 +2946,12 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"error should match",
error.code,
- equalTo(WebRequestError.ERROR_MALFORMED_URI)
+ equalTo(WebRequestError.ERROR_MALFORMED_URI),
)
assertThat(
"error should match",
error.category,
- equalTo(WebRequestError.ERROR_CATEGORY_URI)
+ equalTo(WebRequestError.ERROR_CATEGORY_URI),
)
return null
}
@@ -2971,7 +2971,7 @@ class NavigationDelegateTest : BaseSessionTest() {
assertThat(
"We should not have a looper.",
Looper.myLooper(),
- equalTo(null)
+ equalTo(null),
)
mainSession.loadTestPath(HELLO_HTML_PATH)
}
@@ -2995,7 +2995,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
@@ -3022,7 +3022,7 @@ class NavigationDelegateTest : BaseSessionTest() {
ThreadLocalRandom.current().ints(width.toLong() * height.toLong()).toArray(),
width,
height,
- Bitmap.Config.ARGB_8888
+ Bitmap.Config.ARGB_8888,
)
val stream = ByteArrayOutputStream()
@@ -3053,7 +3053,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadError(
session: GeckoSession,
uri: String?,
- error: WebRequestError
+ error: WebRequestError,
): GeckoResult<String>? {
return null
}
@@ -3077,7 +3077,7 @@ class NavigationDelegateTest : BaseSessionTest() {
mainSession.load(
Loader()
.uri(testUri)
- .flags(GeckoSession.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE)
+ .flags(GeckoSession.LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE),
)
mainSession.waitForPageStop()
@@ -3087,7 +3087,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLoadRequest(session: GeckoSession, request: LoadRequest): GeckoResult<AllowOrDeny>? {
return null
}
- }
+ },
)
}
@@ -3136,7 +3136,7 @@ class NavigationDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<PermissionDelegate.ContentPermission>
+ perms: MutableList<PermissionDelegate.ContentPermission>,
) {
assertThat("URL should match", url, endsWith(HELLO_HTML_PATH))
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NimbusTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NimbusTest.kt
index 87df632967dacce4dccb461f5c1eda546d2c0a32..4fdac68d9351637ca3272a5d84c3a8486d7ed0dc 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NimbusTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NimbusTest.kt
@@ -26,7 +26,7 @@ class NimbusTest : BaseSessionTest() {
assertThat(
"Feature id should match",
featureId,
- equalTo("pdfjs")
+ equalTo("pdfjs"),
)
return null
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt
index 73319dc01987dfc989c26add269bf1e87e178cd2..335535bbb4dd7e28a7afba06774e495dc2f5a2e7 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt
@@ -42,7 +42,7 @@ class OpenWindowTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val notificationResult = GeckoResult<Void>()
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
index c19459a4c7d2c2fde83ca04e4f75181aed6e1794..26ff3656599e849b155fed0232fc6091590c8d3b 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
@@ -57,7 +57,7 @@ class OrientationDelegateTest : BaseSessionTest() {
assertThat(
"The orientation should be portrait",
aOrientation,
- equalTo(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+ equalTo(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
)
activityRule.scenario.onActivity { activity ->
activity.requestedOrientation = aOrientation
@@ -79,7 +79,7 @@ class OrientationDelegateTest : BaseSessionTest() {
assertThat(
"The orientation should be landscape",
aOrientation,
- equalTo(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
+ equalTo(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
)
activityRule.scenario.onActivity { activity ->
activity.requestedOrientation = aOrientation
@@ -140,7 +140,7 @@ class OrientationDelegateTest : BaseSessionTest() {
}
}, { once: true });
})
- """.trimIndent()
+ """.trimIndent(),
)
// Lock to landscape twice to verify successful locking to existing orientation
@@ -170,7 +170,7 @@ class OrientationDelegateTest : BaseSessionTest() {
assertThat(
"The orientation value is as expected",
aOrientation,
- equalTo(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
+ equalTo(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
)
activityRule.scenario.onActivity { activity ->
activity.requestedOrientation = aOrientation
@@ -206,13 +206,13 @@ class OrientationDelegateTest : BaseSessionTest() {
.then(() => r("successful"))
.catch(e => r(e.name))
})
- """.trimIndent()
+ """.trimIndent(),
)
assertThat(
"The operation must throw NotSupportedError",
promise.value,
- equalTo("NotSupportedError")
+ equalTo("NotSupportedError"),
)
val promise2 = mainSession.evaluatePromiseJS(
@@ -222,13 +222,13 @@ class OrientationDelegateTest : BaseSessionTest() {
.then(() => r("successful"))
.catch(e => r(e.name))
})
- """.trimIndent()
+ """.trimIndent(),
)
assertThat(
"The operation must throw NotSupportedError even if same orientation",
promise2.value,
- equalTo("NotSupportedError")
+ equalTo("NotSupportedError"),
)
}
@@ -280,7 +280,7 @@ class OrientationDelegateTest : BaseSessionTest() {
}
}, { once: true });
})
- """.trimIndent()
+ """.trimIndent(),
)
activityRule.scenario.onActivity { activity ->
@@ -295,7 +295,7 @@ class OrientationDelegateTest : BaseSessionTest() {
assertThat(
"The orientation should be portrait",
aOrientation,
- equalTo(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+ equalTo(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
)
activityRule.scenario.onActivity { activity ->
activity.requestedOrientation = aOrientation
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt
index c6749f3396e4bc6994fe2df9e402ffaf27a9ddb8..e40d04755819bb666bc58ad9a55cf0247a221bc2 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt
@@ -46,7 +46,7 @@ class PanZoomControllerTest : BaseSessionTest() {
}
window.requestAnimationFrame(step);
});
- """.trimIndent()
+ """.trimIndent(),
)
}
@@ -181,7 +181,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"Visual viewport height equals to window.innerHeight",
originalVH.roundToInt(),
- equalTo(innerHeight.roundToInt())
+ equalTo(innerHeight.roundToInt()),
)
val originalScale = mainSession.evaluateJS("visualViewport.scale") as Double
@@ -251,7 +251,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
x,
y,
- 0
+ 0,
)
val result = mainSession.panZoomController.onTouchEventForDetailResult(down)
@@ -262,7 +262,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_UP,
x,
y,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(up)
@@ -330,7 +330,7 @@ class PanZoomControllerTest : BaseSessionTest() {
}
window.requestAnimationFrame(step);
});
- """.trimIndent()
+ """.trimIndent(),
)
}
@@ -343,7 +343,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be UNHANDLED in root_100_percent.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_UNHANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_UNHANDLED),
)
// There is a 100% height iframe which is not scrollable.
@@ -354,7 +354,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be UNHANDLED in iframe_100_percent_height_no_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_UNHANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_UNHANDLED),
)
// There is a 100% height iframe which is scrollable.
@@ -364,7 +364,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT in iframe_100_percent_height_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
// Scroll to the bottom of the iframe
@@ -376,7 +376,7 @@ class PanZoomControllerTest : BaseSessionTest() {
top: iframe.contentWindow.scrollMaxY,
behavior: 'instant'
});
- """.trimIndent()
+ """.trimIndent(),
)
waitForScroll(scrollWaitTimeout)
mainSession.flushApzRepaints()
@@ -386,7 +386,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT in iframe_100_percent_height_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
// The content height is greater than "screen height - the dynamic toolbar height".
@@ -395,7 +395,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED in root_98vh.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
// The content height is equal to "screen height".
@@ -404,7 +404,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED in root_100vh.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
// There is a 98vh iframe which is not scrollable.
@@ -414,7 +414,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED in iframe_98vh_no_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
// There is a 98vh iframe which is scrollable.
@@ -424,7 +424,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT initially in iframe_98vh_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
// Scroll to the bottom of the iframe
@@ -436,7 +436,7 @@ class PanZoomControllerTest : BaseSessionTest() {
top: iframe.contentWindow.scrollMaxY,
behavior: 'instant'
});
- """.trimIndent()
+ """.trimIndent(),
)
waitForScroll(scrollWaitTimeout)
mainSession.flushApzRepaints()
@@ -446,7 +446,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED in iframe_98vh_scrollable.html",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
}
@@ -480,7 +480,7 @@ class PanZoomControllerTest : BaseSessionTest() {
IFRAME_100_PERCENT_HEIGHT_NO_SCROLLABLE_HTML_PATH,
IFRAME_100_PERCENT_HEIGHT_SCROLLABLE_HTML_PATH,
IFRAME_98VH_SCROLLABLE_HTML_PATH,
- IFRAME_98VH_NO_SCROLLABLE_HTML_PATH
+ IFRAME_98VH_NO_SCROLLABLE_HTML_PATH,
)
for (file in files) {
setupDocument(file + "?event-prevent")
@@ -488,7 +488,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT in " + file,
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
// Scroll to the bottom edge if it's possible.
@@ -501,7 +501,7 @@ class PanZoomControllerTest : BaseSessionTest() {
top: targetWindow.scrollMaxY,
behavior: 'instant'
});
- """.trimIndent()
+ """.trimIndent(),
)
waitForScroll(scrollWaitTimeout)
mainSession.flushApzRepaints()
@@ -510,7 +510,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT in " + file,
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
}
}
@@ -524,7 +524,7 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The input result should be HANDLED_CONTENT",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED_CONTENT),
)
}
@@ -536,7 +536,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_DOWN,
50f,
90f,
- 0
+ 0,
)
val result = mainSession.panZoomController.onTouchEventForDetailResult(down)
@@ -547,7 +547,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_MOVE,
50f,
70f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(move)
move = MotionEvent.obtain(
@@ -556,7 +556,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_MOVE,
50f,
30f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(move)
@@ -566,7 +566,7 @@ class PanZoomControllerTest : BaseSessionTest() {
MotionEvent.ACTION_UP,
50f,
10f,
- 0
+ 0,
)
mainSession.panZoomController.onTouchEvent(up)
return result
@@ -590,14 +590,14 @@ class PanZoomControllerTest : BaseSessionTest() {
assertThat(
"The initial input result should be HANDLED",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
// Trigger the next fling during the initial scrolling.
value = sessionRule.waitForResult(fling())
assertThat(
"The input result should be IGNORED during the fast fling",
value,
- equalTo(PanZoomController.INPUT_RESULT_HANDLED)
+ equalTo(PanZoomController.INPUT_RESULT_HANDLED),
)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfSaveTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfSaveTest.kt
index 25a4e5b949188c75d8f9fde3d505f59acb9f456d..5dfcfb26dd830f1b14fb5740173d9f45e17c412f 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfSaveTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfSaveTest.kt
@@ -38,7 +38,7 @@ class PdfSaveTest : BaseSessionTest() {
filename,
url,
/* skipConfirmation = */ true,
- /* requestExternalApp = */ false
+ /* requestExternalApp = */ false,
)!!
assertThat("Uri", response.uri, equalTo("http://example.com/foobar.pdf"))
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PermissionDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PermissionDelegateTest.kt
index a1f2532014c9db042579422a15674fa29c2d0ec4..9ab2d2515f1742e2933e57b706cdd3fdb6ad9859 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PermissionDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PermissionDelegateTest.kt
@@ -61,20 +61,20 @@ class PermissionDelegateTest : BaseSessionTest() {
assertInAutomationThat(
"Should have camera permission",
hasPermission(Manifest.permission.CAMERA),
- equalTo(true)
+ equalTo(true),
)
assertInAutomationThat(
"Should have microphone permission",
hasPermission(Manifest.permission.RECORD_AUDIO),
- equalTo(true)
+ equalTo(true),
)
mainSession.loadTestPath(HELLO_HTML_PATH)
mainSession.waitForPageStop()
val devices = mainSession.evaluateJS(
- "window.navigator.mediaDevices.enumerateDevices()"
+ "window.navigator.mediaDevices.enumerateDevices()",
) as JSONArray
var hasVideo = false
@@ -91,12 +91,12 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Device list should contain camera device",
hasVideo,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Device list should contain microphone device",
hasAudio,
- equalTo(true)
+ equalTo(true),
)
mainSession.delegateDuringNextWait(object : PermissionDelegate {
@@ -106,7 +106,7 @@ class PermissionDelegateTest : BaseSessionTest() {
uri: String,
video: Array<out MediaSource>?,
audio: Array<out MediaSource>?,
- callback: MediaCallback
+ callback: MediaCallback,
) {
assertThat("URI should match", uri, endsWith(HELLO_HTML_PATH))
assertThat("Video source should be valid", video, not(emptyArray()))
@@ -143,7 +143,7 @@ class PermissionDelegateTest : BaseSessionTest() {
stream.getTracks().forEach(track => track.stop());
return true;
})
- """.trimMargin()
+ """.trimMargin(),
) as Boolean
assertThat("Stream should be active and id should not be empty.", isActive, equalTo(true))
@@ -156,7 +156,7 @@ class PermissionDelegateTest : BaseSessionTest() {
uri: String,
video: Array<out MediaSource>?,
audio: Array<out MediaSource>?,
- callback: MediaCallback
+ callback: MediaCallback,
) {
callback.reject()
}
@@ -166,12 +166,12 @@ class PermissionDelegateTest : BaseSessionTest() {
if (isEmulator()) {
mainSession.waitForJS(
"""
- window.navigator.mediaDevices.getUserMedia({ video: true })"""
+ window.navigator.mediaDevices.getUserMedia({ video: true })""",
)
} else {
mainSession.waitForJS(
"""
- window.navigator.mediaDevices.getUserMedia({ audio: true, video: true })"""
+ window.navigator.mediaDevices.getUserMedia({ audio: true, video: true })""",
)
}
fail("Request should have failed")
@@ -179,7 +179,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("NotAllowedError")
+ containsString("NotAllowedError"),
)
}
}
@@ -188,7 +188,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertInAutomationThat(
"Should have location permission",
hasPermission(Manifest.permission.ACCESS_FINE_LOCATION),
- equalTo(true)
+ equalTo(true),
)
val url = createTestUrl(HELLO_HTML_PATH)
@@ -204,7 +204,7 @@ class PermissionDelegateTest : BaseSessionTest() {
"permissionsLocationProvider",
1.1111,
2.2222,
- false
+ false,
)
locProvider.postLocation()
@@ -213,14 +213,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_GEOLOCATION)
+ equalTo(PermissionDelegate.PERMISSION_GEOLOCATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -229,12 +229,12 @@ class PermissionDelegateTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: PermissionDelegate.Callback
+ callback: PermissionDelegate.Callback,
) {
assertThat(
"Permissions list should be correct",
listOf(*permissions!!),
- hasItems(Manifest.permission.ACCESS_FINE_LOCATION)
+ hasItems(Manifest.permission.ACCESS_FINE_LOCATION),
)
callback.grant()
}
@@ -247,7 +247,7 @@ class PermissionDelegateTest : BaseSessionTest() {
position => resolve(
position.coords.latitude !== undefined &&
position.coords.longitude !== undefined),
- error => reject(error.code)))"""
+ error => reject(error.code)))""",
) as Boolean
assertThat("Request should succeed", hasPosition, equalTo(true))
@@ -255,7 +255,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Error should not because the permission was denied.",
ex.reason as String,
- not("1")
+ not("1"),
)
}
@@ -301,7 +301,7 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
return GeckoResult.fromValue(ContentPermission.VALUE_DENY)
@@ -311,7 +311,7 @@ class PermissionDelegateTest : BaseSessionTest() {
override fun onAndroidPermissionsRequest(
session: GeckoSession,
permissions: Array<out String>?,
- callback: PermissionDelegate.Callback
+ callback: PermissionDelegate.Callback,
) {
}
})
@@ -320,7 +320,7 @@ class PermissionDelegateTest : BaseSessionTest() {
"""new Promise((resolve, reject) =>
window.navigator.geolocation.getCurrentPosition(reject,
error => resolve(error.code)
- ))"""
+ ))""",
)
// Error code 1 means permission denied.
@@ -393,13 +393,13 @@ class PermissionDelegateTest : BaseSessionTest() {
"Non-permanent only makes sense with private browsing " +
"(because non-private browsing exceptions are always permanent",
permanent || privateBrowsing,
- equalTo(true)
+ equalTo(true),
)
val runtime0 = TrackingPermissionInstance.start(
targetContext,
temporaryProfile.get(),
- privateBrowsing
+ privateBrowsing,
)
sessionRule.waitForResult(runtime0.loadTestPath(TRACKERS_PATH))
@@ -408,12 +408,12 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission value should start at DENY",
permission,
- equalTo(ContentPermission.VALUE_DENY)
+ equalTo(ContentPermission.VALUE_DENY),
)
if (privateBrowsing && permanent) {
runtime0.setPrivateBrowsingPermanentTrackingPermission(
- ContentPermission.VALUE_ALLOW
+ ContentPermission.VALUE_ALLOW,
)
} else {
runtime0.setTrackingPermission(ContentPermission.VALUE_ALLOW)
@@ -425,7 +425,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission value should be ALLOW after setting",
permission,
- equalTo(ContentPermission.VALUE_ALLOW)
+ equalTo(ContentPermission.VALUE_ALLOW),
)
sessionRule.waitForResult(runtime0.quit())
@@ -434,7 +434,7 @@ class PermissionDelegateTest : BaseSessionTest() {
val runtime1 = TrackingPermissionInstance.start(
targetContext,
temporaryProfile.get(),
- privateBrowsing
+ privateBrowsing,
)
sessionRule.waitForResult(runtime1.loadTestPath(TRACKERS_PATH))
@@ -447,8 +447,8 @@ class PermissionDelegateTest : BaseSessionTest() {
when {
permanent -> ContentPermission.VALUE_ALLOW
else -> ContentPermission.VALUE_DENY
- }
- )
+ },
+ ),
)
sessionRule.waitForResult(runtime1.quit())
@@ -461,7 +461,7 @@ class PermissionDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<ContentPermission>
+ perms: MutableList<ContentPermission>,
) {
for (perm in perms) {
if (perm.permission == PermissionDelegate.PERMISSION_TRACKING) {
@@ -469,7 +469,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Value should match",
perm.value,
- equalTo(value)
+ equalTo(value),
)
}
found = true
@@ -481,7 +481,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should have been found if expected",
found,
- equalTo(value != null)
+ equalTo(value != null),
)
}
@@ -514,14 +514,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -532,7 +532,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url))
@@ -571,7 +571,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result2 as String,
- equalTo("granted")
+ equalTo("granted"),
)
}
@@ -586,7 +586,7 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
return GeckoResult.fromValue(ContentPermission.VALUE_DENY)
@@ -598,7 +598,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should not be granted",
result as String,
- equalTo("denied")
+ equalTo("denied"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url))
@@ -641,8 +641,8 @@ class PermissionDelegateTest : BaseSessionTest() {
// The profile used in automation sets this to false, so we need to hack it back to true here.
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "media.geckoview.autoplay.request" to true
- )
+ "media.geckoview.autoplay.request" to true,
+ ),
)
mainSession.loadTestPath(AUTOPLAY_PATH)
@@ -669,14 +669,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
assertThat("Context ID should match", perm.contextId, equalTo(mainSession.settings.contextId))
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
@@ -688,7 +688,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url, false))
@@ -725,7 +725,7 @@ class PermissionDelegateTest : BaseSessionTest() {
val session2 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder()
.contextId("foo")
- .build()
+ .build(),
)
session2.loadUri(url)
@@ -735,19 +735,19 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
assertThat(
"Context ID should match",
perm.contextId,
- equalTo(session2.settings.contextId)
+ equalTo(session2.settings.contextId),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -758,7 +758,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result2 as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms2 = sessionRule.waitForResult(storageController.getPermissions(url, false))
@@ -804,14 +804,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_DENY)
}
@@ -836,7 +836,7 @@ class PermissionDelegateTest : BaseSessionTest() {
storageController.setPermission(
notificationPerm!!,
- ContentPermission.VALUE_ALLOW
+ ContentPermission.VALUE_ALLOW,
)
mainSession.delegateDuringNextWait(object : NavigationDelegate {
@@ -861,7 +861,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
}
@@ -875,14 +875,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -893,7 +893,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url))
@@ -914,7 +914,7 @@ class PermissionDelegateTest : BaseSessionTest() {
storageController.setPermission(
notificationPerm!!,
- ContentPermission.VALUE_DENY
+ ContentPermission.VALUE_DENY,
)
mainSession.delegateDuringNextWait(object : NavigationDelegate {
@@ -939,7 +939,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be denied",
result2 as String,
- equalTo("denied")
+ equalTo("denied"),
)
}
@@ -953,14 +953,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -971,7 +971,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url))
@@ -992,14 +992,14 @@ class PermissionDelegateTest : BaseSessionTest() {
storageController.setPermission(
notificationPerm!!,
- ContentPermission.VALUE_PROMPT
+ ContentPermission.VALUE_PROMPT,
)
mainSession.delegateDuringNextWait(object : PermissionDelegate {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
return GeckoResult.fromValue(ContentPermission.VALUE_PROMPT)
@@ -1011,7 +1011,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be default",
result2 as String,
- equalTo("default")
+ equalTo("default"),
)
}
@@ -1025,14 +1025,14 @@ class PermissionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onContentPermissionRequest(
session: GeckoSession,
- perm: ContentPermission
+ perm: ContentPermission,
):
GeckoResult<Int> {
assertThat("URI should match", perm.uri, endsWith(url))
assertThat(
"Type should match",
perm.permission,
- equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION)
+ equalTo(PermissionDelegate.PERMISSION_DESKTOP_NOTIFICATION),
)
return GeckoResult.fromValue(ContentPermission.VALUE_ALLOW)
}
@@ -1043,7 +1043,7 @@ class PermissionDelegateTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
val perms = sessionRule.waitForResult(storageController.getPermissions(url))
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt
index 55211f7e5681efa0d4ebaed42c4199266d2afaae..2e9bc8f135bd93d76d11c527aad5646bb65f175d 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrintDelegateTest.kt
@@ -135,7 +135,7 @@ class PrintDelegateTest : BaseSessionTest() {
val centerPixel = printCenterPixelColor()
assertTrue(
"Android print opened and rendered.",
- sessionRule.waitForResult(centerPixel) == orange
+ sessionRule.waitForResult(centerPixel) == orange,
)
}
}
@@ -155,7 +155,7 @@ class PrintDelegateTest : BaseSessionTest() {
val orange = rgb(255, 113, 57)
assertTrue(
"Android print opened and rendered.",
- sessionRule.waitForResult(centerPixel) == orange
+ sessionRule.waitForResult(centerPixel) == orange,
)
}
}
@@ -175,7 +175,7 @@ class PrintDelegateTest : BaseSessionTest() {
val orange = rgb(255, 113, 57)
assertTrue(
"Android print opened and rendered.",
- sessionRule.waitForResult(centerPixel) == orange
+ sessionRule.waitForResult(centerPixel) == orange,
)
var didCatch = false
try {
@@ -184,7 +184,7 @@ class PrintDelegateTest : BaseSessionTest() {
assertThat(
"Print status context reported.",
e.message,
- containsString("Window.print: No browsing context")
+ containsString("Window.print: No browsing context"),
)
didCatch = true
}
@@ -208,7 +208,7 @@ class PrintDelegateTest : BaseSessionTest() {
val orange = rgb(255, 113, 57)
assertTrue(
"Android print opened and rendered static page.",
- sessionRule.waitForResult(centerPixel) == orange
+ sessionRule.waitForResult(centerPixel) == orange,
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrivateModeTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrivateModeTest.kt
index f7def4d42a8fdde1e77b83fb4a6c6a0ebb83ca98..7df55b1ccb3b509b566b540361fdc4416948dc09 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrivateModeTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PrivateModeTest.kt
@@ -22,46 +22,46 @@ class PrivateModeTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
localStorage.setItem('ctx', 'regular');
- """
+ """,
)
val privateSession = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.usePrivateMode(true)
- .build()
+ .build(),
)
privateSession.loadUri("https://example.com")
privateSession.waitForPageStop()
var localStorage = privateSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
// Ensure that the regular session's data hasn't leaked into the private session.
assertThat(
"Private mode local storage value should be empty",
localStorage,
- Matchers.equalTo("null")
+ Matchers.equalTo("null"),
)
privateSession.evaluateJS(
"""
localStorage.setItem('ctx', 'private');
- """
+ """,
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
// Conversely, ensure private data hasn't leaked into the regular session.
assertThat(
"Regular mode storage value should be unchanged",
localStorage,
- Matchers.equalTo("regular")
+ Matchers.equalTo("regular"),
)
}
@@ -71,7 +71,7 @@ class PrivateModeTest : BaseSessionTest() {
val privateSession1 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.usePrivateMode(true)
- .build()
+ .build(),
)
privateSession1.loadUri("https://example.com")
privateSession1.waitForPageStop()
@@ -79,13 +79,13 @@ class PrivateModeTest : BaseSessionTest() {
privateSession1.evaluateJS(
"""
localStorage.setItem('ctx', 'private');
- """
+ """,
)
val privateSession2 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.usePrivateMode(true)
- .build()
+ .build(),
)
privateSession2.loadUri("https://example.com")
privateSession2.waitForPageStop()
@@ -93,13 +93,13 @@ class PrivateModeTest : BaseSessionTest() {
val localStorage = privateSession2.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Private mode storage value still set",
localStorage,
- Matchers.equalTo("private")
+ Matchers.equalTo("private"),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfileLockedTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfileLockedTest.kt
index c4d76911c95ab9dd24ef51e7aefbfc004d3543af..7c47ade0f72a540ba00fdfeca1f86d11d1706a0e 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfileLockedTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfileLockedTest.kt
@@ -21,7 +21,7 @@ class ProfileLockedTest : BaseSessionTest() {
val runtime0 = RuntimeInstance.start(
targetContext,
TestRuntimeService.instance0::class.java,
- temporaryProfile.get()
+ temporaryProfile.get(),
)
// Start the first runtime and wait until it's ready
@@ -34,7 +34,7 @@ class ProfileLockedTest : BaseSessionTest() {
val runtime1 = RuntimeInstance.start(
targetContext,
TestRuntimeService.instance1::class.java,
- temporaryProfile.get()
+ temporaryProfile.get(),
)
// Wait for the first runtime to disconnect
@@ -46,7 +46,7 @@ class ProfileLockedTest : BaseSessionTest() {
assertThat(
"The service shouldn't be connected anymore",
runtime0.isConnected,
- equalTo(false)
+ equalTo(false),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt
index a53807d65ac6594854258251d0116a4427403336..5d7d60ec6d07939c4e4bc66a920b58999d8233dc 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt
@@ -22,7 +22,7 @@ class ProfilerControllerTest : BaseSessionTest() {
assertThat(
"Header of byte array should be the same as the GZIP one",
head,
- equalTo(GZIPInputStream.GZIP_MAGIC)
+ equalTo(GZIPInputStream.GZIP_MAGIC),
)
val profileString = StringBuilder()
@@ -39,7 +39,7 @@ class ProfilerControllerTest : BaseSessionTest() {
assertThat(
"profile JSON object must not be empty",
json.length(),
- greaterThan(0)
+ greaterThan(0),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt
index 0ca870b2ec234be48eca9b8ea6445a809562c36e..2410db66c563573e7a8dc59bdaaef0d254784683 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt
@@ -30,44 +30,44 @@ class ProgressDelegateTest : BaseSessionTest() {
var lastProgress = -1
sessionRule.forCallbacksDuringWait(object :
- ProgressDelegate,
- NavigationDelegate {
- @AssertCalled
- override fun onLocationChange(session: GeckoSession, url: String?, perms: MutableList<ContentPermission>) {
- assertThat("LocationChange is called", url, endsWith(path))
- }
-
- @AssertCalled
- override fun onProgressChange(session: GeckoSession, progress: Int) {
- assertThat(
- "Progress must be strictly increasing",
- progress,
- greaterThan(lastProgress)
- )
- lastProgress = progress
- counter++
- }
-
- @AssertCalled
- override fun onPageStart(session: GeckoSession, url: String) {
- assertThat("PageStart is called", url, endsWith(path))
- }
-
- @AssertCalled
- override fun onPageStop(session: GeckoSession, success: Boolean) {
- assertThat("PageStop is called", success, equalTo(true))
- }
- })
+ ProgressDelegate,
+ NavigationDelegate {
+ @AssertCalled
+ override fun onLocationChange(session: GeckoSession, url: String?, perms: MutableList<ContentPermission>) {
+ assertThat("LocationChange is called", url, endsWith(path))
+ }
+
+ @AssertCalled
+ override fun onProgressChange(session: GeckoSession, progress: Int) {
+ assertThat(
+ "Progress must be strictly increasing",
+ progress,
+ greaterThan(lastProgress),
+ )
+ lastProgress = progress
+ counter++
+ }
+
+ @AssertCalled
+ override fun onPageStart(session: GeckoSession, url: String) {
+ assertThat("PageStart is called", url, endsWith(path))
+ }
+
+ @AssertCalled
+ override fun onPageStop(session: GeckoSession, success: Boolean) {
+ assertThat("PageStop is called", success, equalTo(true))
+ }
+ })
assertThat(
"Callback should be called at least twice",
counter,
- greaterThanOrEqualTo(2)
+ greaterThanOrEqualTo(2),
)
assertThat(
"Last progress value should be 100",
lastProgress,
- equalTo(100)
+ equalTo(100),
)
}
@@ -95,7 +95,7 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
assertThat("Session should not be null", session, notNullValue())
assertThat("Security info should not be null", securityInfo, notNullValue())
@@ -124,7 +124,7 @@ class ProgressDelegateTest : BaseSessionTest() {
assertThat(
"URL should match",
url,
- endsWith(forEachCall(UNKNOWN_HOST_URI, HELLO_HTML_PATH))
+ endsWith(forEachCall(UNKNOWN_HOST_URI, HELLO_HTML_PATH)),
)
}
@@ -135,7 +135,7 @@ class ProgressDelegateTest : BaseSessionTest() {
assertThat(
"Success flag should match",
success,
- equalTo(forEachCall(false, true))
+ equalTo(forEachCall(false, true)),
)
}
})
@@ -157,7 +157,7 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
}
@@ -186,7 +186,7 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
}
@@ -208,7 +208,7 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
}
@@ -229,52 +229,52 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
assertThat(
"Should be secure",
securityInfo.isSecure,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Should not be exception",
securityInfo.isException,
- equalTo(false)
+ equalTo(false),
)
assertThat(
"Origin should match",
securityInfo.origin,
- equalTo("https://example.com")
+ equalTo("https://example.com"),
)
assertThat(
"Host should match",
securityInfo.host,
- equalTo("example.com")
+ equalTo("example.com"),
)
assertThat(
"Subject should match",
securityInfo.certificate?.subjectX500Principal?.name,
- equalTo("CN=example.com")
+ equalTo("CN=example.com"),
)
assertThat(
"Issuer should match",
securityInfo.certificate?.issuerX500Principal?.name,
- equalTo("OU=Profile Guided Optimization,O=Mozilla Testing,CN=Temporary Certificate Authority")
+ equalTo("OU=Profile Guided Optimization,O=Mozilla Testing,CN=Temporary Certificate Authority"),
)
assertThat(
"Security mode should match",
securityInfo.securityMode,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.SECURITY_MODE_IDENTIFIED)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.SECURITY_MODE_IDENTIFIED),
)
assertThat(
"Active mixed mode should match",
securityInfo.mixedModeActive,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN),
)
assertThat(
"Passive mixed mode should match",
securityInfo.mixedModePassive,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN),
)
}
})
@@ -292,52 +292,52 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
assertThat(
"Should be secure",
securityInfo.isSecure,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"Should not be exception",
securityInfo.isException,
- equalTo(false)
+ equalTo(false),
)
assertThat(
"Origin should match",
securityInfo.origin,
- equalTo("https://mozilla-modern.badssl.com")
+ equalTo("https://mozilla-modern.badssl.com"),
)
assertThat(
"Host should match",
securityInfo.host,
- equalTo("mozilla-modern.badssl.com")
+ equalTo("mozilla-modern.badssl.com"),
)
assertThat(
"Subject should match",
securityInfo.certificate?.subjectX500Principal?.name,
- equalTo("CN=*.badssl.com,O=Lucas Garron,L=Walnut Creek,ST=California,C=US")
+ equalTo("CN=*.badssl.com,O=Lucas Garron,L=Walnut Creek,ST=California,C=US"),
)
assertThat(
"Issuer should match",
securityInfo.certificate?.issuerX500Principal?.name,
- equalTo("CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US")
+ equalTo("CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US"),
)
assertThat(
"Security mode should match",
securityInfo.securityMode,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.SECURITY_MODE_IDENTIFIED)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.SECURITY_MODE_IDENTIFIED),
)
assertThat(
"Active mixed mode should match",
securityInfo.mixedModeActive,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN),
)
assertThat(
"Passive mixed mode should match",
securityInfo.mixedModePassive,
- equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN)
+ equalTo(GeckoSession.ProgressDelegate.SecurityInformation.CONTENT_UNKNOWN),
)
}
})
@@ -351,7 +351,7 @@ class ProgressDelegateTest : BaseSessionTest() {
"https://expired.example.com"
} else {
"https://expired.badssl.com"
- }
+ },
)
sessionRule.waitForPageStop()
@@ -364,7 +364,7 @@ class ProgressDelegateTest : BaseSessionTest() {
@AssertCalled(false)
override fun onSecurityChange(
session: GeckoSession,
- securityInfo: GeckoSession.ProgressDelegate.SecurityInformation
+ securityInfo: GeckoSession.ProgressDelegate.SecurityInformation,
) {
}
})
@@ -388,7 +388,7 @@ class ProgressDelegateTest : BaseSessionTest() {
}
window.requestAnimationFrame(step);
});
- """.trimIndent()
+ """.trimIndent(),
)
}
@@ -466,7 +466,7 @@ class ProgressDelegateTest : BaseSessionTest() {
override fun onLocationChange(
session: GeckoSession,
url: String?,
- perms: MutableList<ContentPermission>
+ perms: MutableList<ContentPermission>,
) {
assertThat("URI should match", url, equalTo(startUri))
}
@@ -481,7 +481,7 @@ class ProgressDelegateTest : BaseSessionTest() {
assertThat(
"Scroll position should match",
session.evaluateJS("window.visualViewport.pageTop") as Double,
- closeTo(100.0, .5)
+ closeTo(100.0, .5),
)
session.goBack()
@@ -525,7 +525,7 @@ class ProgressDelegateTest : BaseSessionTest() {
assertThat(
"Scroll position should match",
mainSession.evaluateJS("window.visualViewport.pageTop") as Double,
- closeTo(100.0, .5)
+ closeTo(100.0, .5),
)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt
index d4cba71f72151fbec573ad7bc8445263e7d209ab..10ebefb6ddfd844877aff00a8ec46423b7dc828f 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt
@@ -44,7 +44,7 @@ class PromptDelegateTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
): GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
assertThat("URL should not be null", request.uri, notNullValue())
@@ -80,7 +80,7 @@ class PromptDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onLoadRequest(
session: GeckoSession,
- request: LoadRequest
+ request: LoadRequest,
): GeckoResult<AllowOrDeny>? {
assertThat("Session should not be null", session, notNullValue())
assertThat("URL should not be null", request.uri, notNullValue())
@@ -129,8 +129,8 @@ class PromptDelegateTest : BaseSessionTest() {
.password("test-password")
.formActionOrigin(null)
.guid("test-guid")
- .build()
- )
+ .build(),
+ ),
)
}
})
@@ -140,12 +140,12 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Saved login should appear here",
prompt.authOptions.username,
- equalTo("test-username")
+ equalTo("test-username"),
)
assertThat(
"Saved login should appear here",
prompt.authOptions.password,
- equalTo("test-password")
+ equalTo("test-password"),
)
return null
}
@@ -158,8 +158,8 @@ class PromptDelegateTest : BaseSessionTest() {
@Test fun loginStorageHttpAuth() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "signon.rememberSignons" to true
- )
+ "signon.rememberSignons" to true,
+ ),
)
val result = GeckoResult<PromptDelegate.BasePrompt>()
val promptInstanceDelegate = object : PromptDelegate.PromptInstanceDelegate {
@@ -183,7 +183,7 @@ class PromptDelegateTest : BaseSessionTest() {
@AssertCalled
override fun onLoginSave(
session: GeckoSession,
- request: PromptDelegate.AutocompleteRequest<Autocomplete.LoginSaveOption>
+ request: PromptDelegate.AutocompleteRequest<Autocomplete.LoginSaveOption>,
): GeckoResult<PromptResponse>? {
val authInfo = request.options[0].value
assertThat("auth matches", authInfo.formActionOrigin, isEmptyOrNullString())
@@ -237,7 +237,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Result should match",
mainSession.waitForJS("confirm('Confirm?')") as Boolean,
- equalTo(true)
+ equalTo(true),
)
sessionRule.delegateDuringNextWait(object : PromptDelegate {
@@ -251,7 +251,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Result should match",
mainSession.waitForJS("confirm('Confirm?')") as Boolean,
- equalTo(false)
+ equalTo(false),
)
}
@@ -262,7 +262,7 @@ class PromptDelegateTest : BaseSessionTest() {
mainSession.evaluateJS(
"document.querySelector('#text').value = 'Some text';" +
- "document.querySelector('#submit').click();"
+ "document.querySelector('#submit').click();",
)
// Submitting the form causes a navigation
@@ -346,7 +346,7 @@ class PromptDelegateTest : BaseSessionTest() {
}
});
}
- })"""
+ })""",
)
mainSession.synthesizeTap(10, 10)
@@ -354,7 +354,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Events should be as expected",
promise.value as String,
- equalTo("input(composed=true) change(composed=false)")
+ equalTo("input(composed=true) change(composed=false)"),
)
}
@@ -440,7 +440,7 @@ class PromptDelegateTest : BaseSessionTest() {
"<option>foo</option><option>bar</option><option>baz</option>";
}, 100);
}, { once: true })
- """.trimIndent()
+ """.trimIndent(),
)
val promise = mainSession.evaluatePromiseJS(
@@ -450,7 +450,7 @@ class PromptDelegateTest : BaseSessionTest() {
resolve(e.target.value);
});
})
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(10, 10)
@@ -458,7 +458,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Selected item should be as expected",
promise.value as String,
- equalTo("baz")
+ equalTo("baz"),
)
}
@@ -493,8 +493,8 @@ class PromptDelegateTest : BaseSessionTest() {
fun onBeforeUnloadTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "dom.require_user_interaction_for_beforeunload" to false
- )
+ "dom.require_user_interaction_for_beforeunload" to false,
+ ),
)
mainSession.loadTestPath(BEFORE_UNLOAD)
sessionRule.waitForPageStop()
@@ -568,7 +568,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Result should match",
mainSession.waitForJS("prompt('Prompt:', 'default')") as String,
- equalTo("foo")
+ equalTo("foo"),
)
}
@@ -590,7 +590,7 @@ class PromptDelegateTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
this.c = document.getElementById('colorexample');
- """.trimIndent()
+ """.trimIndent(),
)
val promise = mainSession.evaluatePromiseJS(
@@ -602,7 +602,7 @@ class PromptDelegateTest : BaseSessionTest() {
false
);
})
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.evaluateJS("this.c.click();")
@@ -610,7 +610,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Value should match",
promise.value as String,
- equalTo("#123456")
+ equalTo("#123456"),
)
}
@@ -635,7 +635,7 @@ class PromptDelegateTest : BaseSessionTest() {
"""
this.c = document.getElementById('colorexample');
this.c.setAttribute('list', 'colorlist');
- """.trimIndent()
+ """.trimIndent(),
)
val promise = mainSession.evaluatePromiseJS(
@@ -646,14 +646,14 @@ class PromptDelegateTest : BaseSessionTest() {
event => resolve(event.target.value),
);
})
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.evaluateJS("this.c.click();")
assertThat(
"Value should match",
promise.value as String,
- equalTo("#123456")
+ equalTo("#123456"),
)
}
@@ -668,7 +668,7 @@ class PromptDelegateTest : BaseSessionTest() {
document.body.addEventListener("click", () => {
document.getElementById('dateexample').showPicker();
});
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(1, 1) // Provides user activation.
@@ -695,7 +695,7 @@ class PromptDelegateTest : BaseSessionTest() {
"""
document.getElementById('selectexample').remove();
document.getElementById('dateexample').getBoundingClientRect();
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(10, 10)
@@ -723,7 +723,7 @@ class PromptDelegateTest : BaseSessionTest() {
document.getElementById('selectexample').remove();
document.getElementById('dateexample').remove();
document.getElementById('weekexample').getBoundingClientRect();
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(10, 10)
@@ -751,7 +751,7 @@ class PromptDelegateTest : BaseSessionTest() {
document.getElementById('dateexample').max = "2022-12-31";
document.getElementById('dateexample').step = "10";
document.getElementById('dateexample').getBoundingClientRect();
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(10, 10)
@@ -826,7 +826,7 @@ class PromptDelegateTest : BaseSessionTest() {
"""
document.getElementById('selectexample').remove();
document.getElementById('dateexample').remove();
- """.trimIndent()
+ """.trimIndent(),
)
mainSession.synthesizeTap(10, 10)
sessionRule.waitForResult(result)
@@ -948,7 +948,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("DataError")
+ containsString("DataError"),
)
}
}
@@ -974,7 +974,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("AbortError")
+ containsString("AbortError"),
)
}
}
@@ -1000,7 +1000,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("AbortError")
+ containsString("AbortError"),
)
}
}
@@ -1024,7 +1024,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("TypeError")
+ containsString("TypeError"),
)
}
}
@@ -1051,7 +1051,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("TypeError")
+ containsString("TypeError"),
)
}
}
@@ -1077,7 +1077,7 @@ class PromptDelegateTest : BaseSessionTest() {
assertThat(
"Error should be correct",
e.reason as String,
- containsString("NotAllowedError")
+ containsString("NotAllowedError"),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt
index b11eb7de41238c04c93c0b8e5a07192336b55ead..038515084f6cee019a2391bc1aabf77688ee3d63 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt
@@ -34,13 +34,13 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"initial font scale $initialFontSize set",
settings.fontSizeFactor.toDouble(),
- closeTo(initialFontSize.toDouble(), 0.05)
+ closeTo(initialFontSize.toDouble(), 0.05),
)
settings.fontInflationEnabled = initialFontInflation
assertThat(
"font inflation initially set to $initialFontInflation",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
settings.automaticFontSizeAdjustment = true
@@ -48,29 +48,29 @@ class RuntimeSettingsTest : BaseSessionTest() {
val expectedFontSizeFactor = Settings.System.getFloat(
contentResolver,
Settings.System.FONT_SCALE,
- 1.0f
+ 1.0f,
)
assertThat(
"Gecko font scale should match system font scale",
settings.fontSizeFactor.toDouble(),
- closeTo(expectedFontSizeFactor.toDouble(), 0.05)
+ closeTo(expectedFontSizeFactor.toDouble(), 0.05),
)
assertThat(
"font inflation enabled",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
settings.automaticFontSizeAdjustment = false
assertThat(
"Gecko font scale restored to previous value",
settings.fontSizeFactor.toDouble(),
- closeTo(initialFontSize.toDouble(), 0.05)
+ closeTo(initialFontSize.toDouble(), 0.05),
)
assertThat(
"font inflation restored to previous value",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
// Now check with that with font inflation initially off, the initial state is still
@@ -82,37 +82,37 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"initial font scale $initialFontSize set",
settings.fontSizeFactor.toDouble(),
- closeTo(initialFontSize.toDouble(), 0.05)
+ closeTo(initialFontSize.toDouble(), 0.05),
)
settings.fontInflationEnabled = initialFontInflation
assertThat(
"font inflation initially set to $initialFontInflation",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
settings.automaticFontSizeAdjustment = true
assertThat(
"Gecko font scale should match system font scale",
settings.fontSizeFactor.toDouble(),
- closeTo(expectedFontSizeFactor.toDouble(), 0.05)
+ closeTo(expectedFontSizeFactor.toDouble(), 0.05),
)
assertThat(
"font inflation enabled",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
settings.automaticFontSizeAdjustment = false
assertThat(
"Gecko font scale restored to previous value",
settings.fontSizeFactor.toDouble(),
- closeTo(initialFontSize.toDouble(), 0.05)
+ closeTo(initialFontSize.toDouble(), 0.05),
)
assertThat(
"font inflation restored to previous value",
settings.fontInflationEnabled,
- `is`(initialFontInflation)
+ `is`(initialFontInflation),
)
}
@@ -136,7 +136,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"old text size ${initialFontSize}px, new size should be ${expectedFontSize}px",
fontSize,
- closeTo(expectedFontSize, 0.1)
+ closeTo(expectedFontSize, 0.1),
)
settings.fontSizeFactor = 1.0f
@@ -146,7 +146,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"text size should be ${initialFontSize}px again",
fontSize,
- closeTo(initialFontSize, 0.1)
+ closeTo(initialFontSize, 0.1),
)
}
@@ -162,7 +162,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"Gecko font inflation pref should be turned off",
prefValue,
- `is`(0)
+ `is`(0),
)
settings.fontInflationEnabled = true
@@ -170,7 +170,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"Gecko font inflation pref should be turned on",
prefValue,
- `is`(baseFontInflationMinTwips)
+ `is`(baseFontInflationMinTwips),
)
settings.fontSizeFactor = 2.0f
@@ -178,7 +178,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"Gecko font inflation pref should scale with increased font size factor",
prefValue,
- greaterThan(baseFontInflationMinTwips)
+ greaterThan(baseFontInflationMinTwips),
)
settings.fontSizeFactor = 0.5f
@@ -186,7 +186,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"Gecko font inflation pref should scale with decreased font size factor",
prefValue,
- lessThan(baseFontInflationMinTwips)
+ lessThan(baseFontInflationMinTwips),
)
settings.fontSizeFactor = 0.0f
@@ -194,12 +194,12 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"setting font size factor to 0 turns off font inflation",
prefValue,
- `is`(0)
+ `is`(0),
)
assertThat(
"GeckoRuntimeSettings returns new font inflation state, too",
settings.fontInflationEnabled,
- `is`(false)
+ `is`(false),
)
settings.fontSizeFactor = 1.0f
@@ -207,12 +207,12 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"Gecko font inflation pref remains turned off",
prefValue,
- `is`(0)
+ `is`(0),
)
assertThat(
"GeckoRuntimeSettings remains turned off",
settings.fontInflationEnabled,
- `is`(false)
+ `is`(false),
)
}
@@ -225,7 +225,7 @@ class RuntimeSettingsTest : BaseSessionTest() {
assertThat(
"about:config should be disabled by default",
settings.aboutConfigEnabled,
- equalTo(false)
+ equalTo(false),
)
mainSession.loadUri("about:config")
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt
index 04feae75370496e9f7904b5c7c0fb114909198c4..c6ffaf83fb2a00555069518eec537f5f3a9b2910 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt
@@ -75,7 +75,7 @@ class ScreenshotTest : BaseSessionTest() {
assertThat(
"Screenshot is not null",
it,
- notNullValue()
+ notNullValue(),
)
assertThat("Widths are the same", comparisonImage.width, equalTo(it.width))
assertThat("Heights are the same", comparisonImage.height, equalTo(it.height))
@@ -84,7 +84,7 @@ class ScreenshotTest : BaseSessionTest() {
assertThat(
"Images are almost identical",
imageElementDifference(comparisonImage, it),
- lessThanOrEqualTo(1)
+ lessThanOrEqualTo(1),
)
}
}
@@ -221,7 +221,7 @@ class ScreenshotTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onSessionStateChange(
session: GeckoSession,
- sessionState: GeckoSession.SessionState
+ sessionState: GeckoSession.SessionState,
) {}
})
@@ -355,7 +355,7 @@ class ScreenshotTest : BaseSessionTest() {
.source(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)
.size(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
.capture(),
- screenshotFile
+ screenshotFile,
)
}
}
@@ -376,13 +376,13 @@ class ScreenshotTest : BaseSessionTest() {
it.screenshot()
.source(0, 0, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
.capture(),
- BitmapFactory.decodeResource(res, R.drawable.colors_tl)
+ BitmapFactory.decodeResource(res, R.drawable.colors_tl),
)
assertScreenshotResult(
it.screenshot()
.source(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
.capture(),
- BitmapFactory.decodeResource(res, R.drawable.colors_br)
+ BitmapFactory.decodeResource(res, R.drawable.colors_br),
)
}
}
@@ -404,14 +404,14 @@ class ScreenshotTest : BaseSessionTest() {
.source(0, 0, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
.size(SCREEN_WIDTH / 4, SCREEN_WIDTH / 4)
.capture(),
- BitmapFactory.decodeResource(res, R.drawable.colors_tl_scaled)
+ BitmapFactory.decodeResource(res, R.drawable.colors_tl_scaled),
)
assertScreenshotResult(
it.screenshot()
.source(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
.size(SCREEN_WIDTH / 4, SCREEN_WIDTH / 4)
.capture(),
- BitmapFactory.decodeResource(res, R.drawable.colors_br_scaled)
+ BitmapFactory.decodeResource(res, R.drawable.colors_br_scaled),
)
}
}
@@ -427,7 +427,7 @@ class ScreenshotTest : BaseSessionTest() {
OnExceptionListener<Throwable> { error: Throwable ->
Assert.assertTrue(error is OutOfMemoryError)
fromException(error)
- }
+ },
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt
index fb9247f3bfb54dbca681c2eb0707985d44d81903..63222e9732cb6bed9b0441f6e7747aef1b93949c 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt
@@ -60,7 +60,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
arrayOf("#iframe", ContentType.IFRAME, "amet", false),
arrayOf("#designmode", ContentType.IFRAME, "consectetur", true),
arrayOf("#iframe-xorigin", ContentType.IFRAME_XORIGIN, "elit", false),
- arrayOf("#x-input", ContentType.EDITABLE_ELEMENT, "adipisci", true)
+ arrayOf("#x-input", ContentType.EDITABLE_ELEMENT, "adipisci", true),
)
}
@@ -125,9 +125,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ACTION_CUT,
ACTION_DELETE,
ACTION_HIDE,
- ACTION_PASTE
- )
- )
+ ACTION_PASTE,
+ ),
+ ),
)
}
} else {
@@ -140,9 +140,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ACTION_COPY,
ACTION_HIDE,
ACTION_SELECT_ALL,
- ACTION_UNSELECT
- )
- )
+ ACTION_UNSELECT,
+ ),
+ ),
)
}
}
@@ -166,9 +166,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ACTION_DELETE,
ACTION_HIDE,
ACTION_PASTE,
- ACTION_PASTE_AS_PLAIN_TEXT
- )
- )
+ ACTION_PASTE_AS_PLAIN_TEXT,
+ ),
+ ),
)
} else {
testThat(
@@ -183,9 +183,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ACTION_CUT,
ACTION_DELETE,
ACTION_HIDE,
- ACTION_PASTE
- )
- )
+ ACTION_PASTE,
+ ),
+ ),
)
}
}
@@ -199,9 +199,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ACTION_COPY,
ACTION_HIDE,
ACTION_SELECT_ALL,
- ACTION_UNSELECT
- )
- )
+ ACTION_UNSELECT,
+ ),
+ ),
)
}
}
@@ -213,8 +213,8 @@ class SelectionActionDelegateTest : BaseSessionTest() {
{},
hasShowActionRequest(
FLAG_IS_EDITABLE or FLAG_IS_COLLAPSED,
- arrayOf(ACTION_HIDE, ACTION_PASTE, ACTION_SELECT_ALL)
- )
+ arrayOf(ACTION_HIDE, ACTION_PASTE, ACTION_SELECT_ALL),
+ ),
)
}
}
@@ -226,8 +226,8 @@ class SelectionActionDelegateTest : BaseSessionTest() {
{},
hasShowActionRequest(
FLAG_IS_EDITABLE or FLAG_IS_COLLAPSED,
- arrayOf(ACTION_HIDE, ACTION_SELECT_ALL)
- )
+ arrayOf(ACTION_HIDE, ACTION_SELECT_ALL),
+ ),
)
}
}
@@ -272,14 +272,14 @@ class SelectionActionDelegateTest : BaseSessionTest() {
withResponse(ACTION_SELECT_ALL),
changesSelectionTo(
both(containsString(selectedContent.initialContent))
- .and(not(equalTo(selectedContent.initialContent)))
- )
+ .and(not(equalTo(selectedContent.initialContent))),
+ ),
)
} else {
testThat(
if (editable) collapsedContent else selectedContent,
withResponse(ACTION_SELECT_ALL),
- changesSelectionTo(selectedContent.initialContent)
+ changesSelectionTo(selectedContent.initialContent),
)
}
}
@@ -294,7 +294,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
selectedContent,
withResponse(ACTION_COPY, ACTION_UNSELECT),
copiesText(),
- clearsSelection()
+ clearsSelection(),
)
}
}
@@ -307,7 +307,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
testThat(
selectedContent,
withResponse(ACTION_COLLAPSE_TO_END),
- hasSelectionAt(selectedContent.initialContent.length)
+ hasSelectionAt(selectedContent.initialContent.length),
)
}
@@ -336,7 +336,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Hide action should be called when clearing delegate",
counter,
- equalTo(1)
+ equalTo(1),
)
}
@@ -374,14 +374,14 @@ class SelectionActionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onShowClipboardPermissionRequest(
session: GeckoSession,
- perm: ClipboardPermission
+ perm: ClipboardPermission,
):
GeckoResult<AllowOrDeny> {
assertThat("URI should match", perm.uri, startsWith(url))
assertThat(
"Type should match",
perm.type,
- equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ)
+ equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ),
)
assertThat("screenPoint should match", perm.screenPoint, equalTo(Point(50, 50)))
return GeckoResult.allow()
@@ -390,7 +390,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onAlertPrompt(
session: GeckoSession,
- prompt: PromptDelegate.AlertPrompt
+ prompt: PromptDelegate.AlertPrompt,
):
GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Message should match", "allow", equalTo(prompt.message))
@@ -420,14 +420,14 @@ class SelectionActionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [1])
override fun onShowClipboardPermissionRequest(
session: GeckoSession,
- perm: ClipboardPermission
+ perm: ClipboardPermission,
):
GeckoResult<AllowOrDeny>? {
assertThat("URI should match", perm.uri, startsWith(url))
assertThat(
"Type should match",
perm.type,
- equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ)
+ equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ),
)
return GeckoResult.deny()
}
@@ -435,7 +435,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1, order = [2])
override fun onAlertPrompt(
session: GeckoSession,
- prompt: PromptDelegate.AlertPrompt
+ prompt: PromptDelegate.AlertPrompt,
):
GeckoResult<PromptDelegate.PromptResponse> {
assertThat("Message should match", "deny", equalTo(prompt.message))
@@ -464,13 +464,13 @@ class SelectionActionDelegateTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onShowClipboardPermissionRequest(
session: GeckoSession,
- perm: ClipboardPermission
+ perm: ClipboardPermission,
):
GeckoResult<AllowOrDeny>? {
assertThat(
"Type should match",
perm.type,
- equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ)
+ equalTo(SelectionActionDelegate.PERMISSION_CLIPBOARD_READ),
)
result.complete(null)
return GeckoResult()
@@ -504,7 +504,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
content: SelectedContent,
respondingWith: (Selection) -> Unit,
result: (SelectedContent) -> Unit,
- vararg sideEffects: (SelectedContent) -> Unit
+ vararg sideEffects: (SelectedContent) -> Unit,
) {
mainSession.loadTestPath(INPUTS_PATH)
mainSession.waitForPageStop()
@@ -516,8 +516,8 @@ class SelectionActionDelegateTest : BaseSessionTest() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
"geckoview.selection_action.show_on_focus" to true,
- "layout.accessiblecaret.script_change_update_mode" to 2
- )
+ "layout.accessiblecaret.script_change_update_mode" to 2,
+ ),
)
mainSession.delegateDuringNextWait(object : SelectionActionDelegate {
@@ -533,7 +533,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Initial content should match",
selection.text,
- equalTo(content.initialContent)
+ equalTo(content.initialContent),
)
}
})
@@ -546,15 +546,15 @@ class SelectionActionDelegateTest : BaseSessionTest() {
content: SelectedContent,
initialJsA: String,
initialJsB: String,
- expectedDiff: RectF
+ expectedDiff: RectF,
) {
// Show selection actions for collapsed selections, so we can test them.
// Also, always show accessible carets / selection actions for changes due to JS calls.
sessionRule.setPrefsUntilTestEnd(
mapOf(
"geckoview.selection_action.show_on_focus" to true,
- "layout.accessiblecaret.script_change_update_mode" to 2
- )
+ "layout.accessiblecaret.script_change_update_mode" to 2,
+ ),
)
mainSession.loadTestPath(INPUTS_PATH)
@@ -591,7 +591,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Selection rect is not at expected location. a$screenRectA b$screenRectB",
result,
- equalTo(true)
+ equalTo(true),
)
}
@@ -615,7 +615,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ClipboardManager.OnPrimaryClipChangedListener::class,
clipboard::addPrimaryClipChangedListener,
clipboard::removePrimaryClipChangedListener,
- ClipboardManager.OnPrimaryClipChangedListener {}
+ ClipboardManager.OnPrimaryClipChangedListener {},
)
lambda()
} finally {
@@ -632,7 +632,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
ClipboardManager.OnPrimaryClipChangedListener::class,
clipboard::addPrimaryClipChangedListener,
clipboard::removePrimaryClipChangedListener,
- ClipboardManager.OnPrimaryClipChangedListener {}
+ ClipboardManager.OnPrimaryClipChangedListener {},
)
lambda()
} finally {
@@ -644,7 +644,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assumeThat(
"Assuming is ${if (editable) "" else "not "}editable",
this.editable,
- equalTo(editable)
+ equalTo(editable),
)
lambda?.invoke()
}
@@ -653,13 +653,13 @@ class SelectionActionDelegateTest : BaseSessionTest() {
open inner class SelectedDiv(
val id: String,
- override val initialContent: String
+ override val initialContent: String,
) : SelectedContent {
protected fun selectTo(to: Int) {
mainSession.evaluateJS(
"""document.getSelection().setBaseAndExtent(
document.querySelector('$id').firstChild, 0,
- document.querySelector('$id').firstChild, $to)"""
+ document.querySelector('$id').firstChild, $to)""",
)
}
@@ -673,7 +673,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
if (mainSession.evaluateJS(
"""
document.getSelection().anchorNode !== document.querySelector('$id').firstChild ||
- document.getSelection().focusNode !== document.querySelector('$id').firstChild"""
+ document.getSelection().focusNode !== document.querySelector('$id').firstChild""",
) as Boolean
) {
return Pair(-1, -1)
@@ -681,7 +681,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
val offsets = mainSession.evaluateJS(
"""[
document.getSelection().anchorOffset,
- document.getSelection().focusOffset]"""
+ document.getSelection().focusOffset]""",
) as JSONArray
return Pair(offsets[0] as Int, offsets[1] as Int)
}
@@ -693,7 +693,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
open inner class SelectedEditableElement(
val id: String,
- override val initialContent: String
+ override val initialContent: String,
) : SelectedContent {
override fun focus() {
mainSession.waitForJS("document.querySelector('$id').focus()")
@@ -711,7 +711,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
val offsets = mainSession.evaluateJS(
"""[ document.querySelector('$id').selectionStart,
|document.querySelector('$id').selectionEnd ]
- """.trimMargin()
+ """.trimMargin(),
) as JSONArray
return Pair(offsets[0] as Int, offsets[1] as Int)
}
@@ -725,7 +725,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
open inner class SelectedFrame(
val id: String,
- override val initialContent: String
+ override val initialContent: String,
) : SelectedContent {
override fun focus() {
mainSession.evaluateJS("document.querySelector('$id').contentWindow.focus()")
@@ -737,7 +737,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
var doc = document.querySelector('$id').contentDocument;
var text = doc.body.firstChild;
doc.getSelection().setBaseAndExtent(text, 0, text, $to);
- })()"""
+ })()""",
)
}
@@ -756,7 +756,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
return [-1, -1];
}
return [sel.anchorOffset, sel.focusOffset];
- })()"""
+ })()""",
) as JSONArray
return Pair(offsets[0] as Int, offsets[1] as Int)
}
@@ -768,7 +768,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
open inner class SelectedFrameXOrigin(
val id: String,
- override val initialContent: String
+ override val initialContent: String,
) : SelectedContent {
override fun focus() {
mainSession.evaluateJS("document.querySelector('$id').contentWindow.postMessage({ type: 'focus' }, '*')")
@@ -789,7 +789,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
}, { once: true });
document.querySelector('$id').contentDocument.postMessage({ type: 'content' }, '*');
});
- """
+ """,
)
return promise.value as String
}
@@ -803,7 +803,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
}, { once: true });
document.querySelector('$id').contentDocument.postMessage({ type: 'selectedOffset' }, '*');
});
- """
+ """,
)
val offsets = promise.value as JSONArray
return Pair(offsets[0] as Int, offsets[1] as Int)
@@ -830,7 +830,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
private fun hasShowActionRequest(
expectedFlags: Int,
- expectedActions: Array<out String>
+ expectedActions: Array<out String>,
) = { it: SelectedContent ->
mainSession.forCallbacksDuringWait(object : SelectionActionDelegate {
@AssertCalled(count = 1)
@@ -838,22 +838,22 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Selection text should be valid",
selection.text,
- equalTo(it.initialContent)
+ equalTo(it.initialContent),
)
assertThat(
"Selection flags should be valid",
selection.flags,
- equalTo(expectedFlags)
+ equalTo(expectedFlags),
)
assertThat(
"Selection rect should be valid",
selection.screenRect!!.isEmpty,
- equalTo(false)
+ equalTo(false),
)
assertThat(
"Actions must be valid",
selection.availableActions.toTypedArray(),
- arrayContainingInAnyOrder(*expectedActions)
+ arrayContainingInAnyOrder(*expectedActions),
)
}
})
@@ -865,9 +865,9 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Clipboard should contain correct text",
clipboard.primaryClip?.getItemAt(0)?.text,
- hasToString(it.initialContent)
+ hasToString(it.initialContent),
)
- }
+ },
)
}
@@ -889,7 +889,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Hide reason should be correct",
reason,
- equalTo(HIDE_REASON_NO_SELECTION)
+ equalTo(HIDE_REASON_NO_SELECTION),
)
}
})
@@ -901,7 +901,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
assertThat(
"Selection offsets should match",
it.selectionOffsets,
- equalTo(Pair(start, end))
+ equalTo(Pair(start, end)),
)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt
index b8b7fefc9902e3086a7df41d75705f257b2899e8..50f64301fd5348a455b47ebcaf0e4d6f4d71effd 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt
@@ -81,17 +81,17 @@ class SessionLifecycleTest : BaseSessionTest() {
assertThat(
"Parceled settings must match",
newSettings.javaScriptEnabled,
- equalTo(settings.javaScriptEnabled)
+ equalTo(settings.javaScriptEnabled),
)
assertThat(
"Parceled settings must match",
newSettings.extras.getInt("test1"),
- equalTo(settings.extras.getInt("test1"))
+ equalTo(settings.extras.getInt("test1")),
)
assertThat(
"Parceled settings must match",
newSettings.extras.getBoolean("test2"),
- equalTo(settings.extras.getBoolean("test2"))
+ equalTo(settings.extras.getBoolean("test2")),
)
}
}
@@ -147,7 +147,7 @@ class SessionLifecycleTest : BaseSessionTest() {
}
window.requestAnimationFrame(raf);
});
- """
+ """,
) as Double
}
@@ -160,8 +160,8 @@ class SessionLifecycleTest : BaseSessionTest() {
// This makes the throttled frame rate 4 times faster than normal,
// so this test doesn't time out. Should still be significantly slower tha
// the active frame rate so we can measure the effects
- "layout.throttled_frame_rate" to 4
- )
+ "layout.throttled_frame_rate" to 4,
+ ),
)
mainSession.loadTestPath(HELLO_HTML_PATH)
@@ -174,7 +174,7 @@ class SessionLifecycleTest : BaseSessionTest() {
assertThat(
"docShell shouldn't be active after calling setActive(false)",
mainSession.active,
- equalTo(false)
+ equalTo(false),
)
mainSession.evaluateJS(
@@ -184,23 +184,23 @@ class SessionLifecycleTest : BaseSessionTest() {
}
setTimeout(fail, 1);
fetch("missing.html").catch(fail);
- """
+ """,
)
var rafRate = computeRequestAnimationFrameRate(mainSession)
assertThat(
"requestAnimationFrame should be called about once a second",
rafRate,
- greaterThan(450.0)
+ greaterThan(450.0),
)
assertThat(
"requestAnimationFrame should be called about once a second",
rafRate,
- lessThan(10000.0)
+ lessThan(10000.0),
)
val isNotGreen = mainSession.evaluateJS(
- "document.documentElement.style.backgroundColor !== 'green'"
+ "document.documentElement.style.backgroundColor !== 'green'",
) as Boolean
assertThat("timeouts have not run yet", isNotGreen, equalTo(true))
@@ -209,7 +209,7 @@ class SessionLifecycleTest : BaseSessionTest() {
assertThat(
"docShell should be active after calling setActive(true)",
mainSession.active,
- equalTo(true)
+ equalTo(true),
)
// At 60fps, once a frame is about 16.6 ms
@@ -217,12 +217,12 @@ class SessionLifecycleTest : BaseSessionTest() {
assertThat(
"requestAnimationFrame should be called about once a frame",
rafRate,
- lessThan(60.0)
+ lessThan(60.0),
)
assertThat(
"requestAnimationFrame should be called about once a frame",
rafRate,
- greaterThan(5.0)
+ greaterThan(5.0),
)
}
@@ -235,6 +235,6 @@ class SessionLifecycleTest : BaseSessionTest() {
class QueuedWeakReference<T> @JvmOverloads constructor(
obj: T,
- var queue: ReferenceQueue<T> = ReferenceQueue()
+ var queue: ReferenceQueue<T> = ReferenceQueue(),
) : WeakReference<T>(obj, queue)
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt
index 0dc26e9e51ed6e3ca65937cbac1516dd87600473..592aa442f8dcd10ce2743333f3d18ff7d21fe1c7 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt
@@ -30,59 +30,59 @@ class StorageControllerTest : BaseSessionTest() {
"""
localStorage.setItem('ctx', 'test');
document.cookie = 'ctx=test';
- """
+ """,
)
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearData(
- StorageController.ClearFlags.ALL
- )
+ StorageController.ClearFlags.ALL,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("null")
+ equalTo("null"),
)
}
@@ -94,48 +94,48 @@ class StorageControllerTest : BaseSessionTest() {
"""
localStorage.setItem('ctx', 'test');
document.cookie = 'ctx=test';
- """
+ """,
)
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearData(
- StorageController.ClearFlags.COOKIES
- )
+ StorageController.ClearFlags.COOKIES,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
// With LSNG disabled, storage is also cleared when cookies are,
@@ -144,90 +144,90 @@ class StorageControllerTest : BaseSessionTest() {
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
} else {
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
}
assertThat(
"Cookie value should match",
cookie,
- equalTo("null")
+ equalTo("null"),
)
mainSession.evaluateJS(
"""
document.cookie = 'ctx=test';
- """
+ """,
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearData(
- StorageController.ClearFlags.DOM_STORAGES
- )
+ StorageController.ClearFlags.DOM_STORAGES,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
mainSession.evaluateJS(
"""
localStorage.setItem('ctx', 'test');
- """
+ """,
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearData(
- StorageController.ClearFlags.SITE_DATA
- )
+ StorageController.ClearFlags.SITE_DATA,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("null")
+ equalTo("null"),
)
}
@@ -239,90 +239,90 @@ class StorageControllerTest : BaseSessionTest() {
"""
localStorage.setItem('ctx', 'test');
document.cookie = 'ctx=test';
- """
+ """,
)
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearDataFromHost(
"test.com",
- StorageController.ClearFlags.ALL
- )
+ StorageController.ClearFlags.ALL,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearDataFromHost(
"example.com",
- StorageController.ClearFlags.ALL
- )
+ StorageController.ClearFlags.ALL,
+ ),
)
localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("null")
+ equalTo("null"),
)
}
@@ -338,30 +338,30 @@ class StorageControllerTest : BaseSessionTest() {
"""
localStorage.setItem('ctx', 'test');
document.cookie = 'ctx=test';
- """
+ """,
)
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
}
@@ -370,8 +370,8 @@ class StorageControllerTest : BaseSessionTest() {
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearDataFromBaseDomain(
"test.com",
- StorageController.ClearFlags.ALL
- )
+ StorageController.ClearFlags.ALL,
+ ),
)
for (domain in domains) {
@@ -381,24 +381,24 @@ class StorageControllerTest : BaseSessionTest() {
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("test")
+ equalTo("test"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("ctx=test")
+ equalTo("ctx=test"),
)
}
@@ -407,8 +407,8 @@ class StorageControllerTest : BaseSessionTest() {
sessionRule.waitForResult(
sessionRule.runtime.storageController.clearDataFromBaseDomain(
"example.com",
- StorageController.ClearFlags.ALL
- )
+ StorageController.ClearFlags.ALL,
+ ),
)
for (domain in domains) {
@@ -418,24 +418,24 @@ class StorageControllerTest : BaseSessionTest() {
var localStorage = mainSession.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
var cookie = mainSession.evaluateJS(
"""
document.cookie || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
assertThat(
"Cookie value should match",
cookie,
- equalTo("null")
+ equalTo("null"),
)
}
}
@@ -444,7 +444,7 @@ class StorageControllerTest : BaseSessionTest() {
val session1 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(baseSettings)
.contextId("1")
- .build()
+ .build(),
)
session1.loadUri("https://example.com")
session1.waitForPageStop()
@@ -452,19 +452,19 @@ class StorageControllerTest : BaseSessionTest() {
session1.evaluateJS(
"""
localStorage.setItem('ctx', '1');
- """
+ """,
)
var localStorage = session1.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("1")
+ equalTo("1"),
)
session1.reload()
@@ -473,19 +473,19 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session1.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("1")
+ equalTo("1"),
)
val session2 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(baseSettings)
.contextId("2")
- .build()
+ .build(),
)
session2.loadUri("https://example.com")
@@ -494,31 +494,31 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session2.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should be null",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
session2.evaluateJS(
"""
localStorage.setItem('ctx', '2');
- """
+ """,
)
localStorage = session2.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("2")
+ equalTo("2"),
)
session1.loadUri("https://example.com")
@@ -527,19 +527,19 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session1.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("1")
+ equalTo("1"),
)
val session3 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(baseSettings)
.contextId("2")
- .build()
+ .build(),
)
session3.loadUri("https://example.com")
@@ -548,13 +548,13 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session3.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("2")
+ equalTo("2"),
)
}
@@ -566,7 +566,7 @@ class StorageControllerTest : BaseSessionTest() {
testSessionContext(
GeckoSessionSettings.Builder(mainSession.settings)
.usePrivateMode(true)
- .build()
+ .build(),
)
}
@@ -574,7 +574,7 @@ class StorageControllerTest : BaseSessionTest() {
val session1 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
- .build()
+ .build(),
)
session1.loadUri("https://example.com")
session1.waitForPageStop()
@@ -582,19 +582,19 @@ class StorageControllerTest : BaseSessionTest() {
session1.evaluateJS(
"""
localStorage.setItem('ctx', '1');
- """
+ """,
)
var localStorage = session1.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("1")
+ equalTo("1"),
)
session1.close()
@@ -602,7 +602,7 @@ class StorageControllerTest : BaseSessionTest() {
val session2 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("2")
- .build()
+ .build(),
)
session2.loadUri("https://example.com")
@@ -611,19 +611,19 @@ class StorageControllerTest : BaseSessionTest() {
session2.evaluateJS(
"""
localStorage.setItem('ctx', '2');
- """
+ """,
)
localStorage = session2.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("2")
+ equalTo("2"),
)
session2.close()
@@ -633,7 +633,7 @@ class StorageControllerTest : BaseSessionTest() {
val session3 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
- .build()
+ .build(),
)
session3.loadUri("https://example.com")
@@ -642,19 +642,19 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session3.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("null")
+ equalTo("null"),
)
val session4 = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("2")
- .build()
+ .build(),
)
session4.loadUri("https://example.com")
@@ -663,13 +663,13 @@ class StorageControllerTest : BaseSessionTest() {
localStorage = session4.evaluateJS(
"""
localStorage.getItem('ctx') || 'null'
- """
+ """,
) as String
assertThat(
"Local storage value should match",
localStorage,
- equalTo("2")
+ equalTo("2"),
)
}
@@ -680,7 +680,7 @@ class StorageControllerTest : BaseSessionTest() {
val session = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
- .build()
+ .build(),
)
session.loadUri("https://example.com")
session.waitForPageStop()
@@ -688,35 +688,35 @@ class StorageControllerTest : BaseSessionTest() {
var mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- false
- )
+ false,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT)
+ equalTo(COOKIE_BANNER_MODE_REJECT),
)
sessionRule.waitForResult(
storageController.setCookieBannerModeForDomain(
"https://example.com",
COOKIE_BANNER_MODE_REJECT_OR_ACCEPT,
- false
- )
+ false,
+ ),
)
mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- false
- )
+ false,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT)
+ equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT),
)
}
@@ -729,7 +729,7 @@ class StorageControllerTest : BaseSessionTest() {
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
.usePrivateMode(true)
- .build()
+ .build(),
)
session.loadUri("https://example.com")
session.waitForPageStop()
@@ -737,34 +737,34 @@ class StorageControllerTest : BaseSessionTest() {
var mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT)
+ equalTo(COOKIE_BANNER_MODE_REJECT),
)
sessionRule.waitForResult(
storageController.setCookieBannerModeAndPersistInPrivateBrowsingForDomain(
"https://example.com",
- COOKIE_BANNER_MODE_REJECT_OR_ACCEPT
- )
+ COOKIE_BANNER_MODE_REJECT_OR_ACCEPT,
+ ),
)
mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT)
+ equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT),
)
session.close()
@@ -772,14 +772,14 @@ class StorageControllerTest : BaseSessionTest() {
mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT)
+ equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT),
)
}
@@ -791,7 +791,7 @@ class StorageControllerTest : BaseSessionTest() {
val session = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
- .build()
+ .build(),
)
session.loadUri("https://example.com")
session.waitForPageStop()
@@ -800,19 +800,19 @@ class StorageControllerTest : BaseSessionTest() {
val mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- false
- )
+ false,
+ ),
)
assertThat(
"Cookie banner mode should match",
mode,
- equalTo(COOKIE_BANNER_MODE_DISABLED)
+ equalTo(COOKIE_BANNER_MODE_DISABLED),
)
} catch (e: Exception) {
assertThat(
"Cookie banner mode should match",
e.message,
- containsString("The cookie banner handling service is not available")
+ containsString("The cookie banner handling service is not available"),
)
}
}
@@ -825,7 +825,7 @@ class StorageControllerTest : BaseSessionTest() {
val session = sessionRule.createOpenSession(
GeckoSessionSettings.Builder(mainSession.settings)
.contextId("1")
- .build()
+ .build(),
)
session.loadUri("https://example.com")
session.waitForPageStop()
@@ -834,41 +834,41 @@ class StorageControllerTest : BaseSessionTest() {
storageController.setCookieBannerModeForDomain(
"https://example.com",
COOKIE_BANNER_MODE_REJECT_OR_ACCEPT,
- true
- )
+ true,
+ ),
)
var mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
assertThat(
"Cookie banner mode should match $COOKIE_BANNER_MODE_REJECT_OR_ACCEPT but it is $mode",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT)
+ equalTo(COOKIE_BANNER_MODE_REJECT_OR_ACCEPT),
)
sessionRule.waitForResult(
storageController.removeCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
mode = sessionRule.waitForResult(
storageController.getCookieBannerModeForDomain(
"https://example.com",
- true
- )
+ true,
+ ),
)
assertThat(
"Cookie banner mode should match $COOKIE_BANNER_MODE_REJECT but it is $mode",
mode,
- equalTo(COOKIE_BANNER_MODE_REJECT)
+ equalTo(COOKIE_BANNER_MODE_REJECT),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TelemetryTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TelemetryTest.kt
index da3a8757813911a00130e5ddebcaf32677dfd71b..42286c47a78d73f62f6b1241151ff288522bf1b7 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TelemetryTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TelemetryTest.kt
@@ -21,7 +21,7 @@ class TelemetryTest : BaseSessionTest() {
fun testOnTelemetryReceived() {
// Let's make sure we batch the telemetry calls.
sessionRule.setPrefsUntilTestEnd(
- mapOf("toolkit.telemetry.geckoview.batchDurationMS" to 100000)
+ mapOf("toolkit.telemetry.geckoview.batchDurationMS" to 100000),
)
val expectedHistograms = listOf<Long>(401, 12, 1, 109, 2000)
@@ -45,7 +45,7 @@ class TelemetryTest : BaseSessionTest() {
assertThat(
"The histogram should not be categorical",
metric.isCategorical,
- equalTo(false)
+ equalTo(false),
)
receivedHistograms.addAll(metric.value.toList())
@@ -64,7 +64,7 @@ class TelemetryTest : BaseSessionTest() {
assertThat(
"Metric value should match",
metric.value,
- equalTo("test scalar")
+ equalTo("test scalar"),
)
stringScalar.complete(null)
@@ -79,7 +79,7 @@ class TelemetryTest : BaseSessionTest() {
assertThat(
"Metric value should match",
metric.value,
- equalTo(true)
+ equalTo(true),
)
booleanScalar.complete(null)
@@ -94,12 +94,12 @@ class TelemetryTest : BaseSessionTest() {
assertThat(
"Metric value should match",
metric.value,
- equalTo(1234L)
+ equalTo(1234L),
)
longScalar.complete(null)
}
- }
+ },
)
sessionRule.addHistogram("TELEMETRY_TEST_STREAMING", expectedHistograms[0])
@@ -113,7 +113,7 @@ class TelemetryTest : BaseSessionTest() {
// Forces flushing telemetry data at next histogram.
sessionRule.setPrefsUntilTestEnd(
- mapOf("toolkit.telemetry.geckoview.batchDurationMS" to 0)
+ mapOf("toolkit.telemetry.geckoview.batchDurationMS" to 0),
)
sessionRule.addHistogram("TELEMETRY_TEST_STREAMING", expectedHistograms[4])
@@ -125,7 +125,7 @@ class TelemetryTest : BaseSessionTest() {
assertThat(
"Metric values should match",
receivedHistograms,
- equalTo(expectedHistograms)
+ equalTo(expectedHistograms),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt
index 1d2557c691167781c5bb9d1c481eaf9e8b6b098b..99cc30cd38ffb2f94110e84513a8e01641351601 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt
@@ -44,7 +44,7 @@ class TextInputDelegateTest : BaseSessionTest() {
arrayOf("#input"),
arrayOf("#textarea"),
arrayOf("#contenteditable"),
- arrayOf("#designmode")
+ arrayOf("#designmode"),
)
}
@@ -62,7 +62,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#contenteditable" -> mainSession.evaluateJS("document.querySelector('$id').textContent = '$content'")
"#designmode" -> mainSession.evaluateJS(
- "document.querySelector('$id').contentDocument.body.textContent = '$content'"
+ "document.querySelector('$id').contentDocument.body.textContent = '$content'",
)
else -> mainSession.evaluateJS("document.querySelector('$id').value = '$content'")
}
@@ -73,19 +73,19 @@ class TextInputDelegateTest : BaseSessionTest() {
"#contenteditable" -> mainSession.evaluateJS(
"""[
document.getSelection().anchorOffset,
- document.getSelection().focusOffset]"""
+ document.getSelection().focusOffset]""",
)
"#designmode" -> mainSession.evaluateJS(
"""(function() {
var sel = document.querySelector('$id').contentDocument.getSelection();
var text = document.querySelector('$id').contentDocument.body.firstChild;
return [sel.anchorOffset, sel.focusOffset];
- })()"""
+ })()""",
)
else -> mainSession.evaluateJS(
"""(document.querySelector('$id').selectionDirection !== 'backward'
? [ document.querySelector('$id').selectionStart, document.querySelector('$id').selectionEnd ]
- : [ document.querySelector('$id').selectionEnd, document.querySelector('$id').selectionStart ])"""
+ : [ document.querySelector('$id').selectionEnd, document.querySelector('$id').selectionStart ])""",
)
}.asJsonArray().let {
Pair(it.getInt(0), it.getInt(1))
@@ -102,7 +102,7 @@ class TextInputDelegateTest : BaseSessionTest() {
} else {
selection.collapse(document.querySelector('$id'), 0);
}
- })()"""
+ })()""",
)
"#designmode" -> mainSession.evaluateJS(
"""(function() {
@@ -113,7 +113,7 @@ class TextInputDelegateTest : BaseSessionTest() {
} else {
selection.collapse(document.querySelector('$id').contentDocument.body, 0);
}
- })()"""
+ })()""",
)
else -> mainSession.evaluateJS("document.querySelector('$id').setSelectionRange($start, $end)")
}
@@ -132,7 +132,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('compositionupdate', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('compositionupdate', r, { once: true }))"
- }
+ },
)
ic.setComposingText(text, newCursorPosition)
promise.value
@@ -143,7 +143,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('compositionend', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('compositionend', r, { once: true }))"
- }
+ },
)
ic.finishComposingText()
promise.value
@@ -159,7 +159,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('compositionend', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('compositionend', r, { once: true }))"
- }
+ },
)
ic.commitText(text, newCursorPosition)
promise.value
@@ -171,7 +171,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('input', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('input', r, { once: true }))"
- }
+ },
)
ic.deleteSurroundingText(before, after)
if (before != 0 || after != 0) {
@@ -187,7 +187,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('selectionchange', r, { once: true }))"
"#contenteditable" -> "new Promise(r => document.addEventListener('selectionchange', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('selectionchange', r, { once: true }))"
- }
+ },
)
ic.setSelection(start, end)
promise.value
@@ -198,7 +198,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('keyup', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('keyup', r, { once: true }))"
- }
+ },
)
val time = SystemClock.uptimeMillis()
val keyEvent = KeyEvent(time, time, KeyEvent.ACTION_DOWN, keyCode, 0)
@@ -225,7 +225,7 @@ class TextInputDelegateTest : BaseSessionTest() {
assertThat(
"Reason should be correct",
reason,
- equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS)
+ equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS),
)
}
})
@@ -237,7 +237,7 @@ class TextInputDelegateTest : BaseSessionTest() {
assertThat(
"Reason should be correct",
reason,
- equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_BLUR)
+ equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_BLUR),
)
}
@@ -275,7 +275,7 @@ class TextInputDelegateTest : BaseSessionTest() {
assertThat(
"Reason should be correct",
reason,
- equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS)
+ equalTo(GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS),
)
}
@@ -302,7 +302,7 @@ class TextInputDelegateTest : BaseSessionTest() {
mainSession.waitUntilCalled(
GeckoSession.TextInputDelegate::class,
"restartInput",
- "showSoftInput"
+ "showSoftInput",
)
// We should get a pair of restartInput calls for the blur/focus,
@@ -318,9 +318,9 @@ class TextInputDelegateTest : BaseSessionTest() {
equalTo(
forEachCall(
GeckoSession.TextInputDelegate.RESTART_REASON_BLUR,
- GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS
- )
- )
+ GeckoSession.TextInputDelegate.RESTART_REASON_FOCUS,
+ ),
+ ),
)
}
@@ -387,7 +387,7 @@ class TextInputDelegateTest : BaseSessionTest() {
message: String,
ic: InputConnection,
expected: String,
- checkGecko: Boolean = true
+ checkGecko: Boolean = true,
) {
processChildEvents()
processParentEvents()
@@ -403,7 +403,7 @@ class TextInputDelegateTest : BaseSessionTest() {
ic: InputConnection,
start: Int,
end: Int,
- checkGecko: Boolean = true
+ checkGecko: Boolean = true,
) {
processChildEvents()
processParentEvents()
@@ -421,7 +421,7 @@ class TextInputDelegateTest : BaseSessionTest() {
message: String,
ic: InputConnection,
value: Int,
- checkGecko: Boolean = true
+ checkGecko: Boolean = true,
) =
assertSelection(message, ic, value, value, checkGecko)
@@ -431,7 +431,7 @@ class TextInputDelegateTest : BaseSessionTest() {
expected: String,
start: Int,
end: Int,
- checkGecko: Boolean = true
+ checkGecko: Boolean = true,
) {
processChildEvents()
processParentEvents()
@@ -452,15 +452,15 @@ class TextInputDelegateTest : BaseSessionTest() {
ic: InputConnection,
expected: String,
value: Int,
- checkGecko: Boolean = true
+ checkGecko: Boolean = true,
) =
assertTextAndSelection(message, ic, expected, value, value, checkGecko)
private fun setupContent(content: String) {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "dom.select_events.textcontrols.enabled" to true
- )
+ "dom.select_events.textcontrols.enabled" to true,
+ ),
)
mainSession.textInput.view = View(InstrumentationRegistry.getInstrumentation().targetContext)
@@ -501,7 +501,7 @@ class TextInputDelegateTest : BaseSessionTest() {
ic,
"foo",
0,
- 3
+ 3,
)
setSelection(ic, 3, 3)
assertSelectionAt("Can collapse selection", ic, 3)
@@ -530,7 +530,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can commit text (select after)",
ic,
"foobar",
- 6
+ 6,
)
commitText(ic, "foo", -1) // Selection at start of new text
assertTextAndSelectionAt(
@@ -538,7 +538,7 @@ class TextInputDelegateTest : BaseSessionTest() {
ic,
"foobarfoo",
5, /* checkGecko */
- false
+ false,
)
}
@@ -564,14 +564,14 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can delete text before",
ic,
"foobrfoo",
- 4
+ 4,
)
deleteSurroundingText(ic, 1, 1)
assertTextAndSelectionAt(
"Can delete text before/after",
ic,
"foofoo",
- 3
+ 3,
)
deleteSurroundingText(ic, 0, 10)
assertTextAndSelectionAt("Can delete text after", ic, "foo", 3)
@@ -625,7 +625,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set composing region text",
ic,
"farbar",
- 3
+ 3,
)
ic.setComposingRegion(1, 4)
@@ -633,7 +633,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set existing composing region",
ic,
"farbar",
- 3
+ 3,
)
setComposingText(ic, "rab", 3)
@@ -642,7 +642,7 @@ class TextInputDelegateTest : BaseSessionTest() {
ic,
"frabar",
6, /* checkGecko */
- false
+ false,
)
finishComposingText(ic)
@@ -665,14 +665,14 @@ class TextInputDelegateTest : BaseSessionTest() {
assertThat(
"Can retrieve text before cursor",
"foo",
- equalTo(ic.getTextBeforeCursor(3, 0))
+ equalTo(ic.getTextBeforeCursor(3, 0)),
)
// Test getTextAfterCursor
assertThat(
"Can retrieve text after cursor",
"bar",
- equalTo(ic.getTextAfterCursor(3, 0))
+ equalTo(ic.getTextAfterCursor(3, 0)),
)
}
@@ -695,7 +695,7 @@ class TextInputDelegateTest : BaseSessionTest() {
time,
KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_SHIFT_LEFT,
- 0
+ 0,
)
ic.sendKeyEvent(shiftKey)
pressKey(ic, KeyEvent.KEYCODE_DPAD_LEFT)
@@ -718,7 +718,7 @@ class TextInputDelegateTest : BaseSessionTest() {
time,
KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_SHIFT_LEFT,
- 0
+ 0,
)
ic.sendKeyEvent(shiftKey)
pressKey(ic, KeyEvent.KEYCODE_DPAD_RIGHT)
@@ -749,7 +749,7 @@ class TextInputDelegateTest : BaseSessionTest() {
time,
KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_SHIFT_LEFT,
- 0
+ 0,
)
// Wait for selection change
@@ -758,7 +758,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('selectionchange', r, { once: true }))"
"#contenteditable" -> "new Promise(r => document.addEventListener('selectionchange', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('selectionchange', r, { once: true }))"
- }
+ },
)
ic.sendKeyEvent(shiftKey)
@@ -775,14 +775,14 @@ class TextInputDelegateTest : BaseSessionTest() {
ic,
"frabar",
6,
- 5
+ 5,
)
promise = mainSession.evaluatePromiseJS(
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('input', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('input', r, { once: true }))"
- }
+ },
)
pressKey(ic, KeyEvent.KEYCODE_T)
@@ -808,7 +808,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Multiple setComposingText don't commit composition string",
ic,
"aab",
- 3
+ 3,
)
}
@@ -834,7 +834,7 @@ class TextInputDelegateTest : BaseSessionTest() {
assertThat(
"This test is only for contenteditable or designmode",
true,
- equalTo(true)
+ equalTo(true),
)
return
}
@@ -863,7 +863,7 @@ class TextInputDelegateTest : BaseSessionTest() {
}
}, { once: true }))
""".trimIndent()
- }
+ },
)
// InputContentInfo requires content:// uri, so we have to set test data to custom content provider.
@@ -897,14 +897,14 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set the same composing text",
ic,
"foo",
- 3
+ 3,
)
setComposingText(ic, "bar", 1)
assertTextAndSelectionAt(
"Can set different composing text",
ic,
"bar",
- 3
+ 3,
)
// Setting same text doesn't fire compositionupdate
ic.setComposingText("bar", 1)
@@ -912,7 +912,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set the same composing text",
ic,
"bar",
- 3
+ 3,
)
// Setting same text doesn't fire compositionupdate
ic.setComposingText("bar", 1)
@@ -920,7 +920,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set the same composing text again",
ic,
"bar",
- 3
+ 3,
)
finishComposingText(ic)
assertTextAndSelectionAt("Can finish composing text", ic, "bar", 3)
@@ -945,7 +945,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can commit ideographic space",
ic,
"\u3000",
- 1
+ 1,
)
}
@@ -971,7 +971,7 @@ class TextInputDelegateTest : BaseSessionTest() {
time,
KeyEvent.ACTION_DOWN,
KeyEvent.KEYCODE_SHIFT_LEFT,
- 0
+ 0,
)
ic.sendKeyEvent(shiftKey)
@@ -980,7 +980,7 @@ class TextInputDelegateTest : BaseSessionTest() {
when (id) {
"#designmode" -> "new Promise(r => document.querySelector('$id').contentDocument.addEventListener('input', r, { once: true }))"
else -> "new Promise(r => document.querySelector('$id').addEventListener('input', r, { once: true }))"
- }
+ },
)
pressKey(ic, KeyEvent.KEYCODE_DEL)
@@ -993,7 +993,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Cannot forward delete with shift+backspace",
ic,
"oo",
- 0
+ 0,
)
}
@@ -1013,14 +1013,14 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can commit then set composition",
ic,
"farbar",
- 6
+ 6,
)
setComposingText(ic, "baz", 1)
assertTextAndSelectionAt(
"Composition still exists after setting",
ic,
"farbaz",
- 6
+ 6,
)
finishComposingText(ic)
@@ -1054,7 +1054,7 @@ class TextInputDelegateTest : BaseSessionTest() {
window.addEventListener('input',() => {
window.addEventListener('keyup', r, { once: true }) },
{ once: true }) },
- { once: true}))"""
+ { once: true}))""",
)
ic.beginBatchEdit()
ic.setSelection(0, 3)
@@ -1093,8 +1093,8 @@ class TextInputDelegateTest : BaseSessionTest() {
InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE
- }
- )
+ },
+ ),
)
}
@@ -1157,8 +1157,8 @@ class TextInputDelegateTest : BaseSessionTest() {
InputType.TYPE_CLASS_TEXT or
InputType.TYPE_TEXT_VARIATION_URI
else -> 0
- }
- )
+ },
+ ),
)
}
}
@@ -1183,7 +1183,7 @@ class TextInputDelegateTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
document.querySelector('$id').enterKeyHint = '$enterkeyhint';
- document.querySelector('$id').focus()"""
+ document.querySelector('$id').focus()""",
)
mainSession.waitUntilCalled(GeckoSession.TextInputDelegate::class, "restartInput")
@@ -1201,8 +1201,8 @@ class TextInputDelegateTest : BaseSessionTest() {
"search" -> EditorInfo.IME_ACTION_SEARCH
"send" -> EditorInfo.IME_ACTION_SEND
else -> EditorInfo.IME_ACTION_NONE
- }
- )
+ },
+ ),
)
mainSession.evaluateJS("document.querySelector('$id').blur()")
@@ -1230,7 +1230,7 @@ class TextInputDelegateTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
document.querySelector('$id').autocapitalize = '$autocapitalize';
- document.querySelector('$id').focus()"""
+ document.querySelector('$id').focus()""",
)
mainSession.waitUntilCalled(GeckoSession.TextInputDelegate::class, "restartInput")
@@ -1246,8 +1246,8 @@ class TextInputDelegateTest : BaseSessionTest() {
"sentences" -> InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
"words" -> InputType.TYPE_TEXT_FLAG_CAP_WORDS
else -> 0
- }
- )
+ },
+ ),
)
mainSession.evaluateJS("document.querySelector('$id').blur()")
@@ -1318,7 +1318,7 @@ class TextInputDelegateTest : BaseSessionTest() {
document.querySelector('$id').blur();
document.querySelector('$id').focus();
})
- """
+ """,
)
setComposingText(ic, "b", 1)
@@ -1326,7 +1326,7 @@ class TextInputDelegateTest : BaseSessionTest() {
"Don't change caret position after calling blur and focus",
ic,
"b",
- 1
+ 1,
)
setComposingText(ic, "a", 1)
@@ -1334,14 +1334,14 @@ class TextInputDelegateTest : BaseSessionTest() {
"Can set composition string after calling blur and focus",
ic,
"ba",
- 2
+ 2,
)
pressKey(ic, KeyEvent.KEYCODE_R)
assertText(
"Can set input string by keypress after calling blur and focus",
ic,
- "bar"
+ "bar",
)
}
@@ -1364,7 +1364,7 @@ class TextInputDelegateTest : BaseSessionTest() {
document.querySelector('$id').addEventListener('input', () => {
input_event_count++;
})
- """
+ """,
)
setComposingText(ic, "barbaz", 1)
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt
index 1255dd823b584e4c16f239d616a7f69af30056fb..2e340c09c25e518038fd11cf29410d6af2756254 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt
@@ -43,7 +43,7 @@ class VerticalClippingTest : BaseSessionTest() {
SCREEN_HEIGHT - BANNER_HEIGHT - bottomOffset,
SCREEN_WIDTH.toFloat(),
(SCREEN_HEIGHT - bottomOffset).toFloat(),
- paint
+ paint,
)
return screenshotFile
@@ -54,7 +54,7 @@ class VerticalClippingTest : BaseSessionTest() {
assertThat(
"Screenshot is not null",
it,
- notNullValue()
+ notNullValue(),
)
assertThat("Widths are the same", comparisonImage.width, equalTo(it.width))
assertThat("Heights are the same", comparisonImage.height, equalTo(it.height))
@@ -63,7 +63,7 @@ class VerticalClippingTest : BaseSessionTest() {
assertThat(
"Images are almost identical",
ScreenshotTest.Companion.imageElementDifference(comparisonImage, it),
- Matchers.lessThanOrEqualTo(1)
+ Matchers.lessThanOrEqualTo(1),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt
index 90d1118b2d0776d56643dd5687df0e1ff6c0a660..3f4af40a0bb1ee6abf0703a311775a04097a4992 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt
@@ -44,7 +44,7 @@ class WebExecutorTest {
@JvmStatic
val parameters: List<Array<out Any>> = listOf(
arrayOf("#conservative"),
- arrayOf("#normal")
+ arrayOf("#normal"),
)
}
@@ -239,12 +239,12 @@ class WebExecutorTest {
assertThat(
"Subject should match",
response.certificate?.subjectX500Principal?.name,
- equalTo(expectedSubject)
+ equalTo(expectedSubject),
)
assertThat(
"Issuer should match",
response.certificate?.issuerX500Principal?.name,
- equalTo(expectedIssuer)
+ equalTo(expectedIssuer),
)
}
@@ -261,14 +261,14 @@ class WebExecutorTest {
assertThat(
"Body should match",
body.getJSONObject("cookies").getString("uptimeMillis"),
- equalTo(uptimeMillis.toString())
+ equalTo(uptimeMillis.toString()),
)
val anotherBody = fetch(webRequest("$TEST_ENDPOINT/cookies")).getJSONBody()
assertThat(
"Body should match",
anotherBody.getJSONObject("cookies").getString("uptimeMillis"),
- equalTo(uptimeMillis.toString())
+ equalTo(uptimeMillis.toString()),
)
}
@@ -285,7 +285,7 @@ class WebExecutorTest {
assertThat(
"Cookies should not be set for the test server",
body.getJSONObject("cookies").length(),
- equalTo(0)
+ equalTo(0),
)
}
@@ -296,7 +296,7 @@ class WebExecutorTest {
val response = fetch(
webRequest("$TEST_ENDPOINT/cookies"),
- GeckoWebExecutor.FETCH_FLAGS_ANONYMOUS
+ GeckoWebExecutor.FETCH_FLAGS_ANONYMOUS,
)
assertThat("Status code should match", response.statusCode, equalTo(200))
@@ -311,7 +311,7 @@ class WebExecutorTest {
clearData.completeFrom(
RuntimeCreator.getRuntime()
.storageController
- .clearData(StorageController.ClearFlags.ALL)
+ .clearData(StorageController.ClearFlags.ALL),
)
}
@@ -328,21 +328,21 @@ class WebExecutorTest {
assertThat(
"Cookies should be set for the test server",
body.getJSONObject("cookies").getString("uptimeMillis"),
- equalTo(uptimeMillis.toString())
+ equalTo(uptimeMillis.toString()),
)
val anotherBody = fetch(webRequest("$TEST_ENDPOINT/cookies"), GeckoWebExecutor.FETCH_FLAGS_PRIVATE).getJSONBody()
assertThat(
"Body should match",
anotherBody.getJSONObject("cookies").getString("uptimeMillis"),
- equalTo(uptimeMillis.toString())
+ equalTo(uptimeMillis.toString()),
)
val yetAnotherBody = fetch(webRequest("$TEST_ENDPOINT/cookies")).getJSONBody()
assertThat(
"Cookies set in private session are not supposed to be seen in normal download",
yetAnotherBody.getJSONObject("cookies").length(),
- equalTo(0)
+ equalTo(0),
)
}
@@ -362,17 +362,17 @@ class WebExecutorTest {
assertThat(
"Addresses should not be null",
addresses,
- notNullValue()
+ notNullValue(),
)
assertThat(
"First address should be loopback",
addresses.first().isLoopbackAddress,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"First address size should be 4",
addresses.first().address.size,
- equalTo(4)
+ equalTo(4),
)
}
@@ -383,17 +383,17 @@ class WebExecutorTest {
assertThat(
"Addresses should not be null",
addresses,
- notNullValue()
+ notNullValue(),
)
assertThat(
"First address should be loopback",
addresses.first().isLoopbackAddress,
- equalTo(true)
+ equalTo(true),
)
assertThat(
"First address size should be 16",
addresses.first().address.size,
- equalTo(16)
+ equalTo(16),
)
}
@@ -428,7 +428,7 @@ class WebExecutorTest {
assertThat(
"Hashes should match",
response.headers["X-SHA-256"],
- equalTo(String.format("%064x", BigInteger(1, digest)))
+ equalTo(String.format("%064x", BigInteger(1, digest))),
)
}
@@ -437,7 +437,7 @@ class WebExecutorTest {
val expectedCount = 1 * 1024 * 1024 // 1MB
val response = executor.fetch(
webRequest("$TEST_ENDPOINT/bytes/$expectedCount"),
- GeckoWebExecutor.FETCH_FLAGS_STREAM_FAILURE_TEST
+ GeckoWebExecutor.FETCH_FLAGS_STREAM_FAILURE_TEST,
).pollDefault()!!
assertThat("Status code should match", response.statusCode, equalTo(200))
@@ -507,7 +507,7 @@ class WebExecutorTest {
"1234567890" to "1234567890",
"12345678901" to "1234567890",
"file://test" to "file://tes",
- "moz-extension://what" to "moz-extens"
+ "moz-extension://what" to "moz-extens",
)
for ((uri, truncated) in illegal) {
@@ -518,7 +518,7 @@ class WebExecutorTest {
assertThat(
"Message should match",
e.message,
- equalTo("Unsupported URI scheme: $truncated")
+ equalTo("Unsupported URI scheme: $truncated"),
)
}
}
@@ -526,7 +526,7 @@ class WebExecutorTest {
val legal = listOf(
"http://$TEST_ENDPOINT\n",
"http://$TEST_ENDPOINT/🥲",
- "http://$TEST_ENDPOINT/abc"
+ "http://$TEST_ENDPOINT/abc",
)
for (uri in legal) {
@@ -537,7 +537,7 @@ class WebExecutorTest {
assertThat(
"Request should pass initial validation.",
true,
- equalTo(true)
+ equalTo(true),
)
}
}
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt
index d83980443be62bd0c77bdc9b7be1a070e620a352..65952ecfb272fc590ff6c45bc0465712ca478af2 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt
@@ -83,8 +83,8 @@ class WebExtensionTest : BaseSessionTest() {
// Load the WebExtension that will add a border to the body
val borderify = sessionRule.waitForResult(
controller.installBuiltIn(
- "resource://android/assets/web_extensions/borderify/"
- )
+ "resource://android/assets/web_extensions/borderify/",
+ ),
)
assertTrue(borderify.isBuiltIn)
@@ -110,7 +110,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"The border color should be '$expected'",
color as String,
- equalTo(expected)
+ equalTo(expected),
)
}
@@ -118,7 +118,7 @@ class WebExtensionTest : BaseSessionTest() {
extension: WebExtension,
userDisabled: Boolean = false,
appDisabled: Boolean = false,
- blocklistDisabled: Boolean = false
+ blocklistDisabled: Boolean = false,
) {
val enabled = !userDisabled && !appDisabled && !blocklistDisabled
@@ -135,22 +135,22 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"enabled should match",
extension.metaData.enabled,
- equalTo(enabled)
+ equalTo(enabled),
)
assertThat(
"userDisabled should match",
extension.metaData.disabledFlags and DisabledFlags.USER > 0,
- equalTo(userDisabled)
+ equalTo(userDisabled),
)
assertThat(
"appDisabled should match",
extension.metaData.disabledFlags and DisabledFlags.APP > 0,
- equalTo(appDisabled)
+ equalTo(appDisabled),
)
assertThat(
"blocklistDisabled should match",
extension.metaData.disabledFlags and DisabledFlags.BLOCKLIST > 0,
- equalTo(blocklistDisabled)
+ equalTo(blocklistDisabled),
)
}
@@ -161,14 +161,14 @@ class WebExtensionTest : BaseSessionTest() {
"""
const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
await browser.tabs.update(tab.id, { url: "www.google.com" });
- """
+ """,
)
assertThat("tabs.update should not succeed", true, equalTo(false))
} catch (ex: RejectedPromiseException) {
assertThat(
"Error message matches",
ex.message,
- equalTo("Error: tabs.update is not supported")
+ equalTo("Error: tabs.update is not supported"),
)
}
@@ -177,14 +177,14 @@ class WebExtensionTest : BaseSessionTest() {
"""
const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
await browser.tabs.remove(tab.id);
- """
+ """,
)
assertThat("tabs.remove should not succeed", true, equalTo(false))
} catch (ex: RejectedPromiseException) {
assertThat(
"Error message matches",
ex.message,
- equalTo("Error: tabs.remove is not supported")
+ equalTo("Error: tabs.remove is not supported"),
)
}
@@ -192,18 +192,18 @@ class WebExtensionTest : BaseSessionTest() {
sessionRule.evaluateExtensionJS(
"""
await browser.runtime.openOptionsPage();
- """
+ """,
)
assertThat(
"runtime.openOptionsPage should not succeed",
true,
- equalTo(false)
+ equalTo(false),
)
} catch (ex: RejectedPromiseException) {
assertThat(
"Error message matches",
ex.message,
- equalTo("Error: runtime.openOptionsPage is not supported")
+ equalTo("Error: runtime.openOptionsPage is not supported"),
)
}
}
@@ -248,7 +248,7 @@ class WebExtensionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onInstalled(extension: WebExtension) {}
- }
+ },
)
// First let's check that the color of the border is empty before loading
@@ -256,7 +256,7 @@ class WebExtensionTest : BaseSessionTest() {
assertBodyBorderEqualTo("")
var borderify = sessionRule.waitForResult(
- controller.install("resource://android/assets/web_extensions/borderify.xpi")
+ controller.install("resource://android/assets/web_extensions/borderify.xpi"),
)
checkDisabledState(borderify, userDisabled = false, appDisabled = false)
@@ -300,7 +300,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onInstallPrompt(extension: WebExtension): GeckoResult<AllowOrDeny> {
assertEquals(
extension.metaData.description,
- "Adds a red border to all webpages matching example.com."
+ "Adds a red border to all webpages matching example.com.",
)
assertEquals(extension.metaData.name, "Borderify")
assertEquals(extension.metaData.version, "1.0")
@@ -308,11 +308,11 @@ class WebExtensionTest : BaseSessionTest() {
assertEquals(extension.metaData.enabled, false)
assertEquals(
extension.metaData.signedState,
- WebExtension.SignedStateFlags.SIGNED
+ WebExtension.SignedStateFlags.SIGNED,
)
assertEquals(
extension.metaData.blocklistState,
- WebExtension.BlocklistStateFlags.NOT_BLOCKED
+ WebExtension.BlocklistStateFlags.NOT_BLOCKED,
)
return GeckoResult.allow()
@@ -320,7 +320,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val borderify = sessionRule.waitForResult(
- controller.install("resource://android/assets/web_extensions/borderify.xpi")
+ controller.install("resource://android/assets/web_extensions/borderify.xpi"),
)
mainSession.reload()
@@ -365,7 +365,7 @@ class WebExtensionTest : BaseSessionTest() {
})
var borderify = sessionRule.waitForResult(
- controller.install("resource://android/assets/web_extensions/borderify.xpi")
+ controller.install("resource://android/assets/web_extensions/borderify.xpi"),
)
// Make sure private mode is enabled
@@ -375,7 +375,7 @@ class WebExtensionTest : BaseSessionTest() {
assertBodyBorderEqualTo("")
borderify = sessionRule.waitForResult(
- controller.setAllowedInPrivateBrowsing(borderify, true)
+ controller.setAllowedInPrivateBrowsing(borderify, true),
)
assertTrue(borderify.metaData.allowedInPrivateBrowsing)
@@ -386,7 +386,7 @@ class WebExtensionTest : BaseSessionTest() {
assertBodyBorderEqualTo("red")
borderify = sessionRule.waitForResult(
- controller.setAllowedInPrivateBrowsing(borderify, false)
+ controller.setAllowedInPrivateBrowsing(borderify, false),
)
assertFalse(borderify.metaData.allowedInPrivateBrowsing)
@@ -408,8 +408,8 @@ class WebExtensionTest : BaseSessionTest() {
// dummy.xpi is not signed, but it could be
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "xpinstall.signatures.required" to false
- )
+ "xpinstall.signatures.required" to false,
+ ),
)
sessionRule.delegateDuringNextWait(object : WebExtensionController.PromptDelegate {
@@ -420,7 +420,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val dummy = sessionRule.waitForResult(
- controller.install("resource://android/assets/web_extensions/dummy.xpi")
+ controller.install("resource://android/assets/web_extensions/dummy.xpi"),
)
val metadata = dummy.metaData
@@ -436,8 +436,8 @@ class WebExtensionTest : BaseSessionTest() {
// dummy.xpi is not signed, but it could be
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "xpinstall.signatures.required" to false
- )
+ "xpinstall.signatures.required" to false,
+ ),
)
// First, make sure the list only contains the test support extension
@@ -454,14 +454,14 @@ class WebExtensionTest : BaseSessionTest() {
// Install in parallell borderify and dummy
val borderifyResult = controller.install(
- "resource://android/assets/web_extensions/borderify.xpi"
+ "resource://android/assets/web_extensions/borderify.xpi",
)
val dummyResult = controller.install(
- "resource://android/assets/web_extensions/dummy.xpi"
+ "resource://android/assets/web_extensions/dummy.xpi",
)
val (borderify, dummy) = sessionRule.waitForResult(
- GeckoResult.allOf(borderifyResult, dummyResult)
+ GeckoResult.allOf(borderifyResult, dummyResult),
)
// Make sure the list is updated accordingly
@@ -504,7 +504,7 @@ class WebExtensionTest : BaseSessionTest() {
}, { exception ->
val installException = exception as WebExtension.InstallException
assertEquals(installException.code, expectedError)
- })
+ }),
)
}
@@ -520,8 +520,8 @@ class WebExtensionTest : BaseSessionTest() {
fun installUnsignedExtensionSignatureNotRequired() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "xpinstall.signatures.required" to false
- )
+ "xpinstall.signatures.required" to false,
+ ),
)
sessionRule.delegateDuringNextWait(object : WebExtensionController.PromptDelegate {
@@ -532,20 +532,20 @@ class WebExtensionTest : BaseSessionTest() {
val borderify = sessionRule.waitForResult(
controller.install(
- "resource://android/assets/web_extensions/borderify-unsigned.xpi"
+ "resource://android/assets/web_extensions/borderify-unsigned.xpi",
)
.then { extension ->
assertEquals(
extension!!.metaData.signedState,
- WebExtension.SignedStateFlags.MISSING
+ WebExtension.SignedStateFlags.MISSING,
)
assertEquals(
extension.metaData.blocklistState,
- WebExtension.BlocklistStateFlags.NOT_BLOCKED
+ WebExtension.BlocklistStateFlags.NOT_BLOCKED,
)
assertEquals(extension.metaData.name, "Borderify")
GeckoResult.fromValue(extension)
- }
+ },
)
sessionRule.waitForResult(controller.uninstall(borderify))
@@ -555,12 +555,12 @@ class WebExtensionTest : BaseSessionTest() {
fun installUnsignedExtensionSignatureRequired() {
sessionRule.setPrefsUntilTestEnd(
mapOf(
- "xpinstall.signatures.required" to true
- )
+ "xpinstall.signatures.required" to true,
+ ),
)
testInstallError(
"borderify-unsigned.xpi",
- WebExtension.InstallException.ErrorCodes.ERROR_SIGNEDSTATE_REQUIRED
+ WebExtension.InstallException.ErrorCodes.ERROR_SIGNEDSTATE_REQUIRED,
)
}
@@ -568,7 +568,7 @@ class WebExtensionTest : BaseSessionTest() {
fun installExtensionFileNotFound() {
testInstallError(
"file-not-found.xpi",
- WebExtension.InstallException.ErrorCodes.ERROR_NETWORK_FAILURE
+ WebExtension.InstallException.ErrorCodes.ERROR_NETWORK_FAILURE,
)
}
@@ -576,7 +576,7 @@ class WebExtensionTest : BaseSessionTest() {
fun installExtensionMissingId() {
testInstallError(
"borderify-missing-id.xpi",
- WebExtension.InstallException.ErrorCodes.ERROR_CORRUPT_FILE
+ WebExtension.InstallException.ErrorCodes.ERROR_CORRUPT_FILE,
)
}
@@ -603,7 +603,7 @@ class WebExtensionTest : BaseSessionTest() {
assertTrue(exception is WebExtension.InstallException)
val installException = exception as WebExtension.InstallException
assertEquals(installException.code, WebExtension.InstallException.ErrorCodes.ERROR_USER_CANCELED)
- })
+ }),
)
mainSession.reload()
@@ -622,7 +622,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val extension = sessionRule.waitForResult(
- controller.installBuiltIn("resource://android/assets/web_extensions/notification-test/")
+ controller.installBuiltIn("resource://android/assets/web_extensions/notification-test/"),
)
sessionRule.waitUntilCalled(object : WebNotificationDelegate {
@@ -637,7 +637,7 @@ class WebExtensionTest : BaseSessionTest() {
})
sessionRule.waitForResult(
- controller.uninstall(extension)
+ controller.uninstall(extension),
)
}
@@ -665,7 +665,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
checkSender(nativeApp, sender, background)
@@ -673,7 +673,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"We should receive a message from the WebExtension",
message as String,
- equalTo("${prefix}BrowserMessage")
+ equalTo("${prefix}BrowserMessage"),
)
awaitingResponse = true
return GeckoResult.fromValue("${prefix}MessageResponse")
@@ -681,7 +681,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"The background script should receive our message and respond",
message as String,
- equalTo("response: ${prefix}MessageResponse")
+ equalTo("response: ${prefix}MessageResponse"),
)
messageResult.complete(null)
completed = true
@@ -763,7 +763,7 @@ class WebExtensionTest : BaseSessionTest() {
fun testBrowserTabsCreateBrowserTabsRemove() {
val onCloseRequestResult = GeckoResult<Void>()
val tabsExtension = sessionRule.waitForResult(
- controller.installBuiltIn(TABS_CREATE_REMOVE_BACKGROUND)
+ controller.installBuiltIn(TABS_CREATE_REMOVE_BACKGROUND),
)
tabsExtension.tabDelegate = object : WebExtension.TabDelegate {
@@ -781,7 +781,7 @@ class WebExtensionTest : BaseSessionTest() {
onCloseRequestResult.complete(null)
return GeckoResult.allow()
}
- }
+ },
)
return GeckoResult.fromValue(extensionCreatedSession)
@@ -808,7 +808,7 @@ class WebExtensionTest : BaseSessionTest() {
fun testSetTabActive() {
val onCloseRequestResult = GeckoResult<Void>()
val tabsExtension = sessionRule.waitForResult(
- controller.installBuiltIn(TABS_ACTIVATE_REMOVE_BACKGROUND)
+ controller.installBuiltIn(TABS_ACTIVATE_REMOVE_BACKGROUND),
)
val newTabSession = sessionRule.createOpenSession(mainSession.settings)
@@ -824,7 +824,7 @@ class WebExtensionTest : BaseSessionTest() {
onCloseRequestResult.complete(null)
return GeckoResult.allow()
}
- }
+ },
)
controller.setTabActive(mainSession, false)
@@ -837,12 +837,12 @@ class WebExtensionTest : BaseSessionTest() {
private fun browsingDataMessage(
port: WebExtension.Port,
type: String,
- since: Long? = null
+ since: Long? = null,
): GeckoResult<JSONObject> {
val message = JSONObject(
"{" +
"\"type\": \"$type\"" +
- "}"
+ "}",
)
if (since != null) {
message.put("since", since)
@@ -852,7 +852,7 @@ class WebExtensionTest : BaseSessionTest() {
private fun browsingDataCall(
port: WebExtension.Port,
- json: JSONObject
+ json: JSONObject,
): GeckoResult<JSONObject> {
val uuid = UUID.randomUUID().toString()
json.put("uuid", uuid)
@@ -864,7 +864,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Response ID Matches.",
(message as JSONObject).getString("uuid"),
- equalTo(uuid)
+ equalTo(uuid),
)
response.complete(message)
}
@@ -878,12 +878,12 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
val extension = sessionRule.waitForResult(
- controller.installBuiltIn(BROWSING_DATA)
+ controller.installBuiltIn(BROWSING_DATA),
)
val portResult = GeckoResult<WebExtension.Port>()
@@ -893,7 +893,7 @@ class WebExtensionTest : BaseSessionTest() {
portResult.complete(port)
}
},
- "browser"
+ "browser",
)
val TEST_SINCE_VALUE = 59294
@@ -908,11 +908,11 @@ class WebExtensionTest : BaseSessionTest() {
WebExtension.BrowsingDataDelegate.Settings(
TEST_SINCE_VALUE,
CACHE or COOKIES or DOWNLOADS or HISTORY or LOCAL_STORAGE,
- CACHE or COOKIES or HISTORY
- )
+ CACHE or COOKIES or HISTORY,
+ ),
)
}
- }
+ },
)
val port = sessionRule.waitForResult(portResult)
@@ -924,7 +924,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(1234L)
+ equalTo(1234L),
)
return null
}
@@ -938,7 +938,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(1234L)
+ equalTo(1234L),
)
return null
}
@@ -952,7 +952,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(1234L)
+ equalTo(1234L),
)
return null
}
@@ -966,7 +966,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(1234L)
+ equalTo(1234L),
)
return null
}
@@ -980,7 +980,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return null
}
@@ -993,14 +993,14 @@ class WebExtensionTest : BaseSessionTest() {
"\"type\": \"clear\"," +
"\"removalOptions\": {}," +
"\"dataTypes\": {\"indexedDB\": true, \"localStorage\": true, \"passwords\": true}" +
- "}"
- )
- )
+ "}",
+ ),
+ ),
)
assertThat(
"browsingData.remove should succeed",
response.getString("type"),
- equalTo("response")
+ equalTo("response"),
)
// Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
@@ -1010,7 +1010,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return null
}
@@ -1020,7 +1020,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return null
}
@@ -1033,14 +1033,14 @@ class WebExtensionTest : BaseSessionTest() {
"\"type\": \"clear\"," +
"\"removalOptions\": {}," +
"\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
- "}"
- )
- )
+ "}",
+ ),
+ ),
)
assertThat(
"browsingData.remove should succeed",
response.getString("type"),
- equalTo("response")
+ equalTo("response"),
)
// Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
@@ -1051,7 +1051,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return null
}
@@ -1061,7 +1061,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return GeckoResult.fromException(RuntimeException("Not authorized."))
}
@@ -1074,14 +1074,14 @@ class WebExtensionTest : BaseSessionTest() {
"\"type\": \"clear\"," +
"\"removalOptions\": {}," +
"\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
- "}"
- )
- )
+ "}",
+ ),
+ ),
)
assertThat(
"browsingData.remove returns expected error.",
response.getString("error"),
- equalTo("Not authorized.")
+ equalTo("Not authorized."),
)
// Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
@@ -1092,7 +1092,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return GeckoResult.fromException(RuntimeException("Not authorized passwords."))
}
@@ -1102,7 +1102,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"timestamp should match",
sinceUnixTimestamp,
- equalTo(0L)
+ equalTo(0L),
)
return GeckoResult.fromException(RuntimeException("Not authorized history."))
}
@@ -1115,20 +1115,20 @@ class WebExtensionTest : BaseSessionTest() {
"\"type\": \"clear\"," +
"\"removalOptions\": {}," +
"\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
- "}"
- )
- )
+ "}",
+ ),
+ ),
)
val error = response.getString("error")
assertThat(
"browsingData.remove returns expected error.",
error == "Not authorized passwords." || error == "Not authorized history.",
- equalTo(true)
+ equalTo(true),
)
// Test browsingData.settings()
response = sessionRule.waitForResult(
- browsingDataMessage(port, "get-settings")
+ browsingDataMessage(port, "get-settings"),
)
val settings = response.getJSONObject("result")
@@ -1138,20 +1138,20 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Since should be correct",
options.getInt("since"),
- equalTo(TEST_SINCE_VALUE)
+ equalTo(TEST_SINCE_VALUE),
)
for (key in listOf("cache", "cookies", "history")) {
assertThat(
"Data to remove should be correct",
dataToRemove.getBoolean(key),
- equalTo(true)
+ equalTo(true),
)
}
for (key in listOf("downloads", "localStorage")) {
assertThat(
"Data to remove should be correct",
dataToRemove.getBoolean(key),
- equalTo(false)
+ equalTo(false),
)
}
@@ -1160,7 +1160,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Data removal permitted should be correct",
dataRemovalPermitted.getBoolean(key),
- equalTo(true)
+ equalTo(true),
)
}
@@ -1171,12 +1171,12 @@ class WebExtensionTest : BaseSessionTest() {
}
})
response = sessionRule.waitForResult(
- browsingDataMessage(port, "get-settings")
+ browsingDataMessage(port, "get-settings"),
)
assertThat(
"browsingData.settings returns expected error.",
response.getString("error"),
- equalTo("browsingData.settings is not supported")
+ equalTo("browsingData.settings is not supported"),
)
sessionRule.waitForResult(controller.uninstall(extension))
@@ -1188,8 +1188,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
sessionRule.delegateDuringNextWait(object : WebExtensionController.PromptDelegate {
@@ -1199,7 +1199,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val extension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/browsing-data.xpi")
+ controller.install("https://example.org/tests/junit/browsing-data.xpi"),
)
val accumulator = mutableListOf<String>()
@@ -1244,9 +1244,9 @@ class WebExtensionTest : BaseSessionTest() {
"formData 10002",
"history 10003",
"passwords 10004",
- "downloads 10005"
- )
- )
+ "downloads 10005",
+ ),
+ ),
)
sessionRule.waitForResult(controller.uninstall(extension))
@@ -1259,8 +1259,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
val onCloseRequestResult = GeckoResult<Void>()
@@ -1272,7 +1272,7 @@ class WebExtensionTest : BaseSessionTest() {
}
})
val tabsExtension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/tabs-activate-remove.xpi")
+ controller.install("https://example.org/tests/junit/tabs-activate-remove.xpi"),
)
sessionRule.delegateDuringNextWait(object : WebExtensionController.PromptDelegate {
@@ -1282,17 +1282,17 @@ class WebExtensionTest : BaseSessionTest() {
}
})
var tabsExtensionPB = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/tabs-activate-remove-2.xpi")
+ controller.install("https://example.org/tests/junit/tabs-activate-remove-2.xpi"),
)
tabsExtensionPB = sessionRule.waitForResult(
- controller.setAllowedInPrivateBrowsing(tabsExtensionPB, true)
+ controller.setAllowedInPrivateBrowsing(tabsExtensionPB, true),
)
val newTabSession = sessionRule.createOpenSession(mainSession.settings)
val newPrivateSession = sessionRule.createOpenSession(
- GeckoSessionSettings.Builder().usePrivateMode(true).build()
+ GeckoSessionSettings.Builder().usePrivateMode(true).build(),
)
val privateBrowsingNewTabSession = GeckoResult<Void>()
@@ -1300,12 +1300,12 @@ class WebExtensionTest : BaseSessionTest() {
class TabDelegate(
val result: GeckoResult<Void>,
val extension: WebExtension,
- val expectedSession: GeckoSession
+ val expectedSession: GeckoSession,
) :
WebExtension.SessionTabDelegate {
override fun onCloseTab(
source: WebExtension?,
- session: GeckoSession
+ session: GeckoSession,
): GeckoResult<AllowOrDeny> {
assertEquals(extension.id, source!!.id)
assertEquals(expectedSession, session)
@@ -1316,19 +1316,19 @@ class WebExtensionTest : BaseSessionTest() {
newTabSession.webExtensionController.setTabDelegate(
tabsExtensionPB,
- TabDelegate(privateBrowsingNewTabSession, tabsExtensionPB, newTabSession)
+ TabDelegate(privateBrowsingNewTabSession, tabsExtensionPB, newTabSession),
)
newTabSession.webExtensionController.setTabDelegate(
tabsExtension,
- TabDelegate(onCloseRequestResult, tabsExtension, newTabSession)
+ TabDelegate(onCloseRequestResult, tabsExtension, newTabSession),
)
val privateBrowsingPrivateSession = GeckoResult<Void>()
newPrivateSession.webExtensionController.setTabDelegate(
tabsExtensionPB,
- TabDelegate(privateBrowsingPrivateSession, tabsExtensionPB, newPrivateSession)
+ TabDelegate(privateBrowsingPrivateSession, tabsExtensionPB, newPrivateSession),
)
// tabsExtension is not allowed in private browsing and shouldn't get this event
@@ -1337,14 +1337,14 @@ class WebExtensionTest : BaseSessionTest() {
object : WebExtension.SessionTabDelegate {
override fun onCloseTab(
source: WebExtension?,
- session: GeckoSession
+ session: GeckoSession,
): GeckoResult<AllowOrDeny> {
privateBrowsingPrivateSession.completeExceptionally(
- RuntimeException("Should never happen")
+ RuntimeException("Should never happen"),
)
return GeckoResult.allow()
}
- }
+ },
)
controller.setTabActive(mainSession, false)
@@ -1359,10 +1359,10 @@ class WebExtensionTest : BaseSessionTest() {
sessionRule.waitForResult(privateBrowsingNewTabSession)
sessionRule.waitForResult(
- sessionRule.runtime.webExtensionController.uninstall(tabsExtension)
+ sessionRule.runtime.webExtensionController.uninstall(tabsExtension),
)
sessionRule.waitForResult(
- sessionRule.runtime.webExtensionController.uninstall(tabsExtensionPB)
+ sessionRule.runtime.webExtensionController.uninstall(tabsExtensionPB),
)
newTabSession.close()
@@ -1382,20 +1382,20 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
messageResult2.complete(message as String)
return null
}
},
- "browser2"
+ "browser2",
)
val message2 = sessionRule.waitForResult(messageResult2)
assertThat(
"Message is received correctly",
message2,
- equalTo("HELLO_FROM_PAGE_2")
+ equalTo("HELLO_FROM_PAGE_2"),
)
val messageResult1 = GeckoResult<String>()
@@ -1406,7 +1406,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
messageResult1.complete(message as String)
return null
@@ -1416,14 +1416,14 @@ class WebExtensionTest : BaseSessionTest() {
portResult.complete(port)
}
},
- "browser1"
+ "browser1",
)
val message1 = sessionRule.waitForResult(messageResult1)
assertThat(
"Message is received correctly",
message1,
- equalTo("HELLO_FROM_PAGE_1")
+ equalTo("HELLO_FROM_PAGE_1"),
)
val port = sessionRule.waitForResult(portResult)
@@ -1438,7 +1438,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Message is received correctly",
portMessage,
- equalTo("HELLO_FROM_PORT")
+ equalTo("HELLO_FROM_PORT"),
)
}
@@ -1452,7 +1452,7 @@ class WebExtensionTest : BaseSessionTest() {
assumeThat(sessionRule.env.isFission, equalTo(false))
val extension = sessionRule.waitForResult(
- controller.installBuiltIn(EXTENSION_PAGE_RESTORE)
+ controller.installBuiltIn(EXTENSION_PAGE_RESTORE),
)
mainSession.loadUri("${extension.metaData.baseUrl}tab.html")
@@ -1496,7 +1496,7 @@ class WebExtensionTest : BaseSessionTest() {
existingSession.waitForPageStop()
val tabsExtension = sessionRule.waitForResult(
- controller.installBuiltIn(TABS_REMOVE_BACKGROUND)
+ controller.installBuiltIn(TABS_REMOVE_BACKGROUND),
)
sessionRule.addExternalDelegateUntilTestEnd(
@@ -1509,7 +1509,7 @@ class WebExtensionTest : BaseSessionTest() {
onCloseRequestResult.complete(null)
return GeckoResult.allow()
}
- }
+ },
)
sessionRule.waitForResult(onCloseRequestResult)
@@ -1518,18 +1518,18 @@ class WebExtensionTest : BaseSessionTest() {
private fun installWebExtension(
background: Boolean,
- messageDelegate: WebExtension.MessageDelegate
+ messageDelegate: WebExtension.MessageDelegate,
): WebExtension {
val webExtension: WebExtension
if (background) {
webExtension = sessionRule.waitForResult(
- controller.installBuiltIn(MESSAGING_BACKGROUND)
+ controller.installBuiltIn(MESSAGING_BACKGROUND),
)
webExtension.setMessageDelegate(messageDelegate, "browser")
} else {
webExtension = sessionRule.waitForResult(
- controller.installBuiltIn(MESSAGING_CONTENT)
+ controller.installBuiltIn(MESSAGING_CONTENT),
)
mainSession.webExtensionController
.setMessageDelegate(webExtension, messageDelegate, "browser")
@@ -1573,7 +1573,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"We should receive a message from the WebExtension",
message as String,
- equalTo("${prefix}PortMessage")
+ equalTo("${prefix}PortMessage"),
)
port.postMessage(JSONObject("{\"message\": \"${prefix}PortMessageResponse\"}"))
awaitingResponse = true
@@ -1581,7 +1581,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"The background script should receive our message and respond",
message as String,
- equalTo("response: ${prefix}PortMessageResponse")
+ equalTo("response: ${prefix}PortMessageResponse"),
)
result.complete(null)
}
@@ -1604,7 +1604,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
// Ignored for this test
return null
@@ -1648,7 +1648,7 @@ class WebExtensionTest : BaseSessionTest() {
val portDelegate = object : WebExtension.PortDelegate {
override fun onPortMessage(
message: Any,
- port: WebExtension.Port
+ port: WebExtension.Port,
) {
assertEquals(port, messagingPort)
}
@@ -1685,7 +1685,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(messaging!!.id, sender.webExtension.id)
@@ -1727,17 +1727,17 @@ class WebExtensionTest : BaseSessionTest() {
assertEquals(
"Called from content script with background-only delegate.",
sender.environmentType,
- WebExtension.MessageSender.ENV_TYPE_EXTENSION
+ WebExtension.MessageSender.ENV_TYPE_EXTENSION,
)
assertTrue(
"Unexpected sender url",
- sender.url.endsWith("/_generated_background_page.html")
+ sender.url.endsWith("/_generated_background_page.html"),
)
} else {
assertEquals(
"Called from background script, expecting only content scripts",
sender.environmentType,
- WebExtension.MessageSender.ENV_TYPE_CONTENT_SCRIPT
+ WebExtension.MessageSender.ENV_TYPE_CONTENT_SCRIPT,
)
assertTrue("Expecting only top level senders.", sender.isTopLevel)
assertEquals("Unexpected sender url", sender.url, "https://example.com/")
@@ -1768,7 +1768,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(messaging!!.id, sender.webExtension.id)
checkSender(nativeApp, sender, background)
@@ -1814,7 +1814,7 @@ class WebExtensionTest : BaseSessionTest() {
assertEquals(messaging!!.id, port.sender.webExtension.id)
assertEquals(
WebExtension.MessageSender.ENV_TYPE_CONTENT_SCRIPT,
- port.sender.environmentType
+ port.sender.environmentType,
)
when (port.sender.url) {
"$TEST_ENDPOINT$HELLO_IFRAME_HTML_PATH" -> {
@@ -1835,12 +1835,12 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(messaging!!.id, sender.webExtension.id)
assertEquals(
WebExtension.MessageSender.ENV_TYPE_CONTENT_SCRIPT,
- sender.environmentType
+ sender.environmentType,
)
when (sender.url) {
"$TEST_ENDPOINT$HELLO_IFRAME_HTML_PATH" -> {
@@ -1861,8 +1861,8 @@ class WebExtensionTest : BaseSessionTest() {
messaging = sessionRule.waitForResult(
controller.installBuiltIn(
- "resource://android/assets/web_extensions/messaging-iframe/"
- )
+ "resource://android/assets/web_extensions/messaging-iframe/",
+ ),
)
mainSession.webExtensionController
.setMessageDelegate(messaging, messageDelegate, "browser")
@@ -1887,7 +1887,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(message, "setupReadyStartTest")
result.complete(null)
@@ -1897,8 +1897,8 @@ class WebExtensionTest : BaseSessionTest() {
val extension = sessionRule.waitForResult(
controller.installBuiltIn(
- "resource://android/assets/web_extensions/redirect-to-android-resource/"
- )
+ "resource://android/assets/web_extensions/redirect-to-android-resource/",
+ ),
)
extension.setMessageDelegate(messageDelegate, "browser")
@@ -1914,7 +1914,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"The extension should have rewritten the script requests and the body",
textContent as String,
- equalTo("start,extension-was-here,end")
+ equalTo("start,extension-was-here,end"),
)
sessionRule.waitForResult(controller.uninstall(extension))
@@ -1929,12 +1929,12 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
assertEquals(extension!!.id, sender.webExtension.id)
assertEquals(
WebExtension.MessageSender.ENV_TYPE_EXTENSION,
- sender.environmentType
+ sender.environmentType,
)
result.complete(message as String)
@@ -1945,8 +1945,8 @@ class WebExtensionTest : BaseSessionTest() {
extension = sessionRule.waitForResult(
controller.ensureBuiltIn(
"resource://android/assets/web_extensions/extension-page-update/",
- "extension-page-update@tests.mozilla.org"
- )
+ "extension-page-update@tests.mozilla.org",
+ ),
)
val sessionController = mainSession.webExtensionController
@@ -1957,11 +1957,11 @@ class WebExtensionTest : BaseSessionTest() {
override fun onUpdateTab(
extension: WebExtension,
session: GeckoSession,
- details: WebExtension.UpdateTabDetails
+ details: WebExtension.UpdateTabDetails,
): GeckoResult<AllowOrDeny> {
return GeckoResult.allow()
}
- }
+ },
)
mainSession.loadUri("https://example.com")
@@ -1972,7 +1972,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Url should load example.com first",
url,
- equalTo("https://example.com/")
+ equalTo("https://example.com/"),
)
}
@@ -1981,7 +1981,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"Page should load successfully.",
success,
- equalTo(true)
+ equalTo(true),
)
}
})
@@ -2007,8 +2007,8 @@ class WebExtensionTest : BaseSessionTest() {
val ensure = sessionRule.waitForResult(
controller.ensureBuiltIn(
"resource://android/assets/web_extensions/extension-page-update/",
- "extension-page-update@tests.mozilla.org"
- )
+ "extension-page-update@tests.mozilla.org",
+ ),
)
assertThat("ID match", ensure.id, equalTo(extension.id))
@@ -2022,7 +2022,7 @@ class WebExtensionTest : BaseSessionTest() {
assertThat(
"WebExtension page should have access to privileged APIs",
sessionRule.waitForResult(result),
- equalTo("HELLO_FROM_PAGE")
+ equalTo("HELLO_FROM_PAGE"),
)
// Test that after uninstalling an extension, all its pages get closed
@@ -2030,7 +2030,7 @@ class WebExtensionTest : BaseSessionTest() {
WebExtension.SessionTabDelegate::class,
{ delegate -> mainSession.webExtensionController.setTabDelegate(extension, delegate) },
{ mainSession.webExtensionController.setTabDelegate(extension, null) },
- object : WebExtension.SessionTabDelegate {}
+ object : WebExtension.SessionTabDelegate {},
)
val uninstall = controller.uninstall(extension)
@@ -2039,7 +2039,7 @@ class WebExtensionTest : BaseSessionTest() {
@AssertCalled
override fun onCloseTab(
source: WebExtension?,
- session: GeckoSession
+ session: GeckoSession,
): GeckoResult<AllowOrDeny> {
assertEquals(extension.id, source!!.id)
assertEquals(mainSession, session)
@@ -2069,7 +2069,7 @@ class WebExtensionTest : BaseSessionTest() {
fun badFileType() {
testInstallBuiltInError(
"resource://android/bad/location/error",
- "does not point to a folder"
+ "does not point to a folder",
)
}
@@ -2077,7 +2077,7 @@ class WebExtensionTest : BaseSessionTest() {
fun badLocationXpi() {
testInstallBuiltInError(
"resource://android/bad/location/error.xpi",
- "does not point to a folder"
+ "does not point to a folder",
)
}
@@ -2085,7 +2085,7 @@ class WebExtensionTest : BaseSessionTest() {
fun testInstallBuiltInError() {
testInstallBuiltInError(
"resource://android/bad/location/error/",
- "does not contain a valid manifest"
+ "does not contain a valid manifest",
)
}
@@ -2110,15 +2110,15 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
val extension = sessionRule.waitForResult(
controller.ensureBuiltIn(
"resource://android/assets/web_extensions/permission-request/",
- "permissions@example.com"
- )
+ "permissions@example.com",
+ ),
)
mainSession.loadUri("${extension.metaData.baseUrl}clickToRequestPermission.html")
@@ -2144,13 +2144,13 @@ class WebExtensionTest : BaseSessionTest() {
override fun onMessage(
nativeApp: String,
message: Any,
- sender: WebExtension.MessageSender
+ sender: WebExtension.MessageSender,
): GeckoResult<Any>? {
result.complete(message as String)
return null
}
},
- "browser"
+ "browser",
)
val message = sessionRule.waitForResult(result)
@@ -2176,8 +2176,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2196,7 +2196,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val update1 = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-1.xpi")
+ controller.install("https://example.org/tests/junit/update-1.xpi"),
)
mainSession.reload()
@@ -2231,8 +2231,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2251,7 +2251,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val update1 = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-with-perms-1.xpi")
+ controller.install("https://example.org/tests/junit/update-with-perms-1.xpi"),
)
mainSession.reload()
@@ -2266,7 +2266,7 @@ class WebExtensionTest : BaseSessionTest() {
currentlyInstalled: WebExtension,
updatedExtension: WebExtension,
newPermissions: Array<String>,
- newOrigins: Array<String>
+ newOrigins: Array<String>,
): GeckoResult<AllowOrDeny> {
assertEquals(currentlyInstalled.metaData.version, "1.0")
assertEquals(updatedExtension.metaData.version, "2.0")
@@ -2302,8 +2302,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2322,7 +2322,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val update1 = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-2.xpi")
+ controller.install("https://example.org/tests/junit/update-2.xpi"),
)
mainSession.reload()
@@ -2351,8 +2351,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2371,7 +2371,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val update1 = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-with-perms-1.xpi")
+ controller.install("https://example.org/tests/junit/update-with-perms-1.xpi"),
)
mainSession.reload()
@@ -2386,7 +2386,7 @@ class WebExtensionTest : BaseSessionTest() {
currentlyInstalled: WebExtension,
updatedExtension: WebExtension,
newPermissions: Array<String>,
- newOrigins: Array<String>
+ newOrigins: Array<String>,
): GeckoResult<AllowOrDeny> {
assertEquals(currentlyInstalled.metaData.version, "1.0")
assertEquals(updatedExtension.metaData.version, "2.0")
@@ -2402,7 +2402,7 @@ class WebExtensionTest : BaseSessionTest() {
assertTrue(exception is WebExtension.InstallException)
val installException = exception as WebExtension.InstallException
assertEquals(installException.code, WebExtension.InstallException.ErrorCodes.ERROR_USER_CANCELED)
- })
+ }),
)
mainSession.reload()
@@ -2455,8 +2455,8 @@ class WebExtensionTest : BaseSessionTest() {
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
"extensions.update.requireBuiltInCerts" to false,
- "extensions.webextensions.warnings-as-errors" to false
- )
+ "extensions.webextensions.warnings-as-errors" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2474,7 +2474,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val update1 = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-postpone-1.xpi")
+ controller.install("https://example.org/tests/junit/update-postpone-1.xpi"),
)
mainSession.reload()
@@ -2491,7 +2491,7 @@ class WebExtensionTest : BaseSessionTest() {
assertTrue(exception is WebExtension.InstallException)
val installException = exception as WebExtension.InstallException
assertEquals(installException.code, WebExtension.InstallException.ErrorCodes.ERROR_POSTPONED)
- })
+ }),
)
mainSession.reload()
@@ -2513,8 +2513,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
sessionRule.waitForPageStop()
@@ -2557,11 +2557,11 @@ class WebExtensionTest : BaseSessionTest() {
@AssertCalled(count = 2)
override fun onInstalled(extension: WebExtension) {}
- }
+ },
)
val webExtension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/update-1.xpi")
+ controller.install("https://example.org/tests/junit/update-1.xpi"),
)
mainSession.reload()
@@ -2605,7 +2605,7 @@ class WebExtensionTest : BaseSessionTest() {
@AssertCalled(count = 1)
override fun onNewTab(
source: WebExtension,
- details: WebExtension.CreateTabDetails
+ details: WebExtension.CreateTabDetails,
): GeckoResult<GeckoSession> {
assertThat(details.url, endsWith("options.html"))
assertEquals(details.active, true)
@@ -2616,7 +2616,7 @@ class WebExtensionTest : BaseSessionTest() {
}
optionsExtension = sessionRule.waitForResult(
- controller.installBuiltIn(OPENOPTIONSPAGE_1_BACKGROUND)
+ controller.installBuiltIn(OPENOPTIONSPAGE_1_BACKGROUND),
)
optionsExtension.setTabDelegate(tabDelegate)
sessionRule.waitForResult(tabsCreateResult)
@@ -2638,7 +2638,7 @@ class WebExtensionTest : BaseSessionTest() {
override fun onOpenOptionsPage(source: WebExtension) {
assertThat(
source.metaData.optionsPageUrl,
- endsWith("options.html")
+ endsWith("options.html"),
)
assertEquals(optionsExtension!!.id, source.id)
openOptionsPageResult.complete(null)
@@ -2646,7 +2646,7 @@ class WebExtensionTest : BaseSessionTest() {
}
optionsExtension = sessionRule.waitForResult(
- controller.installBuiltIn(OPENOPTIONSPAGE_2_BACKGROUND)
+ controller.installBuiltIn(OPENOPTIONSPAGE_2_BACKGROUND),
)
optionsExtension.setTabDelegate(tabDelegate)
sessionRule.waitForResult(openOptionsPageResult)
@@ -2664,8 +2664,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
@@ -2679,7 +2679,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val webExtension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/download-flags-true.xpi")
+ controller.install("https://example.org/tests/junit/download-flags-true.xpi"),
)
val assertOnDownloadCalled = GeckoResult<WebExtension.Download>()
@@ -2736,8 +2736,8 @@ class WebExtensionTest : BaseSessionTest() {
mapOf(
"xpinstall.signatures.required" to false,
"extensions.install.requireBuiltInCerts" to false,
- "extensions.update.requireBuiltInCerts" to false
- )
+ "extensions.update.requireBuiltInCerts" to false,
+ ),
)
mainSession.loadUri("https://example.com")
@@ -2751,7 +2751,7 @@ class WebExtensionTest : BaseSessionTest() {
})
val webExtension = sessionRule.waitForResult(
- controller.install("https://example.org/tests/junit/download-flags-false.xpi")
+ controller.install("https://example.org/tests/junit/download-flags-false.xpi"),
)
val assertOnDownloadCalled = GeckoResult<WebExtension.Download>()
@@ -2844,7 +2844,7 @@ class WebExtensionTest : BaseSessionTest() {
}
val webExtension = sessionRule.waitForResult(
- controller.installBuiltIn("resource://android/assets/web_extensions/download-onChanged/")
+ controller.installBuiltIn("resource://android/assets/web_extensions/download-onChanged/"),
)
val assertOnDownloadCalled = GeckoResult<Download>()
@@ -2938,7 +2938,7 @@ class WebExtensionTest : BaseSessionTest() {
val downloadId = 5
val webExtension = sessionRule.waitForResult(
- controller.installBuiltIn("resource://android/assets/web_extensions/download-onChanged/")
+ controller.installBuiltIn("resource://android/assets/web_extensions/download-onChanged/"),
)
val assertOnDownloadCalled = GeckoResult<WebExtension.Download>()
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt
index 4b5726a74d43fb20b4729bba776480c62af0d26d..122437485d9c8693c8e86837798d32512ea85d54 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt
@@ -41,7 +41,7 @@ class WebNotificationTest : BaseSessionTest() {
assertThat(
"Permission should be granted",
result as String,
- equalTo("granted")
+ equalTo("granted"),
)
}
@@ -63,7 +63,7 @@ class WebNotificationTest : BaseSessionTest() {
mainSession.evaluateJS(
"""
new Notification('The Title', { body: 'The Text', silent: true });
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitForResult(notificationResult)
@@ -79,7 +79,7 @@ class WebNotificationTest : BaseSessionTest() {
assertThat(
"Require Interaction should match",
notification.requireInteraction,
- equalTo(requireInteraction)
+ equalTo(requireInteraction),
)
assertThat("Vibrate should match", notification.vibrate, equalTo(intArrayOf(1, 2, 3, 4)))
assertThat("Silent should match", notification.silent, equalTo(false))
@@ -89,8 +89,8 @@ class WebNotificationTest : BaseSessionTest() {
@GeckoSessionTestRule.Setting.List(
GeckoSessionTestRule.Setting(
key = GeckoSessionTestRule.Setting.Key.USE_PRIVATE_MODE,
- value = "true"
- )
+ value = "true",
+ ),
)
@Test
fun onShowNotification() {
@@ -113,7 +113,7 @@ class WebNotificationTest : BaseSessionTest() {
new Notification('The Title', { body: 'The Text', cookie: 'Cookie',
icon: 'icon.png', tag: 'Tag', dir: 'ltr', lang: 'en-US',
requireInteraction: true, vibrate: [1,2,3,4] });
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitForResult(notificationResult)
@@ -133,7 +133,7 @@ class WebNotificationTest : BaseSessionTest() {
"""
const notification = new Notification('The Title', { body: 'The Text'});
notification.close();
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitForResult(closeCalled)
@@ -169,7 +169,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
val notification = sessionRule.waitForResult(notificationResult)
@@ -192,8 +192,8 @@ class WebNotificationTest : BaseSessionTest() {
@GeckoSessionTestRule.Setting.List(
GeckoSessionTestRule.Setting(
key = GeckoSessionTestRule.Setting.Key.USE_PRIVATE_MODE,
- value = "true"
- )
+ value = "true",
+ ),
)
@Test
fun clickPrivateNotificationParceled() {
@@ -226,7 +226,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
val notification = sessionRule.waitForResult(notificationResult)
@@ -266,7 +266,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitForResult(notificationResult)
@@ -295,7 +295,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
sessionRule.waitForResult(notificationResult)
@@ -322,7 +322,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
val notification = sessionRule.waitForResult(notificationResult)
@@ -360,7 +360,7 @@ class WebNotificationTest : BaseSessionTest() {
resolve(1);
}
});
- """.trimIndent()
+ """.trimIndent(),
)
val notification = sessionRule.waitForResult(notificationResult)
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt
index be7351859da74b478fd77ca1e7d06f5e06fc6175..a2e6d58f3a49af99d9ba143435f26c1733a5d3d3 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt
@@ -209,7 +209,7 @@ class WebPushTest : BaseSessionTest() {
PUSH_ENDPOINT,
WebPushUtils.keyToBytes(APP_SERVER_KEY_PAIR.public as ECPublicKey),
WebPushUtils.keyToBytes(APP_SERVER_KEY_PAIR.public as ECPublicKey)!!,
- AUTH_SECRET
+ AUTH_SECRET,
)
}
@@ -221,7 +221,7 @@ class WebPushTest : BaseSessionTest() {
PUSH_ENDPOINT,
WebPushUtils.keyToBytes(APP_SERVER_KEY_PAIR.public as ECPublicKey),
WebPushUtils.keyToBytes(BROWSER_KEY_PAIR.public as ECPublicKey)!!,
- AUTH_SECRET
+ AUTH_SECRET,
)
val parcel = Parcel.obtain()
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/ParentCrashTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/ParentCrashTest.kt
index faeecdfae2fc8eb0db049ef1e19e5448ec1bded7..e19997dfc3235cc8ecb6249ebeb1e0dead27fa33 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/ParentCrashTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/ParentCrashTest.kt
@@ -36,7 +36,7 @@ class ParentCrashTest : BaseSessionTest() {
val runtime = TestRuntimeService.RuntimeInstance.start(
targetContext,
RuntimeCrashTestService::class.java,
- temporaryProfile.get()
+ temporaryProfile.get(),
)
runtime.loadUri("about:crashparent")
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/RuntimeCrashTestService.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/RuntimeCrashTestService.kt
index f13ca8137ee4c437cf14e58e6e21a5d9b1885bec..bfdc40621e4fd0a5253623a491fda9cc09f70fe1 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/RuntimeCrashTestService.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/crash/RuntimeCrashTestService.kt
@@ -13,7 +13,7 @@ class RuntimeCrashTestService : TestRuntimeService() {
this.applicationContext,
GeckoRuntimeSettings.Builder()
.extras(intent.extras!!)
- .crashHandler(TestCrashHandler::class.java).build()
+ .crashHandler(TestCrashHandler::class.java).build(),
)
}
}