From 3aeb65472be150a6098f2fac17dbdf0bb2a40013 Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Thu, 7 May 2020 17:10:10 +0200
Subject: Missing generics on class. Add generics to annotation #834

---
 plugins/base/src/test/kotlin/model/ClassesTest.kt | 27 ++++++++++++++++++++++-
 plugins/base/src/test/kotlin/model/JavaTest.kt    |  1 -
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'plugins/base/src/test/kotlin/model')

diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index a349e54a..ea0d93ed 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -425,7 +425,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Foo").cast<DClass>()) {
                 with(extra[Annotations]?.content?.firstOrNull().assertNotNull("annotations")) {
-                    dri.toString() equals "kotlin/Suppress////"
+                    dri.toString() equals "kotlin/Suppress///PointingToDeclaration/"
                     with(params["names"].assertNotNull("param")) {
                         this equals "[\"abc\"]"
                     }
@@ -459,4 +459,29 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             }
         }
     }
+
+    @Test fun genericAnnotationClass() {
+        inlineModelTest(
+            """annotation class Foo<A,B,C,D:Number>() {}"""
+        ) {
+            with((this / "classes" / "Foo").cast<DAnnotation>()){
+                generics.map { it.name to it.bounds.first().name } equals listOf("A" to "Any", "B" to "Any", "C" to "Any", "D" to "Number")
+            }
+        }
+    }
+
+    @Test fun nestedGenericClasses(){
+        inlineModelTest(
+            """
+            |class Outer<OUTER> {
+            |   inner class Inner<INNER, T : OUTER> { }
+            |}
+        """.trimMargin()
+        ){
+            with((this / "classes" / "Outer").cast<DClass>()){
+                val inner = classlikes.single().cast<DClass>()
+                inner.generics.map { it.name to it.bounds.first().name } equals listOf("INNER" to "Any", "T" to "OUTER")
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index a58b380c..76924f0f 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -394,7 +394,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    @Disabled("reenable after fixing subtypes")
     @Test
     fun inheritorLinks() {
         inlineModelTest(
-- 
cgit