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

[TEST] Extract compiler-specific test utils from :tests-common to new module

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-14 15:20:28 +03:00
parent d15c7861b2
commit 1fe5148f0d
43 changed files with 412 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AnalysisHandler.kt
+1 -1
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.test.model
import org.jetbrains.kotlin.test.Assertions
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import org.jetbrains.kotlin.test.services.Assertions
import org.jetbrains.kotlin.test.services.ServiceRegistrationData
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/Assertions.kt
+3 -22
View File
@@ -5,27 +5,8 @@
package org.jetbrains.kotlin.test.services
import java.io.File
import org.jetbrains.kotlin.test.Assertions
abstract class Assertions : TestService {
fun assertEqualsToFile(expectedFile: File, actual: String, sanitizer: (String) -> String = { it }) {
assertEqualsToFile(expectedFile, actual, sanitizer) { "Actual data differs from file content" }
}
abstract class AssertionsService : Assertions(), TestService
abstract fun assertEqualsToFile(
expectedFile: File,
actual: String,
sanitizer: (String) -> String = { it },
message: (() -> String)
)
abstract fun assertEquals(expected: Any?, actual: Any?, message: (() -> String)? = null)
abstract fun assertNotEquals(expected: Any?, actual: Any?, message: (() -> String)? = null)
abstract fun assertTrue(value: Boolean, message: (() -> String)? = null)
abstract fun assertFalse(value: Boolean, message: (() -> String)? = null)
abstract fun assertAll(exceptions: List<AssertionError>)
abstract fun fail(message: () -> String): Nothing
}
val TestServices.assertions: Assertions by TestServices.testServiceAccessor()
val TestServices.assertions: AssertionsService by TestServices.testServiceAccessor()
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/DependencyProvider.kt
+1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.test.services
import org.jetbrains.kotlin.test.Assertions
import org.jetbrains.kotlin.test.model.*
abstract class DependencyProvider : TestService {
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/impl/RegisteredDirectivesParser.kt
+1 -1
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.test.services.impl
import org.jetbrains.kotlin.test.Assertions
import org.jetbrains.kotlin.test.directives.model.*
import org.jetbrains.kotlin.test.services.Assertions
class RegisteredDirectivesParser(private val container: DirectivesContainer, private val assertions: Assertions) {
companion object {