1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
|
package signatures
import org.jetbrains.dokka.DokkaConfiguration
import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
import org.junit.jupiter.api.Test
import utils.A
import utils.Span
import utils.TestOutputWriterPlugin
import utils.match
import kotlin.test.assertEquals
class InheritedAccessorsSignatureTest : BaseAbstractTest() {
private val configuration = dokkaConfiguration {
sourceSets {
sourceSet {
sourceRoots = listOf("src/")
classpath = listOf(
commonStdlibPath ?: throw IllegalStateException("Common stdlib is not found"),
jvmStdlibPath ?: throw IllegalStateException("JVM stdlib is not found")
)
externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)
}
}
}
@Test
fun `should collapse accessor functions inherited from java into the property`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/A.java
|package test;
|public class A {
| private int a = 1;
| public int getA() { return a; }
| public void setA(int a) { this.a = a; }
|}
|
|/src/test/B.kt
|package test
|class B : A {}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-b/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(
3, signatures.size,
"Expected 3 signatures: class signature, constructor and property"
)
val property = signatures[2]
property.match(
"var ", A("a"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
writerPlugin.writer.renderedContent("root/test/-a/index.html").let { javaClassContent ->
val signatures = javaClassContent.signature().toList()
assertEquals(
3, signatures.size,
"Expected 3 signatures: class signature, default constructor and property"
)
val property = signatures[2]
property.match(
"open var ", A("a"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `should render as val if inherited java property has no setter`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/A.java
|package test;
|public class A {
| private int a = 1;
| public int getA() { return a; }
|}
|
|/src/test/B.kt
|package test
|class B : A {}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-b/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(3, signatures.size, "Expected 3 signatures: class signature, constructor and property")
val property = signatures[2]
property.match(
"val ", A("a"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
writerPlugin.writer.renderedContent("root/test/-a/index.html").let { javaClassContent ->
val signatures = javaClassContent.signature().toList()
assertEquals(
3,
signatures.size,
"Expected 3 signatures: class signature, default constructor and property"
)
val property = signatures[2]
property.match(
"open val ", A("a"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `should keep inherited java setter as a regular function due to inaccessible property`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/A.java
|package test;
|public class A {
| private int a = 1;
| public void setA(int a) { this.a = a; }
|}
|
|/src/test/B.kt
|package test
|class B : A {}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-b/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(3, signatures.size, "Expected 3 signatures: class signature, constructor and setter")
val setterFunction = signatures[2]
setterFunction.match(
"open fun ", A("setA"), "(", Parameters(
Parameter("a: ", A("Int"))
), ")",
ignoreSpanWithTokenStyle = true
)
}
writerPlugin.writer.renderedContent("root/test/-a/index.html").let { javaClassContent ->
val signatures = javaClassContent.signature().toList()
assertEquals(
3,
signatures.size,
"Expected 3 signatures: class signature, default constructor and setter"
)
val setterFunction = signatures[2]
setterFunction.match(
"open fun ", A("setA"), "(", Parameters(
Parameter("a: ", A("Int"))
), ")",
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `should keep inherited java accessor lookalikes if underlying function is public`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/A.java
|package test;
|public class A {
| public int a = 1;
| public int getA() { return a; }
| public void setA(int a) { this.a = a; }
|}
|
|/src/test/B.kt
|package test
|class B : A {}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
val signatures = writerPlugin.writer.renderedContent("root/test/-b/index.html").signature().toList()
assertEquals(
5, signatures.size,
"Expected 5 signatures: class signature, constructor, property and two accessor lookalikes"
)
val getterLookalikeFunction = signatures[2]
getterLookalikeFunction.match(
"open fun ", A("getA"), "():", A("Int"),
ignoreSpanWithTokenStyle = true
)
val setterLookalikeFunction = signatures[3]
setterLookalikeFunction.match(
"open fun ", A("setA"), "(", Parameters(
Parameter("a: ", A("Int"))
), ")",
ignoreSpanWithTokenStyle = true
)
val property = signatures[4]
property.match(
"var ", A("a"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
}
}
@Test
fun `should keep kotlin property with no accessors when java inherits kotlin a var`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/JavaClass.java
|package test;
|public class JavaClass extends KotlinClass {}
|
|/src/test/KotlinClass.kt
|package test
|open class KotlinClass {
| var variable: String = "s"
|}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-java-class/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(
3,
signatures.size,
"Expected to find 3 signatures: class, default constructor and property"
)
val property = signatures[2]
property.match(
"open var ", A("variable"), ": ", Span("String"),
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `kotlin property with compute get and set`() {
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/JavaClass.java
|package test;
|public class JavaClass extends KotlinClass {}
|
|/src/test/KotlinClass.kt
|package test
|open class KotlinClass {
| var variable: String
| get() = "asd"
| set(value) {}
|}
""".trimIndent(),
configuration,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-kotlin-class/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(3, signatures.size, "Expected to find 3 signatures: class, constructor and property")
val property = signatures[2]
property.match(
"var ", A("variable"), ": ", A("String"),
ignoreSpanWithTokenStyle = true
)
}
// it's actually unclear how it should react in this situation. It should most likely not
// break the abstraction and display it as a simple variable just like can be seen from Kotlin,
// test added to control changes
writerPlugin.writer.renderedContent("root/test/-java-class/index.html").let { javaClassContent ->
val signatures = javaClassContent.signature().toList()
assertEquals(
4,
signatures.size,
"Expected to find 4 signatures: class, default constructor and two accessors"
)
val getter = signatures[2]
getter.match(
"fun ", A("getVariable"), "(): ", Span("String"),
ignoreSpanWithTokenStyle = true
)
val setter = signatures[3]
setter.match(
"fun ", A("setVariable"), "(", Parameters(
Parameter("value: ", Span("String"))
), ")",
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `inherited property should inherit getter's visibility`() {
val configWithProtectedVisibility = dokkaConfiguration {
sourceSets {
sourceSet {
sourceRoots = listOf("src/")
classpath = listOf(
commonStdlibPath ?: throw IllegalStateException("Common stdlib is not found"),
jvmStdlibPath ?: throw IllegalStateException("JVM stdlib is not found")
)
externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)
documentedVisibilities = setOf(
DokkaConfiguration.Visibility.PUBLIC,
DokkaConfiguration.Visibility.PROTECTED
)
}
}
}
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/JavaClass.java
|package test;
|public class JavaClass {
| private int protectedGetterAndProtectedSetter = 0;
|
| protected int getProtectedGetterAndProtectedSetter() {
| return protectedGetterAndProtectedSetter;
| }
|
| protected void setProtectedGetterAndProtectedSetter(int protectedGetterAndProtectedSetter) {
| this.protectedGetterAndProtectedSetter = protectedGetterAndProtectedSetter;
| }
|}
|
|/src/test/KotlinClass.kt
|package test
|open class KotlinClass : JavaClass() { }
""".trimIndent(),
configWithProtectedVisibility,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-kotlin-class/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(3, signatures.size, "Expected 3 signatures: class signature, constructor and property")
val property = signatures[2]
property.match(
"protected var ", A("protectedGetterAndProtectedSetter"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
writerPlugin.writer.renderedContent("root/test/-java-class/index.html").let { javaClassContent ->
val signatures = javaClassContent.signature().toList()
assertEquals(
3,
signatures.size,
"Expected 3 signatures: class signature, default constructor and property"
)
val property = signatures[2]
property.match(
"protected open var ", A("protectedGetterAndProtectedSetter"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
}
}
}
@Test
fun `should resolve protected java property as protected`() {
val configWithProtectedVisibility = dokkaConfiguration {
sourceSets {
sourceSet {
sourceRoots = listOf("src/")
classpath = listOf(
commonStdlibPath ?: throw IllegalStateException("Common stdlib is not found"),
jvmStdlibPath ?: throw IllegalStateException("JVM stdlib is not found")
)
externalDocumentationLinks = listOf(stdlibExternalDocumentationLink)
documentedVisibilities = setOf(
DokkaConfiguration.Visibility.PUBLIC,
DokkaConfiguration.Visibility.PROTECTED
)
}
}
}
val writerPlugin = TestOutputWriterPlugin()
testInline(
"""
|/src/test/JavaClass.java
|package test;
|public class JavaClass {
| protected int protectedProperty = 0;
|}
|
|/src/test/KotlinClass.kt
|package test
|open class KotlinClass : JavaClass() { }
""".trimIndent(),
configWithProtectedVisibility,
pluginOverrides = listOf(writerPlugin)
) {
renderingStage = { _, _ ->
writerPlugin.writer.renderedContent("root/test/-kotlin-class/index.html").let { kotlinClassContent ->
val signatures = kotlinClassContent.signature().toList()
assertEquals(3, signatures.size, "Expected 2 signatures: class signature, constructor and property")
val property = signatures[2]
property.match(
"protected var ", A("protectedProperty"), ":", A("Int"),
ignoreSpanWithTokenStyle = true
)
}
}
}
}
}
|
