Minor: kotlin-test reformat sources, fix test package names

This commit is contained in:
Ilya Gorbunov
2018-02-06 08:54:20 +03:00
parent ad7701922c
commit d1f00a95e0
4 changed files with 16 additions and 16 deletions

View File

@@ -19,31 +19,31 @@ class JUnitContributor : AsserterContributor {
}
object JUnitAsserter : Asserter {
override fun assertEquals(message : String?, expected : Any?, actual : Any?) {
override fun assertEquals(message: String?, expected: Any?, actual: Any?) {
Assert.assertEquals(message, expected, actual)
}
override fun assertNotEquals(message : String?, illegal : Any?, actual : Any?) {
override fun assertNotEquals(message: String?, illegal: Any?, actual: Any?) {
Assert.assertNotEquals(message, illegal, actual)
}
override fun assertSame(message : String?, expected : Any?, actual : Any?) {
override fun assertSame(message: String?, expected: Any?, actual: Any?) {
Assert.assertSame(message, expected, actual)
}
override fun assertNotSame(message : String?, illegal : Any?, actual : Any?) {
override fun assertNotSame(message: String?, illegal: Any?, actual: Any?) {
Assert.assertNotSame(message, illegal, actual)
}
override fun assertNotNull(message : String?, actual : Any?) {
override fun assertNotNull(message: String?, actual: Any?) {
Assert.assertNotNull(message ?: "actual value is null", actual)
}
override fun assertNull(message : String?, actual : Any?) {
override fun assertNull(message: String?, actual: Any?) {
Assert.assertNull(message ?: "actual value is not null", actual)
}
override fun fail(message : String?): Nothing {
override fun fail(message: String?): Nothing {
Assert.fail(message)
// should not get here
throw AssertionError(message)

View File

@@ -1,4 +1,4 @@
package kotlinx.testing.tests
package kotlin.test.junit.tests
import org.junit.*
import java.util.concurrent.*

View File

@@ -23,31 +23,31 @@ class TestNGContributor : AsserterContributor {
}
object TestNGAsserter : Asserter {
override fun assertEquals(message : String?, expected : Any?, actual : Any?) {
override fun assertEquals(message: String?, expected: Any?, actual: Any?) {
Assert.assertEquals(expected, actual, message)
}
override fun assertNotEquals(message : String?, illegal : Any?, actual : Any?) {
override fun assertNotEquals(message: String?, illegal: Any?, actual: Any?) {
Assert.assertNotEquals(illegal, actual, message)
}
override fun assertSame(message : String?, expected : Any?, actual : Any?) {
override fun assertSame(message: String?, expected: Any?, actual: Any?) {
Assert.assertSame(expected, actual, message)
}
override fun assertNotSame(message : String?, illegal : Any?, actual : Any?) {
override fun assertNotSame(message: String?, illegal: Any?, actual: Any?) {
Assert.assertNotSame(illegal, actual, message)
}
override fun assertNotNull(message : String?, actual : Any?) {
override fun assertNotNull(message: String?, actual: Any?) {
Assert.assertNotNull(actual, message ?: "actual value is null")
}
override fun assertNull(message : String?, actual : Any?) {
override fun assertNull(message: String?, actual: Any?) {
Assert.assertNull(actual, message ?: "actual value is not null")
}
override fun fail(message : String?): Nothing {
override fun fail(message: String?): Nothing {
Assert.fail(message)
// should not get here
throw AssertionError(message)

View File

@@ -1,4 +1,4 @@
package kotlinx.testing.tests
package kotlin.test.testng.tests
import org.testng.annotations.*
import org.testng.*