Skip to content

Commit f971961

Browse files
committed
Issue oshai#484 - clean up
1 parent 1ad4d3a commit f971961

File tree

1 file changed

+10
-26
lines changed

1 file changed

+10
-26
lines changed

src/jvmTest/kotlin/io/github/oshai/kotlinlogging/internal/KLoggerNameResolverTest.kt

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.github.oshai.kotlinlogging.internal
22

3-
import java.util.stream.Stream
43
import org.junit.jupiter.api.Assertions.assertEquals
54
import org.junit.jupiter.api.TestInstance
65
import org.junit.jupiter.params.ParameterizedTest
76
import org.junit.jupiter.params.provider.Arguments
87
import org.junit.jupiter.params.provider.MethodSource
8+
import java.util.stream.Stream
99
import kotlin.reflect.KClass
1010

1111
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -21,35 +21,18 @@ class KLoggerNameResolverTest {
2121
Stream.of(
2222
Arguments.of("io.github.oshai.kotlinlogging.internal.BaseClass", BaseClass::class),
2323
Arguments.of("io.github.oshai.kotlinlogging.internal.ChildClass", ChildClass::class),
24-
Arguments.of(
25-
"io.github.oshai.kotlinlogging.internal.BaseClass",
26-
BaseClass.Companion::class,
27-
),
28-
Arguments.of(
29-
"io.github.oshai.kotlinlogging.internal.ChildClass",
30-
ChildClass.Companion::class,
31-
),
24+
Arguments.of("io.github.oshai.kotlinlogging.internal.BaseClass", BaseClass.Companion::class),
25+
Arguments.of("io.github.oshai.kotlinlogging.internal.ChildClass", ChildClass.Companion::class),
3226
Arguments.of("io.github.oshai.kotlinlogging.internal.Singleton", Singleton::class),
3327
Arguments.of("io.github.oshai.kotlinlogging.internal.MyInterface", MyInterface::class),
3428
Arguments.of("java.lang.Object", Any()::class),
35-
Arguments.of(
36-
"io.github.oshai.kotlinlogging.internal.KLoggerNameResolverTest",
37-
object {}::class,
38-
),
39-
Arguments.of(
40-
"io.github.oshai.kotlinlogging.internal.BaseClass",
41-
BaseClass.InnerClass.Obj::class,
42-
),
43-
Arguments.of(
44-
"io.github.oshai.kotlinlogging.internal.BaseClass",
45-
BaseClass.InnerClass.CmpObj::class,
46-
),
29+
Arguments.of("io.github.oshai.kotlinlogging.internal.KLoggerNameResolverTest", object {}::class),
30+
Arguments.of("io.github.oshai.kotlinlogging.internal.BaseClass", BaseClass.InnerClass::class),
31+
Arguments.of("io.github.oshai.kotlinlogging.internal.BaseClass", BaseClass.InnerClass.Obj::class),
32+
Arguments.of("io.github.oshai.kotlinlogging.internal.BaseClass", BaseClass.InnerClass.CmpObj::class),
4733
Arguments.of("io.github.oshai.kotlinlogging.internal.Foo", Foo.Bar::class),
4834
Arguments.of("io.github.oshai.kotlinlogging.internal.Foo", Foo.Bar3::class),
49-
Arguments.of(
50-
"io.github.oshai.kotlinlogging.internal.PrivateCompanion",
51-
PrivateCompanion().companionClass,
52-
),
35+
Arguments.of("io.github.oshai.kotlinlogging.internal.PrivateCompanion", PrivateCompanion().companionClass),
5336
)
5437
}
5538

@@ -80,7 +63,8 @@ class Foo {
8063
val z = Bar2
8164

8265
companion object {
83-
@JvmField val Bar3 = Foo().z
66+
@JvmField
67+
val Bar3 = Foo().z
8468
}
8569
}
8670

0 commit comments

Comments
 (0)