diff options
author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-08-19 15:23:53 +0200 |
---|---|---|
committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-08-20 15:36:07 +0200 |
commit | fab2d4ba4f13454ab36ea7ee333579bf3441f2ed (patch) | |
tree | b5ca2c962c8524e8708f63c4ad1eade282c6ac3a /plugins/base/src/test | |
parent | 45bec5b68c2da35860877c6298bff04a4cb3d1d6 (diff) | |
download | dokka-fab2d4ba4f13454ab36ea7ee333579bf3441f2ed.tar.gz dokka-fab2d4ba4f13454ab36ea7ee333579bf3441f2ed.tar.bz2 dokka-fab2d4ba4f13454ab36ea7ee333579bf3441f2ed.zip |
Fix tests after bad rebase
Diffstat (limited to 'plugins/base/src/test')
-rw-r--r-- | plugins/base/src/test/kotlin/signatures/SignatureTest.kt | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt index f33ad5bd..52211998 100644 --- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt @@ -453,15 +453,6 @@ class SignatureTest : AbstractCoreTest() { @Test fun `generic constructor params`() { - val configuration = dokkaConfiguration { - sourceSets { - sourceSet { - moduleName = "test" - name = "common" - sourceRoots = listOf("src/main/kotlin/common/Test.kt") - } - } - } val writerPlugin = TestOutputWriterPlugin() @@ -470,8 +461,6 @@ class SignatureTest : AbstractCoreTest() { |/src/main/kotlin/common/Test.kt |package example | - |import java.util.* - | |class GenericClass<T>(val x: Int) { | constructor(x: T) : this(1) | @@ -481,7 +470,7 @@ class SignatureTest : AbstractCoreTest() { | | constructor(x: Boolean, y: Int, z: String) : this(1) | - | constructor(x: List<Comparable<ServiceLoader<T>>>?) : this(1) + | constructor(x: List<Comparable<Lazy<T>>>?) : this(1) |} | """.trimMargin(), @@ -489,16 +478,15 @@ class SignatureTest : AbstractCoreTest() { pluginOverrides = listOf(writerPlugin) ) { renderingStage = { _, _ -> - writerPlugin.writer.renderedContent("test/example/-generic-class/-generic-class.html").signature().zip( + writerPlugin.writer.renderedContent("root/example/-generic-class/-generic-class.html").signature().zip( listOf( arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("T"), ")", Span()), arrayOf("fun ", A("GenericClass"), "(x: ", A("Int"), ", y: ", A("String"), ")", Span()), arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("Int"), ", y: ", A("List"), "<", A("T"), ">)", Span()), arrayOf("fun ", A("GenericClass"), "(x: ", A("Boolean"), ", y: ", A("Int"), ", z:", A("String"), ")", Span()), arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("List"), "<", A("Comparable"), - "<", A("ServiceLoader"), "<", A("T"), ">>>?)", Span()), + "<", A("Lazy"), "<", A("T"), ">>>?)", Span()), arrayOf("fun ", A("GenericClass"), "(x: ", A("Int"), ")", Span()), - ) ).forEach { it.first.match(*it.second) |