Skip to content
This repository has been archived by the owner on Jun 17, 2024. It is now read-only.

Commit

Permalink
Bug 1803465 - Reorganize unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmarks-net
pmarks-net committed Nov 16, 2023
1 parent 4e5ca51 commit 674be27
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 16 deletions.
46 changes: 30 additions & 16 deletions ...onents/support/utils/src/test/java/mozilla/components/support/utils/URLStringUtilsTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,31 +88,43 @@ class URLStringUtilsTest {
assertFalse(isURLLike("www.c-c- "))
assertFalse(isURLLike("3-3 "))

// IPv6 literals
assertTrue(isURLLike("[::]"))
assertTrue(isURLLike("[::1]"))
assertTrue(isURLLike("[1::]"))
assertTrue(isURLLike("[::]/"))
assertTrue(isURLLike("[1:2:3:4:5:6:7:8]"))
assertTrue(isURLLike("https:[::]"))
assertTrue(isURLLike("https://[::]"))
assertTrue(isURLLike("https://[::1]"))
assertTrue(isURLLike("https://[1::]"))
assertTrue(isURLLike("https://[2001:db8::1.2.3.4]/"))
assertTrue(isURLLike("https://[1:2:3:4:5:6:7:8]/"))
assertTrue(isURLLike("[2001:db8::1.2.3.4]/"))

// Invalid IPv6 literals, just to illustrate the limits of the regex.
// Valid IPv6 literals correctly recognized as valid.
val validIPv6Literals = listOf(
"[::]",
"[::1]",
"[1::]",
"[1:2:3:4:5:6:7:8]",
"[2001:db8::1.2.3.4]",
"[::1]:8080",
)

validIPv6Literals.forEach { url ->
assertTrue(isURLLike(url))
assertTrue(isURLLike("$url/"))
assertTrue(isURLLike("https://$url"))
assertTrue(isURLLike("https://$url/"))
assertTrue(isURLLike("https:$url"))
assertTrue(isURLLike("http://$url"))
assertTrue(isURLLike("http://$url/"))
assertTrue(isURLLike("http:$url"))
}

// Invalid IPv6 literals correctly recognized as invalid.
assertFalse(isURLLike("::1"))
assertFalse(isURLLike(":::"))
assertFalse(isURLLike("[[http://]]"))
assertFalse(isURLLike("[[["))
assertFalse(isURLLike("[[[:"))
assertFalse(isURLLike("[[[:/"))
assertFalse(isURLLike("http://]]]"))
assertTrue(isURLLike("[:::"))

// Invalid IPv6 literals correctly recognized as something else.
assertTrue(isURLLike("fe80::"))
assertTrue(isURLLike("x:["))

// Invalid IPv6 literals incorrectly recognized as valid.
// We allow these for now, until bug 1685152 is fixed.
assertTrue(isURLLike("[:::"))
assertTrue(isURLLike("http://[::"))
assertTrue(isURLLike("http://[::/path"))
assertTrue(isURLLike("http://[::?query"))
Expand All @@ -121,6 +133,8 @@ class URLStringUtilsTest {
assertTrue(isURLLike("[[[::"))
assertTrue(isURLLike("[[[::/"))
assertTrue(isURLLike("http://[1.2.3]"))
assertTrue(isURLLike("https://[1:2:3:4:5:6:7]/"))
assertTrue(isURLLike("https://[1:2:3:4:5:6:7:8:9]/"))

// Examples from issues
assertTrue(isURLLike("https://abc--cba.com/")) // #7096
Expand Down
93 changes: 93 additions & 0 deletions ...mponents/support/utils/src/test/java/mozilla/components/support/utils/WebURLFinderTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,97 @@ class WebURLFinderTest {
assertFalse(isWebURL("javascript:alert('Hi')"))
assertFalse(isWebURL("JAVascript:alert('Hi')"))
}

@Test
fun isUrlLikeEmulated() {
// autolinkWebUrlPattern uses a copy of the regex from URLStringUtils,
// so here we emulate isURLLike() and copy its tests.
val isURLLike: (String) -> Boolean = { find(it) == it.trim() }

// All cases that behave differently are annotated with INVERT().
val INVERT: (Boolean) -> Boolean = { !it }

assertFalse(isURLLike("inurl:mozilla.org advanced search"))
assertFalse(isURLLike("sf: help"))
assertFalse(isURLLike("mozilla./~"))
assertFalse(isURLLike("cnn.com politics"))

assertTrue(isURLLike("about:config"))
assertTrue(isURLLike("about:config:8000"))
assertTrue(INVERT(isURLLike("file:///home/user/myfile.html")))
assertTrue(INVERT(isURLLike("file://////////////home//user/myfile.html")))
assertTrue(INVERT(isURLLike("file://C:\\Users\\user\\myfile.html")))
assertTrue(isURLLike("http://192.168.255.255"))
assertTrue(isURLLike("link.unknown"))
assertTrue(isURLLike("3.14.2019"))
assertTrue(isURLLike("3-four.14.2019"))
assertTrue(isURLLike(" cnn.com "))
assertTrue(isURLLike(" cnn.com"))
assertTrue(isURLLike("cnn.com "))
assertTrue(isURLLike("mozilla.com/~userdir"))
assertTrue(isURLLike("my-domain.com"))
assertTrue(isURLLike("http://faß.de//"))
assertTrue(isURLLike("cnn.cơḿ"))
assertTrue(isURLLike("cnn.çơḿ"))

assertTrue(isURLLike("c-c.com"))
assertTrue(isURLLike("c-c-c-c.c-c-c"))
assertTrue(isURLLike("c-http://c.com"))
assertTrue(isURLLike("about-mozilla:mozilla"))
assertTrue(isURLLike("c-http.d-x"))
assertTrue(isURLLike("www.c.-"))
assertTrue(isURLLike("3-3.3"))
assertTrue(isURLLike("www.c-c.-"))

assertFalse(isURLLike(" -://x.com "))
assertFalse(isURLLike(" -x.com"))
assertFalse(isURLLike("http://www-.com"))
assertFalse(isURLLike("www.c-c- "))
assertFalse(isURLLike("3-3 "))

val validIPv6Literals = listOf(
"[::]",
"[::1]",
"[1::]",
"[1:2:3:4:5:6:7:8]",
"[2001:db8::1.2.3.4]",
"[::1]:8080",
)

validIPv6Literals.forEach { url ->
assertTrue(INVERT(isURLLike(url)))
assertTrue(INVERT(isURLLike("$url/")))
assertTrue(isURLLike("https://$url"))
assertTrue(isURLLike("https://$url/"))
assertTrue(isURLLike("https:$url"))
assertTrue(isURLLike("http://$url"))
assertTrue(isURLLike("http://$url/"))
assertTrue(isURLLike("http:$url"))
}

assertFalse(isURLLike("::1"))
assertFalse(isURLLike(":::"))
assertFalse(isURLLike("[[http://]]"))
assertFalse(isURLLike("[[["))
assertFalse(isURLLike("[[[:"))
assertFalse(isURLLike("[[[:/"))
assertFalse(isURLLike("http://]]]"))

assertTrue(isURLLike("fe80::"))
assertTrue(isURLLike("x:["))

assertTrue(INVERT(isURLLike("[:::")))
assertTrue(INVERT(isURLLike("http://[::")))
assertTrue(INVERT(isURLLike("http://[::/path")))
assertTrue(INVERT(isURLLike("http://[::?query")))
assertTrue(INVERT(isURLLike("[[http://banana]]")))
assertTrue(INVERT(isURLLike("http://[[[")))
assertTrue(INVERT(isURLLike("[[[::")))
assertTrue(INVERT(isURLLike("[[[::/")))
assertTrue(INVERT(isURLLike("http://[1.2.3]")))
assertTrue(INVERT(isURLLike("https://[1:2:3:4:5:6:7]/")))
assertTrue(INVERT(isURLLike("https://[1:2:3:4:5:6:7:8:9]/")))

assertTrue(isURLLike("https://abc--cba.com/"))
}
}

1 comment on commit 674be27

@firefoxci-taskcluster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh! Looks like an error! Details

Failed to fetch task artifact public/github/customCheckRunText.md for GitHub integration.
Make sure the artifact exists on the worker or other location.

Please sign in to comment.