From 3f9dedbc9a0d559ab1320c395847ff88af7ad497 Mon Sep 17 00:00:00 2001
From: Filip Zybała <fzybala@virtuslab.com>
Date: Thu, 26 Mar 2020 09:54:01 +0100
Subject: Fixed tests

---
 plugins/base/src/test/kotlin/model/ClassesTest.kt    | 20 +++++++++++---------
 .../renderers/html/PlatformDependentHintTest.kt      |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

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

diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index a7ec861a..ee109ba1 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,7 +1,9 @@
 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
@@ -167,7 +169,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
-                modifier equals Sealed
+                modifier.allValues.forEach { it equals Sealed }
             }
         }
     }
@@ -209,15 +211,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val D = (this / "classes" / "D").cast<DClass>()
 
             with(C) {
-                modifier equals Open
+                modifier.allValues.forEach { it equals Open }
                 with((this / "f").cast<DFunction>()) {
-                    modifier equals Open
+                    modifier.allValues.forEach { it equals Open }
                 }
             }
             with(D) {
-                modifier equals Final
+                modifier.allValues.forEach { it equals Final }
                 with((this / "f").cast<DFunction>()) {
-                    modifier equals Open
+                    modifier.allValues.forEach { it equals Open }
                 }
                 D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
             }
@@ -244,16 +246,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val E = (this / "classes" / "E").cast<DClass>()
 
             with(C) {
-                modifier equals Abstract
-                ((this / "foo").cast<DFunction>()).modifier equals Abstract
+                modifier.allValues.forEach { it equals Abstract }
+                ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract }
             }
 
             with(D) {
-                modifier equals Abstract
+                modifier.allValues.forEach { it equals Abstract }
             }
 
             with(E) {
-                modifier equals Final
+                modifier.allValues.forEach { it equals Final }
 
             }
             D.supers.firstOrNull() equals C.dri
diff --git a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
index f46f8b59..f8ba51a6 100644
--- a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
@@ -40,7 +40,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("a"), "[pl1]", Div("b"), "[pl2]", Div("c"), "[pl3]")
+        renderedContent.match("[pl1]", Div("a"), "[pl2]",  Div("b"), "[pl3]", Div("c"))
     }
 
     @Test
@@ -54,7 +54,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("ab"), "[pl1]", Div("bc"), "[pl2]")
+        renderedContent.match("[pl1]", Div("ab"), "[pl2]", Div("bc"))
     }
 
     @Test
@@ -84,7 +84,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div("ab")), "[pl1]", Div(Div("a"), "b"), "[pl2]")
+        renderedContent.match("[pl1]", Div(Div("ab")), "[pl2]", Div(Div("a"), "b"))
     }
 
     @Test
@@ -115,6 +115,6 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("a"), "[pl1, pl2]", Div("b"), "[pl3]")
+        renderedContent.match("[pl1, pl2]", Div("a"), "[pl3]",  Div("b"))
     }
 }
\ No newline at end of file
-- 
cgit