aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Ratajczak <andrzej.ratajczak98@gmail.com>2020-06-23 10:50:36 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-06-25 14:56:46 +0200
commit0b0650079ad5df7965e929cfadc0abe95882c7a9 (patch)
tree7c4580bf4cdc5d467b97f2298e314f9aa3089aa4
parentb2ab395be8cb1560088987aa5132d3782596fc80 (diff)
downloaddokka-0b0650079ad5df7965e929cfadc0abe95882c7a9.tar.gz
dokka-0b0650079ad5df7965e929cfadc0abe95882c7a9.tar.bz2
dokka-0b0650079ad5df7965e929cfadc0abe95882c7a9.zip
Fix tests after rebase
-rw-r--r--plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt1
-rw-r--r--plugins/base/src/test/kotlin/enums/EnumsTest.kt8
-rw-r--r--plugins/base/src/test/kotlin/utils/contentUtils.kt2
3 files changed, 6 insertions, 5 deletions
diff --git a/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt b/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
index 68751ee5..99ec25c5 100644
--- a/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/DepredatedAndSinceKotlinTest.kt
@@ -57,7 +57,6 @@ class DepredatedAndSinceKotlinTest : AbstractCoreTest() {
}
}
}
-
}
}
}
diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
index f338a8b3..dba5c24a 100644
--- a/plugins/base/src/test/kotlin/enums/EnumsTest.kt
+++ b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -213,8 +213,10 @@ class EnumsTest : AbstractCoreTest() {
}
}
group {
- link { +"E1" }
- +"()"
+ group {
+ link { +"E1" }
+ +"()"
+ }
}
}
}
@@ -227,5 +229,5 @@ class EnumsTest : AbstractCoreTest() {
this.parentMap.filterValues { it is ClasslikePageNode }.entries.groupBy({ it.value }) { it.key }
private fun ContentGroup.constructorSignature(): String =
- children.drop(1).joinToString(separator = "") { (it as ContentText).text }
+ (children.single() as ContentGroup).children.drop(1).joinToString(separator = "") { (it as ContentText).text }
} \ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/utils/contentUtils.kt b/plugins/base/src/test/kotlin/utils/contentUtils.kt
index 37f7881b..90813cf8 100644
--- a/plugins/base/src/test/kotlin/utils/contentUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/contentUtils.kt
@@ -27,7 +27,7 @@ fun ContentMatcherBuilder<*>.bareSignature(
name: String,
returnType: String? = null,
vararg params: Pair<String, ParamAttributes>
-) = group { // TODO: remove it when double wrapping for signatures will be resolved
+) = group {
annotations.entries.forEach {
group {
unwrapAnnotation(it)