Skip to content

Commit c59ad75

Browse files
xteraoxterao
committed
Avoid loading all SQL files for each code completion test case.
1 parent c75f2f7 commit c59ad75

File tree

1 file changed

+69
-51
lines changed

1 file changed

+69
-51
lines changed

‎src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt‎

Lines changed: 69 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,66 +22,17 @@ import org.domaframework.doma.intellij.DomaSqlTest
2222
*/
2323
class SqlCompleteTest : DomaSqlTest() {
2424
private val testDaoName = "SqlCompleteTestDao"
25+
private val testSpecificDaoName = "SpecificParamTypeCompletionDao"
2526

2627
override fun setUp() {
2728
super.setUp()
2829
addDaoJavaFile(
2930
"$testDaoName.java",
3031
)
31-
addSqlFile(
32-
"$testDaoName/completeDaoArgument.sql",
33-
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
34-
"$testDaoName/completeInstancePropertyWithMethodParameter.sql",
35-
"$testDaoName/completeFieldAccessBeforeOtherElement.sql",
36-
"$testDaoName/completeFieldAccessAfterOtherElement.sql",
37-
"$testDaoName/completeTopElementBeforeAtSign.sql",
38-
"$testDaoName/completeJavaPackageClass.sql",
39-
"$testDaoName/completeDirective.sql",
40-
"$testDaoName/completeBatchInsert.sql",
41-
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
42-
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
43-
"$testDaoName/completePropertyAfterStaticPropertyCallWithMethodParameter.sql",
44-
"$testDaoName/completePropertyAfterStaticMethodCall.sql",
45-
"$testDaoName/completeStaticPropertyAfterOtherElement.sql",
46-
"$testDaoName/completeBuiltinFunction.sql",
47-
"$testDaoName/completeDirectiveInsideIf.sql",
48-
"$testDaoName/completeDirectiveFieldInsideIfWithMethodParameter.sql",
49-
"$testDaoName/completeDirectiveInsideElseIf.sql",
50-
"$testDaoName/completeDirectiveInsideFor.sql",
51-
"$testDaoName/completeDirectiveInsideForWithMethodParameter.sql",
52-
"$testDaoName/completeDirectiveFieldInsideIf.sql",
53-
"$testDaoName/completeDirectiveFieldInsideElseIf.sql",
54-
"$testDaoName/completeDirectiveFieldInsideFor.sql",
55-
"$testDaoName/completeConcatenationOperator.sql",
56-
"$testDaoName/completeComparisonOperator.sql",
57-
"$testDaoName/completeParameterFirst.sql",
58-
"$testDaoName/completeParameterFirstProperty.sql",
59-
"$testDaoName/completeParameterFirstPropertyWithMethodParameter.sql",
60-
"$testDaoName/completeParameterSecond.sql",
61-
"$testDaoName/completeParameterSecondProperty.sql",
62-
"$testDaoName/completeParameterFirstInStaticAccess.sql",
63-
"$testDaoName/completeParameterFirstPropertyInStaticAccess.sql",
64-
"$testDaoName/completeParameterSecondInStaticAccess.sql",
65-
"$testDaoName/completeParameterSecondPropertyInStaticAccess.sql",
66-
"$testDaoName/completeParameterFirstInCustomFunctions.sql",
67-
"$testDaoName/completeParameterFirstPropertyInCustomFunctions.sql",
68-
"$testDaoName/completeParameterSecondInCustomFunctions.sql",
69-
"$testDaoName/completeParameterSecondPropertyInCustomFunctions.sql",
70-
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
71-
"$testDaoName/completeCallStaticPropertyClass.sql",
72-
"$testDaoName/completeForItemHasNext.sql",
73-
"$testDaoName/completeForItemIndex.sql",
74-
"$testDaoName/completeOptionalDaoParam.sql",
75-
"$testDaoName/completeOptionalStaticProperty.sql",
76-
"$testDaoName/completeOptionalByForItem.sql",
77-
"$testDaoName/completeOptionalBatchAnnotation.sql",
78-
"$testDaoName/completeForDirectiveItem.sql",
79-
"$testDaoName/completeImplementCustomFunction.sql",
80-
"$testDaoName/completeNotImplementCustomFunction.sql",
81-
)
8232
}
8333

8434
fun testCompleteDaoArgument() {
35+
addSqlFile("$testDaoName/completeDaoArgument.sql")
8536
val sqlFile = findSqlFile("$testDaoName/completeDaoArgument.sql")
8637
assertNotNull("Not Found SQL File", sqlFile)
8738
if (sqlFile == null) return
@@ -103,6 +54,13 @@ class SqlCompleteTest : DomaSqlTest() {
10354
}
10455

10556
fun testCompleteInstancePropertyFromDaoArgumentClass() {
57+
addSqlFile(
58+
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
59+
"$testDaoName/completeInstancePropertyWithMethodParameter.sql",
60+
"$testDaoName/completeFieldAccessBeforeOtherElement.sql",
61+
"$testDaoName/completeFieldAccessAfterOtherElement.sql",
62+
"$testDaoName/completeTopElementBeforeAtSign.sql",
63+
)
10664
innerDirectiveCompleteTest(
10765
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
10866
listOf(
@@ -191,6 +149,7 @@ class SqlCompleteTest : DomaSqlTest() {
191149
}
192150

193151
fun testCompleteJavaPackageClass() {
152+
addSqlFile("$testDaoName/completeJavaPackageClass.sql")
194153
innerDirectiveCompleteTest(
195154
"$testDaoName/completeJavaPackageClass.sql",
196155
listOf(
@@ -207,6 +166,7 @@ class SqlCompleteTest : DomaSqlTest() {
207166
}
208167

209168
fun testCompleteForItemHasNext() {
169+
addSqlFile("$testDaoName/completeForItemHasNext.sql")
210170
innerDirectiveCompleteTest(
211171
"$testDaoName/completeForItemHasNext.sql",
212172
emptyList(),
@@ -226,6 +186,7 @@ class SqlCompleteTest : DomaSqlTest() {
226186
}
227187

228188
fun testCompleteForItemIndex() {
189+
addSqlFile("$testDaoName/completeForItemIndex.sql")
229190
innerDirectiveCompleteTest(
230191
"$testDaoName/completeForItemIndex.sql",
231192
emptyList(),
@@ -246,6 +207,7 @@ class SqlCompleteTest : DomaSqlTest() {
246207
}
247208

248209
fun testCompleteDirective() {
210+
addSqlFile("$testDaoName/completeDirective.sql")
249211
innerDirectiveCompleteTest(
250212
"$testDaoName/completeDirective.sql",
251213
listOf(
@@ -265,6 +227,7 @@ class SqlCompleteTest : DomaSqlTest() {
265227
}
266228

267229
fun testCompleteBatchInsert() {
230+
addSqlFile("$testDaoName/completeBatchInsert.sql")
268231
innerDirectiveCompleteTest(
269232
"$testDaoName/completeBatchInsert.sql",
270233
listOf(
@@ -280,6 +243,12 @@ class SqlCompleteTest : DomaSqlTest() {
280243
}
281244

282245
fun testCompleteStaticPropertyFromStaticPropertyCall() {
246+
addSqlFile(
247+
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
248+
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
249+
"$testDaoName/completePropertyAfterStaticPropertyCallWithMethodParameter.sql",
250+
"$testDaoName/completeStaticPropertyAfterOtherElement.sql",
251+
)
283252
innerDirectiveCompleteTest(
284253
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
285254
listOf(
@@ -335,6 +304,10 @@ class SqlCompleteTest : DomaSqlTest() {
335304
}
336305

337306
fun testCompleteCallStaticPropertyClassPackage() {
307+
addSqlFile(
308+
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
309+
"$testDaoName/completeCallStaticPropertyClass.sql",
310+
)
338311
innerDirectiveCompleteTest(
339312
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
340313
listOf(
@@ -372,6 +345,7 @@ class SqlCompleteTest : DomaSqlTest() {
372345
}
373346

374347
fun testCompletePropertyAfterStaticPropertyCall() {
348+
addSqlFile("$testDaoName/completePropertyAfterStaticPropertyCall.sql")
375349
innerDirectiveCompleteTest(
376350
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
377351
listOf(
@@ -385,6 +359,7 @@ class SqlCompleteTest : DomaSqlTest() {
385359
}
386360

387361
fun testCompletePropertyAfterStaticMethodCall() {
362+
addSqlFile("$testDaoName/completePropertyAfterStaticMethodCall.sql")
388363
innerDirectiveCompleteTest(
389364
"$testDaoName/completePropertyAfterStaticMethodCall.sql",
390365
listOf(
@@ -399,6 +374,7 @@ class SqlCompleteTest : DomaSqlTest() {
399374
}
400375

401376
fun testCompleteBuiltinFunction() {
377+
addSqlFile("$testDaoName/completeBuiltinFunction.sql")
402378
innerDirectiveCompleteTest(
403379
"$testDaoName/completeBuiltinFunction.sql",
404380
listOf(
@@ -423,6 +399,13 @@ class SqlCompleteTest : DomaSqlTest() {
423399
}
424400

425401
fun testCompleteDirectiveInside() {
402+
addSqlFile(
403+
"$testDaoName/completeDirectiveInsideIf.sql",
404+
"$testDaoName/completeDirectiveFieldInsideIfWithMethodParameter.sql",
405+
"$testDaoName/completeDirectiveInsideElseIf.sql",
406+
"$testDaoName/completeDirectiveInsideFor.sql",
407+
"$testDaoName/completeDirectiveInsideForWithMethodParameter.sql",
408+
)
426409
innerDirectiveCompleteTest(
427410
"$testDaoName/completeDirectiveInsideIf.sql",
428411
listOf("employee"),
@@ -455,6 +438,11 @@ class SqlCompleteTest : DomaSqlTest() {
455438
}
456439

457440
fun testCompleteDirectiveFieldInside() {
441+
addSqlFile(
442+
"$testDaoName/completeDirectiveFieldInsideIf.sql",
443+
"$testDaoName/completeDirectiveFieldInsideElseIf.sql",
444+
"$testDaoName/completeDirectiveFieldInsideFor.sql",
445+
)
458446
innerDirectiveCompleteTest(
459447
"$testDaoName/completeDirectiveFieldInsideIf.sql",
460448
listOf("startsWith()"),
@@ -482,6 +470,10 @@ class SqlCompleteTest : DomaSqlTest() {
482470
}
483471

484472
fun testCompleteConcatenationOperator() {
473+
addSqlFile(
474+
"$testDaoName/completeConcatenationOperator.sql",
475+
"$testDaoName/completeComparisonOperator.sql",
476+
)
485477
innerDirectiveCompleteTest(
486478
"$testDaoName/completeConcatenationOperator.sql",
487479
listOf("rank"),
@@ -496,6 +488,13 @@ class SqlCompleteTest : DomaSqlTest() {
496488
}
497489

498490
fun testCompleteParameter() {
491+
addSqlFile(
492+
"$testDaoName/completeParameterFirst.sql",
493+
"$testDaoName/completeParameterFirstProperty.sql",
494+
"$testDaoName/completeParameterFirstPropertyWithMethodParameter.sql",
495+
"$testDaoName/completeParameterSecond.sql",
496+
"$testDaoName/completeParameterSecondProperty.sql",
497+
)
499498
innerDirectiveCompleteTest(
500499
"$testDaoName/completeParameterFirst.sql",
501500
listOf("employee"),
@@ -532,6 +531,12 @@ class SqlCompleteTest : DomaSqlTest() {
532531
}
533532

534533
fun testCompleteParameterInStaticAccess() {
534+
addSqlFile(
535+
"$testDaoName/completeParameterFirstInStaticAccess.sql",
536+
"$testDaoName/completeParameterFirstPropertyInStaticAccess.sql",
537+
"$testDaoName/completeParameterSecondInStaticAccess.sql",
538+
"$testDaoName/completeParameterSecondPropertyInStaticAccess.sql",
539+
)
535540
innerDirectiveCompleteTest(
536541
"$testDaoName/completeParameterFirstInStaticAccess.sql",
537542
listOf(
@@ -594,6 +599,12 @@ class SqlCompleteTest : DomaSqlTest() {
594599
}
595600

596601
fun testCompleteParameterInCustomFunctions() {
602+
addSqlFile(
603+
"$testDaoName/completeParameterFirstInCustomFunctions.sql",
604+
"$testDaoName/completeParameterFirstPropertyInCustomFunctions.sql",
605+
"$testDaoName/completeParameterSecondInCustomFunctions.sql",
606+
"$testDaoName/completeParameterSecondPropertyInCustomFunctions.sql",
607+
)
597608
innerDirectiveCompleteTest(
598609
"$testDaoName/completeParameterFirstInCustomFunctions.sql",
599610
listOf(
@@ -656,6 +667,7 @@ class SqlCompleteTest : DomaSqlTest() {
656667
}
657668

658669
fun testCompleteOptionalDaoParam() {
670+
addSqlFile("$testDaoName/completeOptionalDaoParam.sql")
659671
innerDirectiveCompleteTest(
660672
"$testDaoName/completeOptionalDaoParam.sql",
661673
listOf("manager", "projectNumber", "getFirstEmployee()"),
@@ -664,6 +676,7 @@ class SqlCompleteTest : DomaSqlTest() {
664676
}
665677

666678
fun testCompleteOptionalStaticProperty() {
679+
addSqlFile("$testDaoName/completeOptionalStaticProperty.sql")
667680
innerDirectiveCompleteTest(
668681
"$testDaoName/completeOptionalStaticProperty.sql",
669682
listOf("userId", "userName", "email", "getUserNameFormat()"),
@@ -672,6 +685,7 @@ class SqlCompleteTest : DomaSqlTest() {
672685
}
673686

674687
fun testCompleteOptionalByForItem() {
688+
addSqlFile("$testDaoName/completeOptionalByForItem.sql")
675689
innerDirectiveCompleteTest(
676690
"$testDaoName/completeOptionalByForItem.sql",
677691
listOf("manager", "projectNumber", "getFirstEmployee()"),
@@ -680,6 +694,7 @@ class SqlCompleteTest : DomaSqlTest() {
680694
}
681695

682696
fun testCompleteOptionalBatchAnnotation() {
697+
addSqlFile("$testDaoName/completeOptionalBatchAnnotation.sql")
683698
innerDirectiveCompleteTest(
684699
"$testDaoName/completeOptionalBatchAnnotation.sql",
685700
listOf("optionalIds"),
@@ -688,6 +703,7 @@ class SqlCompleteTest : DomaSqlTest() {
688703
}
689704

690705
fun testCompleteForDirectiveItem() {
706+
addSqlFile("$testDaoName/completeForDirectiveItem.sql")
691707
innerDirectiveCompleteTest(
692708
"$testDaoName/completeForDirectiveItem.sql",
693709
listOf("projects", "project", "project_has_next", "project_index"),
@@ -697,6 +713,7 @@ class SqlCompleteTest : DomaSqlTest() {
697713

698714
fun testCompleteImplementCustomFunction() {
699715
addResourceCompileFile("doma.compile.config")
716+
addSqlFile("$testDaoName/completeImplementCustomFunction.sql")
700717
innerDirectiveCompleteTest(
701718
"$testDaoName/completeImplementCustomFunction.sql",
702719
listOf("userId", "userName", "userAge"),
@@ -716,6 +733,7 @@ class SqlCompleteTest : DomaSqlTest() {
716733

717734
fun testCompleteNotImplementCustomFunction() {
718735
addResourceCompileFile("invalid.doma.compile.config")
736+
addSqlFile("$testDaoName/completeNotImplementCustomFunction.sql")
719737
innerDirectiveCompleteTest(
720738
"$testDaoName/completeNotImplementCustomFunction.sql",
721739
listOf(

0 commit comments

Comments
 (0)