re-enabled tests by default

This commit is contained in:
James Strachan
2012-03-09 07:12:41 +00:00
parent 6d355d7be2
commit b5108912ee
7 changed files with 26 additions and 13 deletions
+6
View File
@@ -19,6 +19,12 @@
<artifactId>pegdown</artifactId> <artifactId>pegdown</artifactId>
<version>${pegdown.version}</version> <version>${pegdown.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
-1
View File
@@ -18,7 +18,6 @@
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -0,0 +1,9 @@
package test.org.jetbrains.kotlin.kunit
import junit.framework.TestCase
class KUnitTest: TestCase() {
fun testAssert(): Unit {
}
}
+1 -1
View File
@@ -56,7 +56,7 @@
<id>compile-kotlin-sources</id> <id>compile-kotlin-sources</id>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
<!--<goal>testCompile</goal>--> <goal>testCompile</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
-9
View File
@@ -29,15 +29,6 @@
<plugin> <plugin>
<groupId>com.goldin.plugins</groupId> <groupId>com.goldin.plugins</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<executions>
<execution>
<id>compile-kotlin-sources</id>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
+6
View File
@@ -31,6 +31,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -11,7 +11,7 @@ class GenerateSiteTest : TestCase() {
val siteOutputDir = File(srcDir, "../../../target/site") val siteOutputDir = File(srcDir, "../../../target/site")
// TODO find version from environment? // TODO find version from environment?
val version = "snapshot" val versionDir = "snapshot"
fun testGenerateSite(): Unit { fun testGenerateSite(): Unit {
val generator = SiteGenerator(srcDir, siteOutputDir) val generator = SiteGenerator(srcDir, siteOutputDir)
@@ -19,7 +19,7 @@ class GenerateSiteTest : TestCase() {
} }
fun testGenerateStdlibKDoc(): Unit { fun testGenerateStdlibKDoc(): Unit {
val outDir = File(siteOutputDir, "versions/$version/apidocs") val outDir = File(siteOutputDir, "versions/$versionDir/apidocs")
println("Generating stdlib KDocs to $outDir") println("Generating stdlib KDocs to $outDir")
copyDocResources(outDir) copyDocResources(outDir)
@@ -27,6 +27,8 @@ class GenerateSiteTest : TestCase() {
args.setSrc("../stdlib/src") args.setSrc("../stdlib/src")
args.setDocOutputDir(outDir.toString()) args.setDocOutputDir(outDir.toString())
args.setOutputDir("target/classes-stdlib") args.setOutputDir("target/classes-stdlib")
val config = args.docConfig
config.title = "Kotlin API"
val compiler = KDocCompiler() val compiler = KDocCompiler()
compiler.exec(System.out, args) compiler.exec(System.out, args)