Added splitNewLine parameter
This commit is contained in:
parent
473d3dc5f0
commit
733c76f447
2 changed files with 15 additions and 2 deletions
|
@ -206,7 +206,8 @@ class JokeApi {
|
||||||
type: Type = Type.ALL,
|
type: Type = Type.ALL,
|
||||||
search: String = "",
|
search: String = "",
|
||||||
idRange: IdRange = IdRange(),
|
idRange: IdRange = IdRange(),
|
||||||
safe: Boolean = false
|
safe: Boolean = false,
|
||||||
|
splitNewLine: Boolean = true
|
||||||
): Joke {
|
): Joke {
|
||||||
val json =
|
val json =
|
||||||
JSONObject(apiCall(categories, language, flags, type, search = search, idRange = idRange, safe = safe))
|
JSONObject(apiCall(categories, language, flags, type, search = search, idRange = idRange, safe = safe))
|
||||||
|
@ -229,7 +230,11 @@ class JokeApi {
|
||||||
jokes.add(json.getString("setup"))
|
jokes.add(json.getString("setup"))
|
||||||
jokes.add(json.getString(("delivery")))
|
jokes.add(json.getString(("delivery")))
|
||||||
} else {
|
} else {
|
||||||
jokes.addAll(json.getString("joke").split("\n"))
|
if (splitNewLine) {
|
||||||
|
jokes.addAll(json.getString("joke").split("\n"))
|
||||||
|
} else {
|
||||||
|
jokes.add(json.getString("joke"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val enabledFlags = mutableSetOf<Flag>()
|
val enabledFlags = mutableSetOf<Flag>()
|
||||||
val jsonFlags = json.getJSONObject("flags")
|
val jsonFlags = json.getJSONObject("flags")
|
||||||
|
|
|
@ -127,6 +127,14 @@ internal class JokeApiTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Get Joke with Newline`() {
|
||||||
|
val joke =
|
||||||
|
getJoke(categories = setOf(Category.DARK), type = Type.SINGLE, idRange = IdRange(178), splitNewLine = false)
|
||||||
|
logger.log(Level.FINE, joke.toString())
|
||||||
|
assertEquals(1, joke.joke.size) { "should be a oneliner" }
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Get Safe Joke`() {
|
fun `Get Safe Joke`() {
|
||||||
val joke = getJoke(safe = true)
|
val joke = getJoke(safe = true)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue