Reformat kotlin.test library
This commit is contained in:
@@ -5,23 +5,29 @@ var value = 5
|
||||
|
||||
class SimpleTest {
|
||||
|
||||
@BeforeTest fun beforeFun() {
|
||||
@BeforeTest
|
||||
fun beforeFun() {
|
||||
value *= 2
|
||||
}
|
||||
|
||||
@AfterTest fun afterFun() {
|
||||
@AfterTest
|
||||
fun afterFun() {
|
||||
value /= 2
|
||||
}
|
||||
|
||||
@Test fun testFoo() {
|
||||
@Test
|
||||
fun testFoo() {
|
||||
assertNotEquals(value, foo())
|
||||
}
|
||||
|
||||
@Test fun testBar() {
|
||||
@Test
|
||||
fun testBar() {
|
||||
assertEquals(value, foo())
|
||||
}
|
||||
|
||||
@Ignore @Test fun testFooWrong() {
|
||||
@Ignore
|
||||
@Test
|
||||
fun testFooWrong() {
|
||||
assertEquals(20, foo())
|
||||
}
|
||||
|
||||
@@ -29,7 +35,8 @@ class SimpleTest {
|
||||
|
||||
@Ignore
|
||||
class TestTest {
|
||||
@Test fun emptyTest() {
|
||||
@Test
|
||||
fun emptyTest() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,8 +58,7 @@ internal object DefaultJsAsserter : Asserter {
|
||||
override fun assertTrue(lazyMessage: () -> String?, actual: Boolean) {
|
||||
if (!actual) {
|
||||
failWithMessage(lazyMessage)
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
invokeHook(true, lazyMessage)
|
||||
}
|
||||
}
|
||||
@@ -89,8 +88,7 @@ internal object DefaultJsAsserter : Asserter {
|
||||
override val actual: Any? = a
|
||||
override val lazyMessage: () -> String? = lazyMessage
|
||||
})
|
||||
}
|
||||
finally {
|
||||
} finally {
|
||||
e = undefined
|
||||
a = undefined
|
||||
}
|
||||
|
||||
@@ -21,9 +21,8 @@ internal fun setAdapter(adapter: dynamic) {
|
||||
if (js("typeof adapter === 'string'")) {
|
||||
NAME_TO_ADAPTER[adapter]?.let {
|
||||
setAdapter(it.invoke())
|
||||
}?: throw IllegalArgumentException("Unsupported test framework adapter: '$adapter'")
|
||||
}
|
||||
else {
|
||||
} ?: throw IllegalArgumentException("Unsupported test framework adapter: '$adapter'")
|
||||
} else {
|
||||
currentAdapter = adapter
|
||||
}
|
||||
}
|
||||
@@ -74,8 +73,9 @@ internal fun detectAdapter() = when {
|
||||
}
|
||||
|
||||
internal val NAME_TO_ADAPTER: Map<String, () -> FrameworkAdapter> = mapOf(
|
||||
"qunit" to ::QUnitAdapter,
|
||||
"jasmine" to ::JasmineLikeAdapter,
|
||||
"mocha" to ::JasmineLikeAdapter,
|
||||
"jest" to ::JasmineLikeAdapter,
|
||||
"auto" to ::detectAdapter)
|
||||
"qunit" to ::QUnitAdapter,
|
||||
"jasmine" to ::JasmineLikeAdapter,
|
||||
"mocha" to ::JasmineLikeAdapter,
|
||||
"jest" to ::JasmineLikeAdapter,
|
||||
"auto" to ::detectAdapter
|
||||
)
|
||||
@@ -14,9 +14,10 @@ internal external object QUnit {
|
||||
fun skip(name: String, testFn: (dynamic) -> Unit): Unit
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Jasmine/Mocha/Jest API
|
||||
*/
|
||||
|
||||
internal external fun describe(name: String, fn: () -> Unit)
|
||||
internal external fun xdescribe(name: String, fn: () -> Unit)
|
||||
internal external fun it(name: String, fn: () -> Unit)
|
||||
|
||||
@@ -15,8 +15,7 @@ internal class JasmineLikeAdapter : FrameworkAdapter {
|
||||
override fun suite(name: String, ignored: Boolean, suiteFn: () -> Unit) {
|
||||
if (ignored) {
|
||||
xdescribe(name, suiteFn)
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
describe(name, suiteFn)
|
||||
}
|
||||
}
|
||||
@@ -24,8 +23,7 @@ internal class JasmineLikeAdapter : FrameworkAdapter {
|
||||
override fun test(name: String, ignored: Boolean, testFn: () -> Unit) {
|
||||
if (ignored) {
|
||||
xit(name, testFn)
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
it(name, testFn)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,8 +25,7 @@ internal class QUnitAdapter : FrameworkAdapter {
|
||||
override fun test(name: String, ignored: Boolean, testFn: () -> Unit) {
|
||||
if (ignored or ignoredSuite) {
|
||||
QUnit.skip(name, wrapTest(testFn))
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
QUnit.test(name, wrapTest(testFn))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
package org.junit
|
||||
|
||||
@Deprecated("Use 'Test' from kotlin.test package",
|
||||
replaceWith = ReplaceWith("kotlin.test.Test", "kotlin.test.Test"),
|
||||
level = DeprecationLevel.WARNING)
|
||||
@Deprecated(
|
||||
"Use 'Test' from kotlin.test package",
|
||||
replaceWith = ReplaceWith("kotlin.test.Test", "kotlin.test.Test"),
|
||||
level = DeprecationLevel.WARNING
|
||||
)
|
||||
actual typealias Test = kotlin.test.Test
|
||||
|
||||
Reference in New Issue
Block a user