From cf5b1aff6e7bb51414f80ff71f8d2feeb9e5fb9f Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Mon, 8 Jun 2020 11:34:15 +0200
Subject: Fix after rebase

---
 .../SkippingParenthesisForConstructorsTest.kt      | 48 +++++++++-------------
 plugins/base/src/test/kotlin/utils/contentUtils.kt |  2 +-
 2 files changed, 20 insertions(+), 30 deletions(-)

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

diff --git a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
index d1e4dad8..b96b5b46 100644
--- a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
+++ b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
@@ -36,10 +36,8 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
                         header(1) { +"SomeClass" }
                         platformHinted {
                             group {
-                                group {
-                                    +"class"
-                                    link { +"SomeClass" }
-                                }
+                                +"class"
+                                link { +"SomeClass" }
                             }
                         }
                     }
@@ -68,10 +66,8 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
                         header(1) { +"SomeClass" }
                         platformHinted {
                             group {
-                                group {
-                                    +"class"
-                                    link { +"SomeClass" }
-                                }
+                                +"class"
+                                link { +"SomeClass" }
                             }
                         }
                     }
@@ -100,13 +96,11 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
                         header(1) { +"SomeClass" }
                         platformHinted {
                             group {
-                                group {
-                                    +"class"
-                                    link { +"SomeClass" }
-                                    +"(a:"
-                                    group { link { +"String" } }
-                                    +")"
-                                }
+                                +"class"
+                                link { +"SomeClass" }
+                                +"(a:"
+                                group { link { +"String" } }
+                                +")"
                             }
                         }
                     }
@@ -135,13 +129,11 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
                         header(1) { +"SomeClass" }
                         platformHinted {
                             group {
-                                group {
-                                    +"class"
-                                    link { +"SomeClass" }
-                                    +"(a:" // TODO: Make sure if we still do not want to have "val" here
-                                    group { link { +"String" } }
-                                    +")"
-                                }
+                                +"class"
+                                link { +"SomeClass" }
+                                +"(a:" // TODO: Make sure if we still do not want to have "val" here
+                                group { link { +"String" } }
+                                +")"
                             }
                         }
                     }
@@ -171,13 +163,11 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
                         header(1) { +"SomeClass" }
                         platformHinted {
                             group {
-                                group {
-                                    +"class"
-                                    link { +"SomeClass" }
-                                    +"(a:"
-                                    group { link { +"String" } }
-                                    +")"
-                                }
+                                +"class"
+                                link { +"SomeClass" }
+                                +"(a:"
+                                group { link { +"String" } }
+                                +")"
                             }
                         }
                     }
diff --git a/plugins/base/src/test/kotlin/utils/contentUtils.kt b/plugins/base/src/test/kotlin/utils/contentUtils.kt
index c7cea1f1..37f7881b 100644
--- a/plugins/base/src/test/kotlin/utils/contentUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/contentUtils.kt
@@ -178,7 +178,7 @@ fun ContentMatcherBuilder<*>.unnamedTag(tag: String, content: ContentMatcherBuil
         group { content() }
     }
 
-private fun ContentMatcherBuilder<*>.unwrapAnnotation(elem: Map.Entry<String, Set<String>>) {
+fun ContentMatcherBuilder<*>.unwrapAnnotation(elem: Map.Entry<String, Set<String>>) {
     group {
         +"@"
         link { +elem.key }
-- 
cgit