azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set-up usage for kotlin-test lib

Browse Source
This commit is contained in:
Nikolay Krasko
2015-12-23 18:14:00 +03:00
parent 84af26d342
commit 31da7662c5
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/kotlin_test.xml
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="kotlin-test"> <library name="kotlin-test">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-test.jar!/" /> <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/"/>
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+3 -5
View File
@@ -59,8 +59,6 @@ import java.io.File
import java.io.PrintStream import java.io.PrintStream
import java.util.* import java.util.*
import kotlin.properties.Delegates import kotlin.properties.Delegates
import kotlin.test.assertEquals
import kotlin.test.assertFalse
abstract class AbstractIncrementalJpsTest( abstract class AbstractIncrementalJpsTest(
private val allowNoFilesWithSuffixInTestData: Boolean = false, private val allowNoFilesWithSuffixInTestData: Boolean = false,
@@ -189,7 +187,7 @@ abstract class AbstractIncrementalJpsTest(
UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log) UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log)
} }
else { else {
assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") assertFalse("Initial make failed:\n$makeResult", makeResult.makeFailed)
} }
return makeResult return makeResult
@@ -212,8 +210,8 @@ abstract class AbstractIncrementalJpsTest(
} }
val rebuildResult = rebuild() val rebuildResult = rebuild()
assertEquals(rebuildResult.makeFailed, makeOverallResult.makeFailed, assertEquals("Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult",
"Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult") rebuildResult.makeFailed, makeOverallResult.makeFailed)
if (!outAfterMake.exists()) { if (!outAfterMake.exists()) {
assertFalse(outDir.exists()) assertFalse(outDir.exists())
jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
-2
View File
@@ -57,8 +57,6 @@ import java.io.*
import java.util.* import java.util.*
import java.util.regex.Pattern import java.util.regex.Pattern
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
import kotlin.test.assertFalse
import kotlin.test.assertTrue
class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
companion object { companion object {