@@ -26,21 +26,70 @@ import java.lang.reflect.Field
2626@Suppress(" unused" )
2727class ConfigFieldOrderTest {
2828
29- open class SingleClass { val a = Unit ; val b = Unit ; val c = Unit }
30- open class OrderedSingleClass { @ConfigOrder(3 ) val c = Unit ; @ConfigOrder(1 ) val a = Unit ; @ConfigOrder(2 ) val b = Unit }
29+ open class SingleClass {
30+ val a = Unit
31+ val b = Unit
32+ val c = Unit
33+ }
34+
35+ open class OrderedSingleClass {
36+ @ConfigOrder(3 )
37+ val c = Unit
38+ @ConfigOrder(1 )
39+ val a = Unit
40+ @ConfigOrder(2 )
41+ val b = Unit
42+ }
43+
44+ open class Parent {
45+ val x = Unit
46+ open val y = Unit
47+ val z = Unit
48+ }
49+
50+ open class ChildAppendsField : Parent () {
51+ val w = Unit
52+ }
53+
54+ open class ChildShadowsWithoutAnnotation : Parent () {
55+ override val y = Unit
56+ }
57+
58+ open class ChildShadowsWithAnnotation : Parent () {
59+ @ConfigOverride
60+ override val y = Unit
61+ }
62+
63+ open class ParentWithOrderedField {
64+ val a = Unit
65+ @ConfigOrder(5 )
66+ open val b = Unit
67+ val c = Unit
68+ }
69+
70+ open class ChildInheritsParentOrder : ParentWithOrderedField () {
71+ @ConfigOverride
72+ override val b = Unit
73+ }
3174
32- open class Parent { val x = Unit ; open val y = Unit ; val z = Unit }
33- open class ChildAppendsField : Parent () { val w = Unit }
34- open class ChildShadowsWithoutAnnotation : Parent () { override val y = Unit }
35- open class ChildShadowsWithAnnotation : Parent () { @ConfigOverride override val y = Unit }
75+ open class ChildExplicitOverrideOrder : ParentWithOrderedField () {
76+ @ConfigOverride(overrideOrder = 99 )
77+ override val b = Unit
78+ }
3679
37- open class ParentWithOrderedField { val a = Unit ; @ConfigOrder(5 ) open val b = Unit ; val c = Unit }
38- open class ChildInheritsParentOrder : ParentWithOrderedField () { @ConfigOverride override val b = Unit }
39- open class ChildExplicitOverrideOrder : ParentWithOrderedField () { @ConfigOverride(overrideOrder = 99 ) override val b = Unit }
80+ open class GrandParent {
81+ val p = Unit
82+ open val q = Unit
83+ }
4084
41- open class GrandParent { val p = Unit ; open val q = Unit }
42- open class MiddleParent : GrandParent () { val r = Unit }
43- open class GrandChild : MiddleParent () { @ConfigOverride override val q = Unit }
85+ open class MiddleParent : GrandParent () {
86+ val r = Unit
87+ }
88+
89+ open class GrandChild : MiddleParent () {
90+ @ConfigOverride
91+ override val q = Unit
92+ }
4493
4594 private val getSortedFields = ConfigProcessorDriver ::class .java
4695 .getDeclaredMethod(" getSortedFields" , Class ::class .java)
0 commit comments