diff --git a/libraries/kdoc/pom.xml b/libraries/kdoc/pom.xml index 4253655263e..49d5ae710e1 100644 --- a/libraries/kdoc/pom.xml +++ b/libraries/kdoc/pom.xml @@ -19,6 +19,12 @@ pegdown ${pegdown.version} + + junit + junit + ${junit-version} + test + diff --git a/libraries/kunit/pom.xml b/libraries/kunit/pom.xml index 069fdb12040..27416f56edd 100644 --- a/libraries/kunit/pom.xml +++ b/libraries/kunit/pom.xml @@ -18,7 +18,6 @@ junit junit ${junit-version} - compile diff --git a/libraries/kunit/test/test/org/jetbrains/kotlin/kunit/KUnitTest.kt b/libraries/kunit/test/test/org/jetbrains/kotlin/kunit/KUnitTest.kt new file mode 100644 index 00000000000..a7c3534374f --- /dev/null +++ b/libraries/kunit/test/test/org/jetbrains/kotlin/kunit/KUnitTest.kt @@ -0,0 +1,9 @@ +package test.org.jetbrains.kotlin.kunit + +import junit.framework.TestCase + +class KUnitTest: TestCase() { + + fun testAssert(): Unit { + } +} diff --git a/libraries/pom.xml b/libraries/pom.xml index 62e60963e85..611a8ecf813 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -56,7 +56,7 @@ compile-kotlin-sources compile - + testCompile diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml index be1bc8b2fbb..4839e765ad1 100644 --- a/libraries/stdlib/pom.xml +++ b/libraries/stdlib/pom.xml @@ -29,15 +29,6 @@ com.goldin.plugins kotlin-maven-plugin - - - compile-kotlin-sources - - compile - testCompile - - - diff --git a/libraries/website/pom.xml b/libraries/website/pom.xml index 53751a637a1..33772cc9496 100644 --- a/libraries/website/pom.xml +++ b/libraries/website/pom.xml @@ -31,6 +31,12 @@ ${project.version} test + + junit + junit + ${junit-version} + test + diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt index 153ca2ef7ae..a08c39ba8e2 100644 --- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt +++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt @@ -11,7 +11,7 @@ class GenerateSiteTest : TestCase() { val siteOutputDir = File(srcDir, "../../../target/site") // TODO find version from environment? - val version = "snapshot" + val versionDir = "snapshot" fun testGenerateSite(): Unit { val generator = SiteGenerator(srcDir, siteOutputDir) @@ -19,7 +19,7 @@ class GenerateSiteTest : TestCase() { } fun testGenerateStdlibKDoc(): Unit { - val outDir = File(siteOutputDir, "versions/$version/apidocs") + val outDir = File(siteOutputDir, "versions/$versionDir/apidocs") println("Generating stdlib KDocs to $outDir") copyDocResources(outDir) @@ -27,6 +27,8 @@ class GenerateSiteTest : TestCase() { args.setSrc("../stdlib/src") args.setDocOutputDir(outDir.toString()) args.setOutputDir("target/classes-stdlib") + val config = args.docConfig + config.title = "Kotlin API" val compiler = KDocCompiler() compiler.exec(System.out, args)