Merge pull request #24 from jetbrains-academy/fix-bugs-in-types

Add possibleBounds to kotlin types
jetbrains-academy · Oct 20, 2023 · 1ff58e9 · 1ff58e9
2 parents 1bace41 + 36f323b
commit 1ff58e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "org.jetbrains.academy.test.system"
-version = "2.0.6"
+version = "2.0.7"
 
 allprojects {
     apply {

diff --git a/core/src/main/kotlin/org/jetbrains/academy/test/system/core/MethodUtils.kt b/core/src/main/kotlin/org/jetbrains/academy/test/system/core/MethodUtils.kt
@@ -40,10 +40,10 @@ fun Array<Method>.findMethod(method: TestMethod, customErrorMessage: String? = n
                 it.name == method.name
             }
         }
-    val returnTypeJava = method.returnTypeJava ?: method.returnType.type
+    val returnTypeJava = (method.returnTypeJava?.let { listOf(it) } ?: listOfNotNull(method.returnType.type, *method.returnType.possibleBounds.toTypedArray())).map { it.lowercase() }
     val filteredByType =
         filteredByName.filterByCondition(customErrorMessage ?: "The method ${method.name} should have the return type ${method.returnType.getTypePrettyString()}") {
-            it.returnType.name.getShortName().lowercase() == returnTypeJava.lowercase()
+            it.returnType.name.getShortName().lowercase() in returnTypeJava
         }
     val filteredByArgumentsCount =
         filteredByType.filterByCondition(customErrorMessage ?: "The method ${method.name} should have ${method.arguments.size} arguments") { it.parameterCount == method.arguments.size }

diff --git a/core/src/main/kotlin/org/jetbrains/academy/test/system/core/models/TestKotlinType.kt b/core/src/main/kotlin/org/jetbrains/academy/test/system/core/models/TestKotlinType.kt
@@ -40,6 +40,7 @@ data class TestKotlinType(
     val abbreviation: String? = null,
     val isNullable: Boolean = false,
     val params: List<String> = emptyList(),
+    val possibleBounds: List<String> = emptyList(),
 ) {
     fun getTypePrettyString() = abbreviation ?: run {
         if (params.isNotEmpty()) {