diff options
| author | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
|---|---|---|
| committer | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
| commit | 218e7b9bd9b40c7216755f20f5a604b4c37b75d7 (patch) | |
| tree | 555a4d92f02c95d8c59177645b157b80433d5a47 /core/src/test | |
| parent | 6dedccb91b4bb3018b32159551b3862fedb7f230 (diff) | |
| parent | ec2dfa898b4cf2613ca15cd959a43f4f590005d3 (diff) | |
| download | dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.gz dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.bz2 dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.zip | |
Merge branch 'dev' of git://github.com/Xerus2000/dokka into Xerus2000-dev
update .gitignore and .idea
# Conflicts:
# .idea/compiler.xml
# .idea/kotlinc.xml
# .idea/modules.xml
# core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
# core/src/main/kotlin/Java/JavadocParser.kt
# core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
# core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
# core/src/main/kotlin/Model/DocumentationReference.kt
# core/src/main/kotlin/Model/PackageDocs.kt
# core/src/main/kotlin/Model/SourceLinks.kt
# core/src/main/kotlin/Utilities/DokkaModules.kt
# core/src/main/kotlin/Utilities/ServiceLocator.kt
# core/src/main/kotlin/javadoc/docbase.kt
# core/src/test/kotlin/format/HtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt
# core/src/test/kotlin/issues/IssuesTest.kt
Diffstat (limited to 'core/src/test')
| -rw-r--r-- | core/src/test/kotlin/TestAPI.kt | 3 | ||||
| -rw-r--r-- | core/src/test/kotlin/javadoc/JavadocTest.kt | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/test/kotlin/TestAPI.kt b/core/src/test/kotlin/TestAPI.kt index 2277de78..4f9af761 100644 --- a/core/src/test/kotlin/TestAPI.kt +++ b/core/src/test/kotlin/TestAPI.kt @@ -6,7 +6,6 @@ import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil import com.intellij.rt.execution.junit.FileComparisonFailure import org.jetbrains.dokka.* -import org.jetbrains.dokka.DokkaConfiguration.SourceLinkDefinition import org.jetbrains.dokka.Utilities.DokkaAnalysisModule import org.jetbrains.dokka.Utilities.DokkaRunModule import org.jetbrains.kotlin.cli.common.config.ContentRoot @@ -32,7 +31,7 @@ data class ModelConfig( val defaultPlatforms: List<String> = emptyList(), val noStdlibLink: Boolean = true, val collectInheritedExtensionsFromLibraries: Boolean = false, - val sourceLinks: List<SourceLinkDefinition> = emptyList() + val sourceLinks: List<DokkaConfiguration.SourceLinkDefinition> = emptyList() ) fun verifyModel( diff --git a/core/src/test/kotlin/javadoc/JavadocTest.kt b/core/src/test/kotlin/javadoc/JavadocTest.kt index 64ada1d5..1c4dd258 100644 --- a/core/src/test/kotlin/javadoc/JavadocTest.kt +++ b/core/src/test/kotlin/javadoc/JavadocTest.kt @@ -149,8 +149,9 @@ class JavadocTest { .find { it.name() == "some" }!!.parameters().first() .type() assertEquals("kotlin.jvm.functions.Function1", methodParamType.qualifiedTypeName()) - assertEquals("? super A, C", methodParamType.asParameterizedType().typeArguments() - .map(Type::qualifiedTypeName).joinToString()) + assertEquals("? super A, C", + methodParamType.asParameterizedType().typeArguments().joinToString(transform = Type::qualifiedTypeName) + ) } } |