sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix string pair list type converter (#971)

Browse Source
This commit is contained in:
Mikołaj Pich 2020-09-29 21:02:49 +02:00 committed by GitHub
parent 11487e77ca
commit 1f0f6b3e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -127,7 +127,7 @@ configurations.all {
} }
dependencies { dependencies {
implementation "io.github.wulkanowy:sdk:0.21.1" implementation "io.github.wulkanowy:sdk:7577fc9"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'

4
app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt
View File

@ -56,11 +56,11 @@ object PairAdapterFactory : JsonAdapter.Factory {
private fun deserializeGsonPair(reader: JsonReader): List<Pair<String, String>>? { private fun deserializeGsonPair(reader: JsonReader): List<Pair<String, String>>? {
val list = listAdapter.fromJson(reader) ?: return null val list = listAdapter.fromJson(reader) ?: return null
require(list.size == 2 || list.isEmpty()) { return list.map {
require(it.size == 2) {
"pair with more or less than two elements: $list" "pair with more or less than two elements: $list"
} }
return list.map {
it["first"].orEmpty() to it["second"].orEmpty() it["first"].orEmpty() to it["second"].orEmpty()
} }
} }

5
app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt
View File

@ -7,19 +7,24 @@ class ConvertersTest {
@Test @Test
fun stringPairListToJson() { fun stringPairListToJson() {
assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]")
assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]") assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]")
assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb")), "[{\"first\":\"aaa\",\"second\":\"bbb\"}]")
assertEquals(Converters().stringPairListToJson(listOf()), "[]") assertEquals(Converters().stringPairListToJson(listOf()), "[]")
} }
@Test @Test
fun jsonToStringPairList() { fun jsonToStringPairList() {
assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff"))
assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd")) assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd"))
assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"}]"), listOf("aaa" to "bbb"))
assertEquals(Converters().jsonToStringPairList("[]"), listOf<Pair<String, String>>()) assertEquals(Converters().jsonToStringPairList("[]"), listOf<Pair<String, String>>())
} }
@Test @Test
fun jsonToStringPairList_0210() { fun jsonToStringPairList_0210() {
assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\",\"ccc\":\"ddd\"}"), listOf("aaa" to "bbb", "ccc" to "ddd")) assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\",\"ccc\":\"ddd\"}"), listOf("aaa" to "bbb", "ccc" to "ddd"))
assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\"}"), listOf("aaa" to "bbb"))
assertEquals(Converters().jsonToStringPairList("{}"), listOf<Pair<String, String>>()) assertEquals(Converters().jsonToStringPairList("{}"), listOf<Pair<String, String>>())
} }
} }