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
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class KMapperFirMappingChecker(val collector: MessageCollector, private val sess
if (fromEnum != null && toEnum != null) {
val fromEntries = fromEnum.enumEntryNames().toSet()
val toEntries = toEnum.enumEntryNames().toSet()
if (fromEntries == toEntries) return
if (toEntries.containsAll(fromEntries)) return
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private fun enumsEqual(to: Field, from: Field): Boolean {
to.type.toRegularClassSymbol(session)?.takeIf { it.isEnumClass }?.enumEntryNames()?.toSet() ?: return false
val fromEntries = from.type.toRegularClassSymbol(session)?.takeIf { it.isEnumClass }?.enumEntryNames()?.toSet()
?: return false
return toEntries == fromEntries
return toEntries.containsAll(fromEntries)
}

context(session: FirSession, collector: MessageCollector)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,50 @@ class EnumMappingTest {
}

@Test
fun shouldFail_notEqualEnums() {
fun shouldCompile_sourceSubsetOfTarget() {
IntegrationTest(options)
.file("App.kt") {
$$"""
|package sample
|
|import community.flock.kmapper.mapper
|
|enum class Gender { MALE, FEMALE }
|enum class Generation { GEN_Z, BOOMER }
|data class Person(val name: String, val age: Int, val generation: Generation)
|
|enum class GenerationDto { GEN_Z, MILLENNIALS, BOOMER }
|data class PersonDto(val name: String, val age: Int, val generation: GenerationDto)
|
|fun main() {
| val person = Person("John", 30, Generation.GEN_Z)
| val dto: PersonDto = person.mapper()
| println(dto)
|}
|
""".trimMargin()
}
.compileSuccess { output ->
assertTrue(
output.contains("PersonDto(name=John, age=30, generation=GEN_Z)"),
"Expected PersonDto(name=John, age=30, generation=GEN_Z) in output"
)
}
}

@Test
fun shouldFail_sourceSupersetOfTarget() {
IntegrationTest(options)
.file("App.kt") {
$$"""
|package sample
|
|import community.flock.kmapper.mapper
|
|enum class Gender { MALE, FEMALE, OTHER }
|data class Address(val street: String, val city: String)
|data class Person(val name: String, val gender: Gender, val address: Address)
|
|enum class GenderDto { FEMALE, MALE, X }
|enum class GenderDto { FEMALE, MALE }
|data class AddressDto(val street: String, val city: String)
|data class PersonDto(val name: String, val gender: GenderDto, val address: AddressDto)
|
Expand Down
Loading