Skip to content

Commit 5ccc416

Browse files
xteraoxterao
committed
Refactor DAO test setup to use package variables for file paths
1 parent 977987e commit 5ccc416

File tree

2 files changed

+58
-55
lines changed

2 files changed

+58
-55
lines changed

‎src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoGenerateSqlActionTest.kt‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,50 +37,51 @@ class DaoGenerateSqlActionTest : DomaSqlTest() {
3737

3838
override fun setUp() {
3939
super.setUp()
40+
val gutterActionPackageName = "gutteraction"
4041
addDaoJavaFile(
41-
"quickfix/SelectQuickFixTestDao.java",
42-
"quickfix/InsertQuickFixTestDao.java",
43-
"quickfix/UpdateQuickFixTestDao.java",
44-
"quickfix/DeleteQuickFixTestDao.java",
45-
"quickfix/BatchInsertQuickFixTestDao.java",
46-
"quickfix/BatchUpdateQuickFixTestDao.java",
47-
"quickfix/BatchDeleteQuickFixTestDao.java",
48-
"quickfix/ScriptQuickFixTestDao.java",
49-
"quickfix/SqlProcessorQuickFixTestDao.java",
42+
"$packageName/SelectQuickFixTestDao.java",
43+
"$packageName/InsertQuickFixTestDao.java",
44+
"$packageName/UpdateQuickFixTestDao.java",
45+
"$packageName/DeleteQuickFixTestDao.java",
46+
"$packageName/BatchInsertQuickFixTestDao.java",
47+
"$packageName/BatchUpdateQuickFixTestDao.java",
48+
"$packageName/BatchDeleteQuickFixTestDao.java",
49+
"$packageName/ScriptQuickFixTestDao.java",
50+
"$packageName/SqlProcessorQuickFixTestDao.java",
5051
)
5152
addDaoJavaFile(
52-
"gutteraction/SelectGutterTestDao.java",
53-
"gutteraction/InsertGutterTestDao.java",
54-
"gutteraction/notdisplayed/UpdateInvalidCaretTestDao.java",
55-
"gutteraction/notdisplayed/DeleteInvalidCaretTestDao.java",
56-
"gutteraction/BatchInsertGutterTestDao.java",
57-
"gutteraction/BatchUpdateGutterTestDao.java",
58-
"gutteraction/notdisplayed/BatchDeleteInvalidCaretTestDao.java",
59-
"gutteraction/ScriptGutterTestDao.java",
60-
"gutteraction/SqlProcessorGutterTestDao.java",
53+
"$gutterActionPackageName/SelectGutterTestDao.java",
54+
"$gutterActionPackageName/InsertGutterTestDao.java",
55+
"$gutterActionPackageName/notdisplayed/UpdateInvalidCaretTestDao.java",
56+
"$gutterActionPackageName/notdisplayed/DeleteInvalidCaretTestDao.java",
57+
"$gutterActionPackageName/BatchInsertGutterTestDao.java",
58+
"$gutterActionPackageName/BatchUpdateGutterTestDao.java",
59+
"$gutterActionPackageName/notdisplayed/BatchDeleteInvalidCaretTestDao.java",
60+
"$gutterActionPackageName/ScriptGutterTestDao.java",
61+
"$gutterActionPackageName/SqlProcessorGutterTestDao.java",
6162
)
6263

6364
addResourceEmptySqlFile(
64-
"quickfix/SelectQuickFixTestDao/existsSQLFile.sql",
65-
"quickfix/InsertQuickFixTestDao/existsSQLFile.sql",
66-
"quickfix/UpdateQuickFixTestDao/existsSQLFile.sql",
67-
"quickfix/DeleteQuickFixTestDao/existsSQLFile.sql",
68-
"quickfix/BatchInsertQuickFixTestDao/existsSQLFile.sql",
69-
"quickfix/BatchUpdateQuickFixTestDao/existsSQLFile.sql",
70-
"quickfix/BatchDeleteQuickFixTestDao/existsSQLFile.sql",
71-
"quickfix/ScriptQuickFixTestDao/existsSQLFile.script",
72-
"quickfix/SqlProcessorQuickFixTestDao/existsSQLFile.sql",
65+
"$packageName/SelectQuickFixTestDao/existsSQLFile.sql",
66+
"$packageName/InsertQuickFixTestDao/existsSQLFile.sql",
67+
"$packageName/UpdateQuickFixTestDao/existsSQLFile.sql",
68+
"$packageName/DeleteQuickFixTestDao/existsSQLFile.sql",
69+
"$packageName/BatchInsertQuickFixTestDao/existsSQLFile.sql",
70+
"$packageName/BatchUpdateQuickFixTestDao/existsSQLFile.sql",
71+
"$packageName/BatchDeleteQuickFixTestDao/existsSQLFile.sql",
72+
"$packageName/ScriptQuickFixTestDao/existsSQLFile.script",
73+
"$packageName/SqlProcessorQuickFixTestDao/existsSQLFile.sql",
7374
)
7475
addResourceEmptySqlFile(
75-
"gutteraction/SelectGutterTestDao/existsSQLFile1.sql",
76-
"gutteraction/InsertGutterTestDao/existsSQLFile2.sql",
77-
"gutteraction/UpdateGutterTestDao/existsSQLFile1.sql",
78-
"gutteraction/DeleteGutterTestDao/existsSQLFile1.sql",
79-
"gutteraction/BatchInsertGutterTestDao/existsSQLFile2.sql",
80-
"gutteraction/BatchUpdateGutterTestDao/existsSQLFile2.sql",
81-
"gutteraction/BatchDeleteGutterTestDao/existsSQLFile1.sql",
82-
"gutteraction/ScriptGutterTestDao/existsSQLFile2.script",
83-
"gutteraction/SqlProcessorGutterTestDao/existsSQLFile1.sql",
76+
"$gutterActionPackageName/SelectGutterTestDao/existsSQLFile1.sql",
77+
"$gutterActionPackageName/InsertGutterTestDao/existsSQLFile2.sql",
78+
"$gutterActionPackageName/UpdateGutterTestDao/existsSQLFile1.sql",
79+
"$gutterActionPackageName/DeleteGutterTestDao/existsSQLFile1.sql",
80+
"$gutterActionPackageName/BatchInsertGutterTestDao/existsSQLFile2.sql",
81+
"$gutterActionPackageName/BatchUpdateGutterTestDao/existsSQLFile2.sql",
82+
"$gutterActionPackageName/BatchDeleteGutterTestDao/existsSQLFile1.sql",
83+
"$gutterActionPackageName/ScriptGutterTestDao/existsSQLFile2.script",
84+
"$gutterActionPackageName/SqlProcessorGutterTestDao/existsSQLFile1.sql",
8485
)
8586
}
8687

‎src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/DomaSqlQuickFixTest.kt‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,32 @@ import org.domaframework.doma.intellij.inspection.dao.inspector.SqlFileExistInsp
2323
* Quick fix execution test
2424
*/
2525
class DomaSqlQuickFixTest : DomaSqlTest() {
26+
private val packagename = "quickfix"
27+
2628
override fun setUp() {
2729
super.setUp()
2830
addDaoJavaFile(
29-
"quickfix/SelectQuickFixTestDao.java",
30-
"quickfix/InsertQuickFixTestDao.java",
31-
"quickfix/UpdateQuickFixTestDao.java",
32-
"quickfix/DeleteQuickFixTestDao.java",
33-
"quickfix/BatchInsertQuickFixTestDao.java",
34-
"quickfix/BatchUpdateQuickFixTestDao.java",
35-
"quickfix/BatchDeleteQuickFixTestDao.java",
36-
"quickfix/ScriptQuickFixTestDao.java",
37-
"quickfix/SqlProcessorQuickFixTestDao.java",
31+
"$packagename/SelectQuickFixTestDao.java",
32+
"$packagename/InsertQuickFixTestDao.java",
33+
"$packagename/UpdateQuickFixTestDao.java",
34+
"$packagename/DeleteQuickFixTestDao.java",
35+
"$packagename/BatchInsertQuickFixTestDao.java",
36+
"$packagename/BatchUpdateQuickFixTestDao.java",
37+
"$packagename/BatchDeleteQuickFixTestDao.java",
38+
"$packagename/ScriptQuickFixTestDao.java",
39+
"$packagename/SqlProcessorQuickFixTestDao.java",
3840
)
3941

4042
addResourceEmptySqlFile(
41-
"quickfix/SelectQuickFixTestDao/existsSQLFile.sql",
42-
"quickfix/InsertQuickFixTestDao/existsSQLFile.sql",
43-
"quickfix/UpdateQuickFixTestDao/existsSQLFile.sql",
44-
"quickfix/DeleteQuickFixTestDao/existsSQLFile.sql",
45-
"quickfix/BatchInsertQuickFixTestDao/existsSQLFile.sql",
46-
"quickfix/BatchUpdateQuickFixTestDao/existsSQLFile.sql",
47-
"quickfix/BatchDeleteQuickFixTestDao/existsSQLFile.sql",
48-
"quickfix/ScriptQuickFixTestDao/existsSQLFile.script",
49-
"quickfix/SqlProcessorQuickFixTestDao/existsSQLFile.sql",
43+
"$packagename/SelectQuickFixTestDao/existsSQLFile.sql",
44+
"$packagename/InsertQuickFixTestDao/existsSQLFile.sql",
45+
"$packagename/UpdateQuickFixTestDao/existsSQLFile.sql",
46+
"$packagename/DeleteQuickFixTestDao/existsSQLFile.sql",
47+
"$packagename/BatchInsertQuickFixTestDao/existsSQLFile.sql",
48+
"$packagename/BatchUpdateQuickFixTestDao/existsSQLFile.sql",
49+
"$packagename/BatchDeleteQuickFixTestDao/existsSQLFile.sql",
50+
"$packagename/ScriptQuickFixTestDao/existsSQLFile.script",
51+
"$packagename/SqlProcessorQuickFixTestDao/existsSQLFile.sql",
5052
)
5153
myFixture.enableInspections(SqlFileExistInspection())
5254
}
@@ -127,5 +129,5 @@ class DomaSqlQuickFixTest : DomaSqlTest() {
127129
afterCheck()
128130
}
129131

130-
private fun getQuickFixTestDaoName(daoName: String): String = "quickfix/$daoName"
132+
private fun getQuickFixTestDaoName(daoName: String): String = "$packagename/$daoName"
131133
}

0 commit comments

Comments
 (0)