Fixed bugs and structured tests

Mr-Mappie · Jul 3, 2024 · 00a3ff1 · 00a3ff1
1 parent d056f48
commit 00a3ff1
Show file tree

Hide file tree

Showing 26 changed files with 153 additions and 78 deletions.
diff --git a/compiler-plugin/src/main/kotlin/tech/mappie/generation/MappieIrTransformer.kt b/compiler-plugin/src/main/kotlin/tech/mappie/generation/MappieIrTransformer.kt
@@ -92,7 +92,12 @@ class MappieIrTransformer(private val symbols: List<MappieDefinition>) : IrEleme
                     }
                 }
             } else {
-                logAll(invalids.first().second.problems, location(declaration))
+                val first = invalids.firstOrNull()
+                if (first != null) {
+                    logAll(invalids.first().second.problems, location(declaration))
+                } else {
+                    logError("No constructor visible to use", location(declaration))
+                }
             }
         }
         return declaration

diff --git a/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingBodyCollector.kt b/compiler-plugin/src/main/kotlin/tech/mappie/resolving/classes/ObjectMappingBodyCollector.kt
@@ -191,7 +191,7 @@ private class MapperReferenceCollector : BaseVisitor<IrFunctionExpression, Unit>
                     putValueArgument(0, irGet(itParameter))
                 })
             },
-            IrStatementOrigin.ANONYMOUS_FUNCTION
+            IrStatementOrigin.LAMBDA
         )
 }
 

diff --git a/...ing/MaperClassCanContainPropertiesTest.kt → ...ng/MapperClassCanContainPropertiesTest.kt b/...ing/MaperClassCanContainPropertiesTest.kt → ...ng/MapperClassCanContainPropertiesTest.kt
@@ -8,7 +8,7 @@ import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
 import java.io.File
 
-class MaperClassCanContainPropertiesTest {
+class MapperClassCanContainPropertiesTest {
 
     data class Input(val text: String)
     data class Output(val text: String, val int: Int)
@@ -24,7 +24,7 @@ class MaperClassCanContainPropertiesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.MaperClassCanContainPropertiesTest.*
+                        import tech.mappie.testing.MapperClassCanContainPropertiesTest.*
     
                         class Mapper(private val int: Int) : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/...sCanContainPropertiesUsedInForListTest.kt → ...sCanContainPropertiesUsedInForListTest.kt b/...sCanContainPropertiesUsedInForListTest.kt → ...sCanContainPropertiesUsedInForListTest.kt
@@ -8,7 +8,7 @@ import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
 import java.io.File
 
-class MaperClassCanContainPropertiesUsedInForListTest {
+class MapperClassCanContainPropertiesUsedInForListTest {
 
     data class Input(val text: List<InnerInput>)
     data class InnerInput(val text: String)
@@ -26,7 +26,7 @@ class MaperClassCanContainPropertiesUsedInForListTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.MaperClassCanContainPropertiesUsedInForListTest.*
+                        import tech.mappie.testing.MapperClassCanContainPropertiesUsedInForListTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/.../testing/EnumsWithDifferentEntriesTest.kt → ...ng/enums/EnumsWithDifferentEntriesTest.kt b/.../testing/EnumsWithDifferentEntriesTest.kt → ...ng/enums/EnumsWithDifferentEntriesTest.kt
@@ -1,11 +1,13 @@
-package tech.mappie.testing
+package tech.mappie.testing.enums
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.containsError
+import tech.mappie.testing.loadEnumMappieClass
 import java.io.File
 import kotlin.test.Test
 
@@ -25,7 +27,7 @@ class EnumsWithDifferentEntriesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.EnumsWithDifferentEntriesTest.*
+                        import tech.mappie.testing.enums.EnumsWithDifferentEntriesTest.*
     
                         class Mapper : EnumMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {
@@ -59,7 +61,7 @@ class EnumsWithDifferentEntriesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.EnumsWithDifferentEntriesTest.*
+                        import tech.mappie.testing.enums.EnumsWithDifferentEntriesTest.*
     
                         class Mapper : EnumMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {
@@ -94,7 +96,7 @@ class EnumsWithDifferentEntriesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.EnumsWithDifferentEntriesTest.*
+                        import tech.mappie.testing.enums.EnumsWithDifferentEntriesTest.*
     
                         class Mapper : EnumMappie<Input, Output>()
                         """

diff --git a/...appie/testing/EnumsWithSameEntriesTest.kt → ...testing/enums/EnumsWithSameEntriesTest.kt b/...appie/testing/EnumsWithSameEntriesTest.kt → ...testing/enums/EnumsWithSameEntriesTest.kt
@@ -1,10 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.enums
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.containsWarning
+import tech.mappie.testing.loadEnumMappieClass
 import java.io.File
 import kotlin.test.Test
 
@@ -24,7 +26,7 @@ class EnumsWithSameEntriesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.EnumsWithSameEntriesTest.*
+                        import tech.mappie.testing.enums.EnumsWithSameEntriesTest.*
     
                         class Mapper : EnumMappie<Input, Output>()
                         """
@@ -55,7 +57,7 @@ class EnumsWithSameEntriesTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.EnumsWithSameEntriesTest.*
+                        import tech.mappie.testing.enums.EnumsWithSameEntriesTest.*
     
                         class Mapper : EnumMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/...appie/testing/ObjectWithNestedEnumTest.kt → ...testing/enums/ObjectWithNestedEnumTest.kt b/...appie/testing/ObjectWithNestedEnumTest.kt → ...testing/enums/ObjectWithNestedEnumTest.kt
@@ -1,11 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.enums
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ObjectWithNestedEnumTest {
@@ -26,7 +27,7 @@ class ObjectWithNestedEnumTest {
                         """
                         import tech.mappie.api.ObjectMappie
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.ObjectWithNestedEnumTest.*
+                        import tech.mappie.testing.enums.ObjectWithNestedEnumTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
 

diff --git a/...sting/ObjectWithNestedNullableEnumTest.kt → ...enums/ObjectWithNestedNullableEnumTest.kt b/...sting/ObjectWithNestedNullableEnumTest.kt → ...enums/ObjectWithNestedNullableEnumTest.kt
@@ -1,11 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.enums
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ObjectWithNestedNullableEnumTest {
@@ -26,7 +27,7 @@ class ObjectWithNestedNullableEnumTest {
                         """
                         import tech.mappie.api.ObjectMappie
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.ObjectWithNestedNullableEnumTest.*
+                        import tech.mappie.testing.enums.ObjectWithNestedNullableEnumTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
 
@@ -59,7 +60,7 @@ class ObjectWithNestedNullableEnumTest {
                         """
                         import tech.mappie.api.ObjectMappie
                         import tech.mappie.api.EnumMappie
-                        import tech.mappie.testing.ObjectWithNestedNullableEnumTest.*
+                        import tech.mappie.testing.enums.ObjectWithNestedNullableEnumTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
 

diff --git a/...ting/ObjectWithNestedNonNullToNullTest.kt → ...esting/lists/NonNullListToNullListTest.kt b/...ting/ObjectWithNestedNonNullToNullTest.kt → ...esting/lists/NonNullListToNullListTest.kt
@@ -1,35 +1,38 @@
-package tech.mappie.testing
+package tech.mappie.testing.lists
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
-class ObjectWithNestedNonNullToNullTest {
-    data class Input(val text: InnerInput, val int: Int)
+class NonNullListToNullListTest {
+    data class Input(val text: List<InnerInput>, val int: Int)
     data class InnerInput(val value: String)
-    data class Output(val text: InnerOutput?, val int: Int)
+    data class Output(val text: List<InnerOutput>?, val int: Int)
     data class InnerOutput(val value: String)
 
     @TempDir
     private lateinit var directory: File
 
     @Test
-    fun `map data classes with nested null to non-null using object InnerMapper without declaring mapping should succeed`() {
+    fun `map data classes with nested null list to non-null list using object InnerMapper without declaring mapping should succeed`() {
         KotlinCompilation(directory).apply {
             sources = buildList {
                 add(
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ObjectWithNestedNonNullToNullTest.*
+                        import tech.mappie.testing.lists.NonNullListToNullListTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
 
                         object InnerMapper : ObjectMappie<InnerInput, InnerOutput>()
+
+                        object SecondInnerMapper : ObjectMappie<InnerOutput, InnerInput>()
                         """
                     )
                 )
@@ -44,8 +47,8 @@ class ObjectWithNestedNonNullToNullTest {
                 .first()
                 .call()
 
-            assertThat(mapper.map(Input(InnerInput("value"), 20)))
-                .isEqualTo(Output(InnerOutput("value"), 20))
+            assertThat(mapper.map(Input(listOf(InnerInput("first"), InnerInput("second")), 20)))
+                .isEqualTo(Output(listOf(InnerOutput("first"), InnerOutput("second")), 20))
         }
     }
 }
diff --git a/...ie/testing/ObjectWithNullToNonNullTest.kt → ...mappie/testing/lists/NullToNonNullTest.kt b/...ie/testing/ObjectWithNullToNonNullTest.kt → ...mappie/testing/lists/NullToNonNullTest.kt
@@ -1,14 +1,16 @@
-package tech.mappie.testing
+package tech.mappie.testing.lists
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.containsError
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
-class ObjectWithNullToNonNullTest {
+class NullToNonNullTest {
     data class Input(val value: String?)
     data class Output(val value: String)
 
@@ -23,7 +25,7 @@ class ObjectWithNullToNonNullTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ObjectWithNullToNonNullTest.*
+                        import tech.mappie.testing.lists.NullToNonNullTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
                         """
@@ -45,7 +47,7 @@ class ObjectWithNullToNonNullTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ObjectWithNullToNonNullTest.*
+                        import tech.mappie.testing.lists.NullToNonNullTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/...appie/testing/ObjectWithNestedListTest.kt → ...testing/lists/ObjectWithNestedListTest.kt b/...appie/testing/ObjectWithNestedListTest.kt → ...testing/lists/ObjectWithNestedListTest.kt
@@ -1,11 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.lists
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ObjectWithNestedListTest {
@@ -25,7 +26,7 @@ class ObjectWithNestedListTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ObjectWithNestedListTest.*
+                        import tech.mappie.testing.lists.ObjectWithNestedListTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
 

diff --git a/...kotlin/tech/mappie/testing/ViaListTest.kt → .../tech/mappie/testing/lists/ViaListTest.kt b/...kotlin/tech/mappie/testing/ViaListTest.kt → .../tech/mappie/testing/lists/ViaListTest.kt
@@ -1,11 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.lists
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ViaListTest {
@@ -24,7 +25,7 @@ class ViaListTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ViaListTest.*
+                        import tech.mappie.testing.lists.ViaListTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/...ting/ConstructorParameterNotAFieldTest.kt → ...ects/ConstructorParameterNotAFieldTest.kt b/...ting/ConstructorParameterNotAFieldTest.kt → ...ects/ConstructorParameterNotAFieldTest.kt
@@ -1,4 +1,4 @@
-package tech.mappie.testing
+package tech.mappie.testing.objects
 
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.kotlin.com.google.common.base.Objects
@@ -7,6 +7,8 @@ import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.containsError
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ConstructorParameterNotAFieldTest {
@@ -30,7 +32,7 @@ class ConstructorParameterNotAFieldTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ConstructorParameterNotAFieldTest.*
+                        import tech.mappie.testing.objects.ConstructorParameterNotAFieldTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {
@@ -55,7 +57,7 @@ class ConstructorParameterNotAFieldTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ConstructorParameterNotAFieldTest.*
+                        import tech.mappie.testing.objects.ConstructorParameterNotAFieldTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {

diff --git a/...appie/testing/ConstructorSelectionTest.kt → ...sting/objects/ConstructorSelectionTest.kt b/...appie/testing/ConstructorSelectionTest.kt → ...sting/objects/ConstructorSelectionTest.kt
@@ -1,11 +1,12 @@
-package tech.mappie.testing
+package tech.mappie.testing.objects
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import tech.mappie.testing.compilation.KotlinCompilation
 import tech.mappie.testing.compilation.KotlinCompilation.ExitCode
 import tech.mappie.testing.compilation.SourceFile.Companion.kotlin
+import tech.mappie.testing.loadObjectMappieClass
 import java.io.File
 
 class ConstructorSelectionTest {
@@ -26,7 +27,7 @@ class ConstructorSelectionTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ConstructorSelectionTest.*
+                        import tech.mappie.testing.objects.ConstructorSelectionTest.*
     
                         class Mapper : ObjectMappie<Input, Output>() {
                             override fun map(from: Input) = mapping {
@@ -60,7 +61,7 @@ class ConstructorSelectionTest {
                     kotlin("Test.kt",
                         """
                         import tech.mappie.api.ObjectMappie
-                        import tech.mappie.testing.ConstructorSelectionTest.*
+                        import tech.mappie.testing.objects.ConstructorSelectionTest.*
     
                         class Mapper : ObjectMappie<Input, Output>()
                         """
-Original file line number
+Diff line change
@@ Expand Up @@
                         putValueArgument(0, irGet(itParameter))
                     })
                 },
-                IrStatementOrigin.ANONYMOUS_FUNCTION
+                IrStatementOrigin.LAMBDA
             )
     }
@@ Expand Down @@