KON-560 Methods With KClass Parameter Fails When Name Of The Class Defined In The File Is The Same As Imported Class

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/kononnullabletype/snippet/declaration-has-complex-type.kttxt

@@ -2,4 +2,4 @@ import com.lemonappdev.konsist.testdata.SampleType
 
 typealias SampleTypeAlias = SampleType
 
-class SampleClass1(val sampleProperty1: SampleTypeAlias)
+class SampleClass1(val sampleProperty1: SampleType)

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/kononnullabletype/snippet/declaration-has-simple-type.kttxt

@@ -1,3 +1,3 @@
 typealias SampleTypeAlias = String
 
-class SampleClass1(val sampleProperty1: SampleTypeAlias)
+class SampleClass1(val sampleProperty1: String)

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/koparent/KoParentProviderExtTest.kt

@@ -24,7 +24,6 @@ class KoParentProviderExtTest {
         // then
         assertSoftly(sut) {
             hasParentOf<SampleParentClass>() shouldBeEqualTo true
-            hasParentOf<SampleParentInterface>() shouldBeEqualTo true
             hasParentOf<SampleExternalInterface>() shouldBeEqualTo true
             hasParentOf<SampleClass>() shouldBeEqualTo false
             hasParentOf<SampleInterface>() shouldBeEqualTo false
@@ -42,7 +41,6 @@ class KoParentProviderExtTest {
         // then
         assertSoftly(sut) {
             hasParentOf<SampleParentClass>() shouldBeEqualTo true
-            hasParentOf<SampleParentInterface>() shouldBeEqualTo true
             hasParentOf<SampleExternalInterface>() shouldBeEqualTo true
             hasParentOf<SampleClass>() shouldBeEqualTo false
             hasParentOf<SampleInterface>() shouldBeEqualTo false
@@ -59,7 +57,6 @@ class KoParentProviderExtTest {
 
         // then
         assertSoftly(sut) {
-//            hasParentOf<SampleInterfaceFromFile>() shouldBeEqualTo true
             hasParentOf<SampleParentInterface>() shouldBeEqualTo true
             hasParentOf<SampleExternalInterface>() shouldBeEqualTo true
             hasParentOf<SampleInterface>() shouldBeEqualTo false

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/koparent/snippet/interface-has-each-type-of-parents.kttxt

@@ -3,6 +3,4 @@ package com.lemonappdev.konsist.api.ext.provider.koparent.snippet
 import com.lemonappdev.konsist.externalsample.SampleExternalInterface
 import com.lemonappdev.konsist.testdata.SampleParentInterface
 
-interface SampleInterface : SampleInterfaceFromFile, SampleParentInterface, SampleExternalInterface
-
-interface SampleInterfaceFromFile
+interface SampleInterface :  SampleParentInterface, SampleExternalInterface

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/koparentclass/KoParentClassProviderExtTest.kt

@@ -25,36 +25,6 @@ class KoParentClassProviderExtTest {
         }
     }
 
-    @Test
-    fun `class-has-parent-class-defined-in-the-same-file`() {
-        // given
-        val sut = getSnippetFile("class-has-parent-class-defined-in-the-same-file")
-            .classes()
-            .first()
-
-        // then
-        assertSoftly(sut) {
-            hasParentClassOf<SampleParentClass>() shouldBeEqualTo true
-            hasParentClassOf<SampleParentInterface>() shouldBeEqualTo false
-            hasParentClassOf<SampleClass>() shouldBeEqualTo false
-        }
-    }
-
-    @Test
-    fun `object-has-parent-class-defined-in-the-same-file`() {
-        // given
-        val sut = getSnippetFile("object-has-parent-class-defined-in-the-same-file")
-            .objects()
-            .first()
-
-        // then
-        assertSoftly(sut) {
-            hasParentClassOf<SampleParentClass>() shouldBeEqualTo true
-            hasParentClassOf<SampleParentInterface>() shouldBeEqualTo false
-            hasParentClassOf<SampleClass>() shouldBeEqualTo false
-        }
-    }
-
     @Test
     fun `object-has-parent-class-imported-from-external-file`() {
         // given

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/api/ext/provider/koparentinterface/KoParentInterfaceProviderExtTest.kt

@@ -25,21 +25,6 @@ class KoParentInterfaceProviderExtTest {
         }
     }
 
-    @Test
-    fun `class-has-parent-interface-defined-in-the-same-file`() {
-        // given
-        val sut = getSnippetFile("class-has-parent-interface-defined-in-the-same-file")
-            .classes()
-            .first()
-
-        // then
-        assertSoftly(sut) {
-            hasParentInterfaceOf<SampleParentInterface>() shouldBeEqualTo true
-            hasParentInterfaceOf<SampleParentInterface1>() shouldBeEqualTo false
-            hasParentInterfaceOf<SampleParentClass>() shouldBeEqualTo false
-        }
-    }
-
     @Test
     fun `object-has-parent-interface-imported-from-external-file`() {
         // given
@@ -55,21 +40,6 @@ class KoParentInterfaceProviderExtTest {
         }
     }
 
-    @Test
-    fun `object-has-parent-interface-defined-in-the-same-file`() {
-        // given
-        val sut = getSnippetFile("object-has-parent-interface-defined-in-the-same-file")
-            .objects()
-            .first()
-
-        // then
-        assertSoftly(sut) {
-            hasParentInterfaceOf<SampleParentInterface>() shouldBeEqualTo true
-            hasParentInterfaceOf<SampleParentInterface1>() shouldBeEqualTo false
-            hasParentInterfaceOf<SampleParentClass>() shouldBeEqualTo false
-        }
-    }
-
     @Test
     fun `interface-has-parent-interface-imported-from-external-file`() {
         // given
@@ -85,21 +55,6 @@ class KoParentInterfaceProviderExtTest {
         }
     }
 
-    @Test
-    fun `interface-has-parent-interface-defined-in-the-same-file`() {
-        // given
-        val sut = getSnippetFile("interface-has-parent-interface-defined-in-the-same-file")
-            .interfaces()
-            .first()
-
-        // then
-        assertSoftly(sut) {
-            hasParentInterfaceOf<SampleParentInterface>() shouldBeEqualTo true
-            hasParentInterfaceOf<SampleParentInterface1>() shouldBeEqualTo false
-            hasParentInterfaceOf<SampleParentClass>() shouldBeEqualTo false
-        }
-    }
-
     private fun getSnippetFile(fileName: String) =
         TestSnippetProvider.getSnippetKoScope("api/ext/provider/koparentinterface/snippet/", fileName)
 }

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/KoClassDeclarationForKoParentClassProviderTest.kt

@@ -3,7 +3,6 @@ package com.lemonappdev.konsist.core.declaration.koclass
 import com.lemonappdev.konsist.TestSnippetProvider.getSnippetKoScope
 import com.lemonappdev.konsist.testdata.SampleClass
 import com.lemonappdev.konsist.testdata.SampleParentClass
-import com.lemonappdev.konsist.testdata.SampleParentClass1
 import com.lemonappdev.konsist.testdata.SampleParentClass2
 import org.amshove.kluent.assertSoftly
 import org.amshove.kluent.shouldBeEqualTo
@@ -187,23 +186,13 @@ class KoClassDeclarationForKoParentClassProviderTest {
             hasAllParentClasses(indirectParents = true) { it.name == "SampleParentClass1" } shouldBeEqualTo false
             hasAllParentClasses(indirectParents = true) { it.hasNameStartingWith("Sample") } shouldBeEqualTo true
             hasAllParentClasses(indirectParents = true) { it.hasNameStartingWith("Other") } shouldBeEqualTo false
-            hasParentClassOf(SampleParentClass1::class, indirectParents = true) shouldBeEqualTo true
-            hasParentClassOf(
-                SampleParentClass1::class,
-                SampleParentClass2::class,
-                indirectParents = true,
-            ) shouldBeEqualTo true
-            hasAllParentClassesOf(SampleParentClass1::class, indirectParents = true) shouldBeEqualTo true
+            hasParentClassOf(SampleParentClass2::class, indirectParents = true) shouldBeEqualTo true
+            hasAllParentClassesOf(SampleParentClass2::class, indirectParents = true) shouldBeEqualTo true
             hasAllParentClassesOf(
-                SampleParentClass1::class,
+                SampleParentClass2::class,
                 SampleClass::class,
                 indirectParents = true,
             ) shouldBeEqualTo false
-            hasAllParentClassesOf(
-                SampleParentClass1::class,
-                SampleParentClass2::class,
-                indirectParents = true,
-            ) shouldBeEqualTo true
         }
     }
 

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/KoClassDeclarationForKoParentInterfaceProviderTest.kt

@@ -169,23 +169,13 @@ class KoClassDeclarationForKoParentInterfaceProviderTest {
             hasAllParentInterfaces(indirectParents = true) { it.name == "SampleParentInterface1" } shouldBeEqualTo false
             hasAllParentInterfaces(indirectParents = true) { it.hasNameStartingWith("Sample") } shouldBeEqualTo true
             hasAllParentInterfaces(indirectParents = true) { it.hasNameStartingWith("Other") } shouldBeEqualTo false
-            hasParentInterfaceOf(SampleParentInterface1::class, indirectParents = true) shouldBeEqualTo true
-            hasParentInterfaceOf(
-                SampleParentInterface1::class,
-                SampleParentInterface2::class,
-                indirectParents = true,
-            ) shouldBeEqualTo true
-            hasAllParentInterfacesOf(SampleParentInterface1::class, indirectParents = true) shouldBeEqualTo true
+            hasParentInterfaceOf(SampleParentInterface2::class, indirectParents = true) shouldBeEqualTo true
+            hasAllParentInterfacesOf(SampleParentInterface2::class, indirectParents = true) shouldBeEqualTo true
             hasAllParentInterfacesOf(
-                SampleParentInterface1::class,
+                SampleParentInterface2::class,
                 SampleParentInterface::class,
                 indirectParents = true,
             ) shouldBeEqualTo false
-            hasAllParentInterfacesOf(
-                SampleParentInterface1::class,
-                SampleParentInterface2::class,
-                indirectParents = true,
-            ) shouldBeEqualTo true
         }
     }
 

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/KoClassDeclarationForKoParentProviderTest.kt

@@ -136,11 +136,6 @@ class KoClassDeclarationForKoParentProviderTest {
                 SampleInterface::class,
                 indirectParents = true,
             ) shouldBeEqualTo false
-            hasAllParentsOf(
-                SampleParentInterface2::class,
-                SampleParentInterface1::class,
-                indirectParents = true,
-            ) shouldBeEqualTo true
         }
     }
 

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentclassprovider/class-has-indirect-parent-classes.kttxt

@@ -1,7 +1,7 @@
+import com.lemonappdev.konsist.testdata.SampleParentClass2
+
 class SampleClass : SampleParentClass()
 
 open class SampleParentClass: SampleParentClass1()
 
 open class SampleParentClass1: SampleParentClass2()
-
-open class SampleParentClass2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentclassprovider/class-has-only-direct-parent-class.kttxt

@@ -1,3 +1,3 @@
-class SampleClass : SampleParentClass()
+import com.lemonappdev.konsist.testdata.SampleParentClass
 
-open class SampleParentClass
+class SampleClass : SampleParentClass()

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentclassprovider/class-has-parent-class-interfaces-and-external-parent.kttxt

@@ -1,9 +1,6 @@
 import com.lemonappdev.konsist.externalsample.SampleExternalInterface
+import com.lemonappdev.konsist.testdata.SampleParentClass
+import com.lemonappdev.konsist.testdata.SampleParentInterface1
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
 
 class SampleClass : SampleParentClass(), SampleParentInterface1, SampleParentInterface2, SampleExternalInterface
-
-open class SampleParentClass
-
-interface SampleParentInterface1
-
-interface SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentinterfaceprovider/class-has-indirect-parent-interfaces.kttxt

@@ -1,7 +1,7 @@
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
+
 class SampleClass : SampleParentClass()
 
 open class SampleParentClass: SampleParentInterface1
 
 interface SampleParentInterface1: SampleParentInterface2
-
-interface SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentinterfaceprovider/class-has-only-direct-parent-interfaces.kttxt

@@ -1,5 +1,4 @@
-class SampleClass : SampleParentInterface1, SampleParentInterface2
-
-interface SampleParentInterface1
+import com.lemonappdev.konsist.testdata.SampleParentInterface1
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
 
-interface SampleParentInterface2
+class SampleClass : SampleParentInterface1, SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentinterfaceprovider/class-has-parent-class-interfaces-and-external-parent.kttxt

@@ -1,9 +1,6 @@
 import com.lemonappdev.konsist.externalsample.SampleExternalInterface
+import com.lemonappdev.konsist.testdata.SampleParentClass
+import com.lemonappdev.konsist.testdata.SampleParentInterface1
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
 
 class SampleClass : SampleParentClass(), SampleParentInterface1, SampleParentInterface2, SampleExternalInterface
-
-open class SampleParentClass
-
-interface SampleParentInterface1
-
-interface SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentprovider/class-has-direct-parent-class-interfaces-and-external-parent.kttxt

@@ -1,9 +1,6 @@
 import com.lemonappdev.konsist.externalsample.SampleExternalInterface
+import com.lemonappdev.konsist.testdata.SampleParentClass
+import com.lemonappdev.konsist.testdata.SampleParentInterface1
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
 
 class SampleClass : SampleParentClass(), SampleParentInterface1, SampleParentInterface2, SampleExternalInterface
-
-open class SampleParentClass
-
-interface SampleParentInterface1
-
-interface SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koclass/snippet/forkoparentprovider/class-has-indirect-parents.kttxt

@@ -1,9 +1,8 @@
 import com.lemonappdev.konsist.externalsample.SampleExternalInterface
+import com.lemonappdev.konsist.testdata.SampleParentInterface2
 
 class SampleClass : SampleParentClass(), SampleParentInterface1, SampleExternalInterface
 
 open class SampleParentClass
 
 interface SampleParentInterface1 : SampleParentInterface2
-
-interface SampleParentInterface2

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/koconstructor/KoConstructorDeclarationForKoParametersProviderTest.kt

@@ -68,7 +68,7 @@ class KoConstructorDeclarationForKoParametersProviderTest {
             parameters.size shouldBeEqualTo 2
             numParameters shouldBeEqualTo 2
             countParameters { it.hasNameStartingWith("sample") } shouldBeEqualTo 2
-            countParameters { it.hasTypeOf(Int::class) } shouldBeEqualTo 1
+            countParameters { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo 1
             hasParameters() shouldBeEqualTo true
             hasParameterWithName("sampleParameter1") shouldBeEqualTo true
             hasParameterWithName("otherParameter") shouldBeEqualTo false
@@ -77,9 +77,9 @@ class KoConstructorDeclarationForKoParametersProviderTest {
             hasParametersWithAllNames("sampleParameter1", "sampleParameter2") shouldBeEqualTo true
             hasParametersWithAllNames("sampleParameter1", "otherParameter") shouldBeEqualTo false
             hasParameter { it.hasNameStartingWith("sample") } shouldBeEqualTo true
-            hasParameter { it.hasTypeOf(Int::class) } shouldBeEqualTo true
+            hasParameter { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo true
             hasAllParameters { it.hasNameStartingWith("sample") } shouldBeEqualTo true
-            hasAllParameters { it.hasTypeOf(Int::class) } shouldBeEqualTo false
+            hasAllParameters { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo false
         }
     }
 

lib/src/integrationTest/kotlin/com/lemonappdev/konsist/core/declaration/kofunction/KoFunctionDeclarationForKoParametersProviderTest.kt

@@ -62,7 +62,7 @@ class KoFunctionDeclarationForKoParametersProviderTest {
             parameters.size shouldBeEqualTo 2
             numParameters shouldBeEqualTo 2
             countParameters { it.hasNameStartingWith("sample") } shouldBeEqualTo 2
-            countParameters { it.hasTypeOf(Int::class) } shouldBeEqualTo 1
+            countParameters { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo 1
             hasParameters() shouldBeEqualTo true
             hasParameterWithName("sampleParameter1") shouldBeEqualTo true
             hasParameterWithName("otherParameter") shouldBeEqualTo false
@@ -71,9 +71,9 @@ class KoFunctionDeclarationForKoParametersProviderTest {
             hasParametersWithAllNames("sampleParameter1", "sampleParameter2") shouldBeEqualTo true
             hasParametersWithAllNames("sampleParameter1", "otherParameter") shouldBeEqualTo false
             hasParameter { it.hasNameStartingWith("sample") } shouldBeEqualTo true
-            hasParameter { it.hasTypeOf(Int::class) } shouldBeEqualTo true
+            hasParameter { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo true
             hasAllParameters { it.hasNameStartingWith("sample") } shouldBeEqualTo true
-            hasAllParameters { it.hasTypeOf(Int::class) } shouldBeEqualTo false
+            hasAllParameters { param -> param.hasType { it.name == "Int" } } shouldBeEqualTo false
         }
     }