Changing approach from platform-driven to source-set-driven

1 files changed, 9 insertions, 11 deletions

diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index ee109ba1..a349e54a 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,9 +1,7 @@
 package model
 
-import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.KotlinModifier.*
-import org.jetbrains.dokka.pages.PlatformData
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -169,7 +167,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
-                modifier.allValues.forEach { it equals Sealed }
+                modifier.values.forEach { it equals Sealed }
             }
         }
     }
@@ -211,15 +209,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val D = (this / "classes" / "D").cast<DClass>()
 
             with(C) {
-                modifier.allValues.forEach { it equals Open }
+                modifier.values.forEach { it equals Open }
                 with((this / "f").cast<DFunction>()) {
-                    modifier.allValues.forEach { it equals Open }
+                    modifier.values.forEach { it equals Open }
                 }
             }
             with(D) {
-                modifier.allValues.forEach { it equals Final }
+                modifier.values.forEach { it equals Final }
                 with((this / "f").cast<DFunction>()) {
-                    modifier.allValues.forEach { it equals Open }
+                    modifier.values.forEach { it equals Open }
                 }
                 D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
             }
@@ -246,16 +244,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val E = (this / "classes" / "E").cast<DClass>()
 
             with(C) {
-                modifier.allValues.forEach { it equals Abstract }
-                ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract }
+                modifier.values.forEach { it equals Abstract }
+                ((this / "foo").cast<DFunction>()).modifier.values.forEach { it equals Abstract }
             }
 
             with(D) {
-                modifier.allValues.forEach { it equals Abstract }
+                modifier.values.forEach { it equals Abstract }
             }
 
             with(E) {
-                modifier.allValues.forEach { it equals Final }
+                modifier.values.forEach { it equals Final }
 
             }
             D.supers.firstOrNull() equals C.dri