erik/isgd-shorten
erik/isgd-shorten
1
1
Fork 0
Code Issues Pull requests Releases Activity

Updated dependencies and copyright.

Browse source
This commit is contained in:
Erik C. Thauvin 2022-01-03 12:27:33 -08:00
parent 7f18ee1f34
commit 035aa73fab
11 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt
View file

@ -1,7 +1,7 @@
/*
* Isgd.kt
*
* Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
* Copyright (c) 2022, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
src/main/kotlin/net/thauvin/erik/isgd/IsgdException.kt
View file

@ -1,7 +1,7 @@
/*
* IsgdException.kt
*
* Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
* Copyright (c) 2022, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

55
src/test/kotlin/net/thauvin/erik/isgd/IsgdTest.kt
View file

@ -1,7 +1,7 @@
/*
* IsgdTest.kt
*
* Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
* Copyright (c) 2022, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -45,9 +45,9 @@ class IsgdTest {
@Test
fun testException() {
assertFailsWith(
message = "URL is already shorten",
exceptionClass = IsgdException::class,
block = { Isgd.shorten(shortUrl) }
message = "URL is already shorten",
exceptionClass = IsgdException::class,
block = { Isgd.shorten(shortUrl) }
)
try {
@ -58,6 +58,15 @@ class IsgdTest {
}
}
@Test
fun testLookup() {
assertFailsWith(
message = "empty url",
exceptionClass = IllegalArgumentException::class,
block = { Isgd.lookup("") }
)
}
@Test
fun testLookupDefault() {
assertEquals(url, Isgd.lookup(shortUrl))
@ -68,17 +77,32 @@ class IsgdTest {
fun testLookupJson() {
assertEquals("{ \"url\": \"$url\" }", Isgd.lookup(shortUrl, format = Format.JSON))
assertEquals(
"test({ \"url\": \"$url\" });",
Isgd.lookup(shortUrl, callback = "test", format = Format.JSON),
"with callback"
"test({ \"url\": \"$url\" });",
Isgd.lookup(shortUrl, callback = "test", format = Format.JSON),
"with callback"
)
}
@Test
fun testLookupXml() {
assertEquals(
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><output><url>$url</url></output>",
Isgd.lookup(shortUrl, format = Format.XML)
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><output><url>$url</url></output>",
Isgd.lookup(shortUrl, format = Format.XML)
)
}
@Test
fun testShorten() {
assertFailsWith(
message = "empty url",
exceptionClass = IllegalArgumentException::class,
block = { Isgd.shorten("") }
)
assertFailsWith(
message = "shorturl already take",
exceptionClass = IsgdException::class,
block = { Isgd.shorten(url, shorturl = "test") }
)
}
@ -86,24 +110,25 @@ class IsgdTest {
fun testShortenDefault() {
assertEquals(shortUrl, Isgd.shorten(url))
assertEquals(shortVgdUrl, Isgd.shorten(url, isVgd = true), "v.gd")
assertTrue(Isgd.shorten(url, logstats = true).matches("https://is.gd/\\w{6}".toRegex()), "with logstats")
}
@Test
fun testShortenJson() {
assertEquals("{ \"shorturl\": \"$shortUrl\" }", Isgd.shorten(url, format = Format.JSON))
assertEquals(
"test({ \"shorturl\": \"$shortUrl\" });",
Isgd.shorten(url, callback = "test", format = Format.JSON),
"with callback"
"test({ \"shorturl\": \"$shortUrl\" });",
Isgd.shorten(url, callback = "test", format = Format.JSON),
"with callback"
)
}
@Test
fun testShortenXml() {
assertEquals(
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
"<output><shorturl>$shortUrl</shorturl></output>",
Isgd.shorten(url, format = Format.XML)
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
"<output><shorturl>$shortUrl</shorturl></output>",
Isgd.shorten(url, format = Format.XML)
)
}