Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Versions {
const val kotlinx_collections_immutable = "0.3.5"
const val kotlinx_coroutines = "1.6.4"
const val kotlin_metadata = kotlin
const val kotlinx_serialization = "1.8.0"
const val kotlinx_serialization = "1.8.1"
const val licenser = "0.6.1"
const val mockk = "1.13.3"
const val sarif4k = "0.5.0"
Expand Down
47 changes: 47 additions & 0 deletions jacodb-ets/src/test/kotlin/org/jacodb/ets/test/EtsFromJsonTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.jsonPrimitive
import mu.KotlinLogging
import org.jacodb.ets.dto.AnyTypeDto
import org.jacodb.ets.dto.AssignStmtDto
import org.jacodb.ets.dto.ClassSignatureDto
import org.jacodb.ets.dto.ClosureFieldRefDto
import org.jacodb.ets.dto.DecoratorDto
import org.jacodb.ets.dto.FieldDto
import org.jacodb.ets.dto.FieldSignatureDto
Expand Down Expand Up @@ -493,4 +495,49 @@ class EtsFromJsonTest {
assertEquals("Cat", cls.fields[0].name)
assertEquals("Dog", cls.fields[1].name)
}

@Test
fun testClosureFieldRefDto() {
val s = """
{
"_": "ClosureFieldRef",
"base": {
"name": "a",
"type": { "_": "UnknownType" }
},
"fieldName": "foo",
"type": { "_": "UnknownType" }
}
""".trimIndent()
val dto = json.decodeFromString<ValueDto>(s)
logger.info { "dto = $dto" }
assertIs<ClosureFieldRefDto>(dto)
}

@Test
fun testAssignArrayRefDto() {
val s = """
{
"_": "AssignStmt",
"left": {
"_": "Local",
"name": "x",
"type": { "_": "NumberType" }
},
"right": {
"_": "ClosureFieldRef",
"base": {
"name": "a",
"type": { "_": "UnknownType" }
},
"fieldName": "foo",
"type": { "_": "UnknownType" }
}
}
""".trimIndent()
val dto = json.decodeFromString<StmtDto>(s)
logger.info { "dto = $dto" }
assertIs<AssignStmtDto>(dto)
assertIs<ClosureFieldRefDto>(dto.right)
}
}
Loading