Skip to content
Snippets Groups Projects
Verified Commit 8c49923d authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Improved tests

parent 4f781879
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lib/src/test/java/de/kuschku/libquassel/util/ExpressionMatchTest.kt
+ 41
− 0
View file @ 8c49923d
...@@ -428,4 +428,45 @@ class ExpressionMatchTest { ...@@ -428,4 +428,45 @@ class ExpressionMatchTest {
assertFalse(invalidRegex.match("network")) assertFalse(invalidRegex.match("network"))
assertFalse(invalidRegex.match("testnetwork")) assertFalse(invalidRegex.match("testnetwork"))
} }
// Tests imported from https://github.com/ircdocs/parser-tests/blob/master/tests/mask-match.yaml
@Test
fun testDan() {
val mask1 = ExpressionMatch("*@127.0.0.1",
ExpressionMatch.MatchMode.MatchWildcard,
caseSensitive = false)
assertTrue(mask1.match("coolguy!ab@127.0.0.1"))
assertTrue(mask1.match("cooldud3!~bc@127.0.0.1"))
assertFalse(mask1.match("coolguy!ab@127.0.0.5"))
assertFalse(mask1.match("cooldud3!~d@124.0.0.1"))
val mask2 = ExpressionMatch("cool*@*",
ExpressionMatch.MatchMode.MatchWildcard,
caseSensitive = false)
assertTrue(mask2.match("coolguy!ab@127.0.0.1"))
assertTrue(mask2.match("cooldud3!~bc@127.0.0.1"))
assertTrue(mask2.match("cool132!ab@example.com"))
assertFalse(mask2.match("koolguy!ab@127.0.0.5"))
assertFalse(mask2.match("cooodud3!~d@124.0.0.1"))
val mask3 = ExpressionMatch("cool!*@*",
ExpressionMatch.MatchMode.MatchWildcard,
caseSensitive = false)
assertTrue(mask3.match("cool!guyab@127.0.0.1"))
assertTrue(mask3.match("cool!~dudebc@127.0.0.1"))
assertTrue(mask3.match("cool!312ab@example.com"))
assertFalse(mask3.match("coolguy!ab@127.0.0.1"))
assertFalse(mask3.match("cooldud3!~bc@127.0.0.1"))
assertFalse(mask3.match("koolguy!ab@127.0.0.5"))
assertFalse(mask3.match("cooodud3!~d@124.0.0.1"))
// Cause failures in fnmatch/glob based matchers
val mask4 = ExpressionMatch("cool[guy]!*@*",
ExpressionMatch.MatchMode.MatchWildcard,
caseSensitive = false)
assertTrue(mask4.match("cool[guy]!guy@127.0.0.1"))
assertTrue(mask4.match("cool[guy]!a@example.com"))
assertFalse(mask4.match("coolg!ab@127.0.0.1"))
assertFalse(mask4.match("cool[!ac@127.0.1.1"))
}
} }
lib/src/test/java/de/kuschku/libquassel/util/irc/HostmaskHelperTest.kt
+ 153
− 126
View file @ 8c49923d
...@@ -25,155 +25,182 @@ import org.junit.Test ...@@ -25,155 +25,182 @@ import org.junit.Test
class HostmaskHelperTest { class HostmaskHelperTest {
@Test @Test
fun testNormal() { fun testNormal() {
assertEquals("justJanne", runTest(
HostmaskHelper.nick("justJanne!kuschku@lithium.kuschku.de")) source = "justJanne!kuschku@lithium.kuschku.de",
assertEquals("justJanne", nick = "justJanne",
HostmaskHelper.split("justJanne!kuschku@lithium.kuschku.de").first) user = "kuschku",
host = "lithium.kuschku.de"
assertEquals("kuschku", )
HostmaskHelper.user("justJanne!kuschku@lithium.kuschku.de")) assertEquals(
assertEquals("kuschku", "justJanne!kuschku@lithium.kuschku.de",
HostmaskHelper.split("justJanne!kuschku@lithium.kuschku.de").second) HostmaskHelper.build(nick = "justJanne", user = "kuschku", host = "lithium.kuschku.de")
)
assertEquals("lithium.kuschku.de",
HostmaskHelper.host("justJanne!kuschku@lithium.kuschku.de"))
assertEquals("lithium.kuschku.de",
HostmaskHelper.split("justJanne!kuschku@lithium.kuschku.de").third)
assertEquals("justJanne!kuschku@lithium.kuschku.de", HostmaskHelper.build(
"justJanne", "kuschku", "lithium.kuschku.de"
))
} }
@Test @Test
fun testUnvalidatedIdent() { fun testUnvalidatedIdent() {
assertEquals("justJanne", runTest(
HostmaskHelper.nick("justJanne!~kuschku@lithium.kuschku.de")) source = "justJanne!~kuschku@lithium.kuschku.de",
assertEquals("justJanne", nick = "justJanne",
HostmaskHelper.split("justJanne!~kuschku@lithium.kuschku.de").first) user = "~kuschku",
host = "lithium.kuschku.de"
assertEquals("~kuschku", )
HostmaskHelper.user("justJanne!~kuschku@lithium.kuschku.de")) assertEquals(
assertEquals("~kuschku", "justJanne!~kuschku@lithium.kuschku.de",
HostmaskHelper.split("justJanne!~kuschku@lithium.kuschku.de").second) HostmaskHelper.build(nick = "justJanne", user = "~kuschku", host = "lithium.kuschku.de")
)
assertEquals("lithium.kuschku.de",
HostmaskHelper.host("justJanne!~kuschku@lithium.kuschku.de"))
assertEquals("lithium.kuschku.de",
HostmaskHelper.split("justJanne!~kuschku@lithium.kuschku.de").third)
assertEquals("justJanne!~kuschku@lithium.kuschku.de", HostmaskHelper.build(
"justJanne", "~kuschku", "lithium.kuschku.de"
))
} }
@Test @Test
fun testUnicode() { fun testUnicode() {
assertEquals("bärlauch", runTest(
HostmaskHelper.nick("bärlauch!maße@flüge.de")) source = "bärlauch!maße@flüge.de",
assertEquals("bärlauch", nick = "bärlauch",
HostmaskHelper.split("bärlauch!maße@flüge.de").first) user = "maße",
host = "flüge.de"
assertEquals("maße", )
HostmaskHelper.user("bärlauch!maße@flüge.de")) assertEquals(
assertEquals("maße", "bärlauch!maße@flüge.de",
HostmaskHelper.split("bärlauch!maße@flüge.de").second) HostmaskHelper.build(nick = "bärlauch", user = "maße", host = "flüge.de")
)
assertEquals("flüge.de",
HostmaskHelper.host("bärlauch!maße@flüge.de"))
assertEquals("flüge.de",
HostmaskHelper.split("bärlauch!maße@flüge.de").third)
assertEquals("bärlauch!maße@flüge.de", HostmaskHelper.build(
"bärlauch", "maße", "flüge.de"
))
} }
@Test @Test
fun testServer() { fun testServer() {
assertEquals("irc.freenode.org", runTest(
HostmaskHelper.nick("irc.freenode.org")) source = "irc.freenode.org",
assertEquals("irc.freenode.org", nick = "irc.freenode.org",
HostmaskHelper.split("irc.freenode.org").first) user = "",
host = ""
assertEquals("", )
HostmaskHelper.user("irc.freenode.org")) assertEquals(
assertEquals("", "irc.freenode.org",
HostmaskHelper.split("irc.freenode.org").second) HostmaskHelper.build(nick = "irc.freenode.org", user = "", host = "")
)
assertEquals("",
HostmaskHelper.host("irc.freenode.org"))
assertEquals("",
HostmaskHelper.split("irc.freenode.org").third)
assertEquals("irc.freenode.org", HostmaskHelper.build(
"irc.freenode.org", "", ""
))
} }
@Test @Test
fun testAtNick() { fun testAtNick() {
assertEquals("@nick", runTest(
HostmaskHelper.nick("@nick!~ident@example.org")) source = "@nick!~ident@example.org",
assertEquals("@nick", nick = "@nick",
HostmaskHelper.split("@nick!~ident@example.org").first) user = "~ident",
host = "example.org"
assertEquals("~ident", )
HostmaskHelper.user("@nick!~ident@example.org")) assertEquals(
assertEquals("~ident", "@nick!~ident@example.org",
HostmaskHelper.split("@nick!~ident@example.org").second) HostmaskHelper.build(nick = "@nick", user = "~ident", host = "example.org")
)
assertEquals("example.org",
HostmaskHelper.host("@nick!~ident@example.org"))
assertEquals("example.org",
HostmaskHelper.split("@nick!~ident@example.org").third)
assertEquals("@nick!~ident@example.org", HostmaskHelper.build(
"@nick", "~ident", "example.org"
))
} }
@Test @Test
fun testReversedDelimiters() { fun testReversedDelimiters() {
assertEquals("a", runTest(
HostmaskHelper.nick("a@a!")) source = "a@a!",
assertEquals("a", nick = "a",
HostmaskHelper.split("a@a!").first) user = "",
host = "a!"
assertEquals("", )
HostmaskHelper.user("a@a!")) assertEquals(
assertEquals("", "a@a!",
HostmaskHelper.split("a@a!").second) HostmaskHelper.build(nick = "a", user = "", host = "a!")
)
assertEquals("a!",
HostmaskHelper.host("a@a!"))
assertEquals("a!",
HostmaskHelper.split("a@a!").third)
assertEquals("a@a!", HostmaskHelper.build(
"a", "", "a!"
))
} }
@Test @Test
fun testDiscord() { fun testDiscord() {
assertEquals("Gin_", runTest(
HostmaskHelper.nick("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord")) source = "Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord",
assertEquals("Gin_", nick = "Gin_",
HostmaskHelper.split("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord").first) user = "Gin_!♡♅ƸӜƷ♅♡!",
host = "discord"
assertEquals("Gin_!♡♅ƸӜƷ♅♡!", )
HostmaskHelper.user("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord")) assertEquals(
assertEquals("Gin_!♡♅ƸӜƷ♅♡!", "Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord",
HostmaskHelper.split("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord").second) HostmaskHelper.build(nick = "Gin_", user = "Gin_!♡♅ƸӜƷ♅♡!", host = "discord")
)
assertEquals("discord", }
HostmaskHelper.host("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord"))
assertEquals("discord", @Test
HostmaskHelper.split("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord").third) fun testDan() {
runTest(
assertEquals("Gin_!Gin_!♡♅ƸӜƷ♅♡!@discord", HostmaskHelper.build( source = "coolguy!ag@127.0.0.1",
"Gin_", "Gin_!♡♅ƸӜƷ♅♡!", "discord" nick = "coolguy",
)) user = "ag",
host = "127.0.0.1"
)
runTest(
source = "coolguy!~ag@localhost",
nick = "coolguy",
user = "~ag",
host = "localhost"
)
}
@Test
fun testDanMissingAtoms() {
runTest(
source = "!ag@127.0.0.1",
nick = "",
user = "ag",
host = "127.0.0.1"
)
runTest(
source = "coolguy!@127.0.0.1",
nick = "coolguy",
user = "",
host = "127.0.0.1"
)
runTest(
source = "coolguy@127.0.0.1",
nick = "coolguy",
user = "",
host = "127.0.0.1"
)
runTest(
source = "coolguy!ag@",
nick = "coolguy",
user = "ag",
host = ""
)
runTest(
source = "coolguy!ag",
nick = "coolguy",
user = "ag",
host = ""
)
}
@Test
fun testDanWeirdControlCodes() {
runTest(
source = "coolguy!ag@net\u00035w\u0003ork.admin",
nick = "coolguy",
user = "ag",
host = "net\u00035w\u0003ork.admin"
)
runTest(
source = "coolguy!~ag@n\u0002et\u000305w\u000fork.admin",
nick = "coolguy",
user = "~ag",
host = "n\u0002et\u000305w\u000fork.admin"
)
}
private fun runTest(source: String, nick: String, user: String, host: String) {
assertEquals(nick, HostmaskHelper.nick(source))
assertEquals(nick, HostmaskHelper.split(source).first)
assertEquals(user, HostmaskHelper.user(source))
assertEquals(user, HostmaskHelper.split(source).second)
assertEquals(host, HostmaskHelper.host(source))
assertEquals(host, HostmaskHelper.split(source).third)
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment