From e7af2fd28ed46f02046ea329a8e6707a2e217bd6 Mon Sep 17 00:00:00 2001 From: Julia McClellan Date: Fri, 4 Aug 2023 06:22:54 -0400 Subject: Fix handling of Java contravariance (#3092) --- plugins/base/src/test/kotlin/model/JavaTest.kt | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'plugins/base/src') diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt index b3ee2726..f57c3c8c 100644 --- a/plugins/base/src/test/kotlin/model/JavaTest.kt +++ b/plugins/base/src/test/kotlin/model/JavaTest.kt @@ -10,6 +10,7 @@ import org.jetbrains.dokka.model.doc.Text import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import utils.AbstractModelTest +import utils.assertContains import utils.assertNotNull import utils.name import kotlin.test.assertEquals @@ -439,4 +440,48 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") { } } + @Test + fun variances() { + inlineModelTest( + """ + |public class Foo { + | public void superBound(java.util.List param) {} + | public void extendsBound(java.util.List param) {} + | public void unbounded(java.util.List param) {} + |} + """, configuration = configuration + ) { + with((this / "java" / "Foo").cast()) { + val functionNames = functions.map { it.name } + assertContains(functionNames, "superBound") + assertContains(functionNames, "extendsBound") + assertContains(functionNames, "unbounded") + + for (function in functions) { + val param = function.parameters.single() + val type = param.type as GenericTypeConstructor + val variance = type.projections.single() + + when (function.name) { + "superBound" -> { + assertTrue(variance is Contravariance<*>) + val bound = (variance as Contravariance<*>).inner + assertEquals((bound as GenericTypeConstructor).dri.classNames, "String") + } + "extendsBound" -> { + assertTrue(variance is Covariance<*>) + val bound = (variance as Covariance<*>).inner + assertEquals((bound as GenericTypeConstructor).dri.classNames, "String") + } + "unbounded" -> { + assertTrue(variance is Covariance<*>) + val bound = (variance as Covariance<*>).inner + assertTrue(bound is JavaObject) + } + } + } + } + } + } + } -- cgit