Skip to content

Commit 0506e87

Browse files
committed
Add Parameter Element Completion Test
1 parent 013aad0 commit 0506e87

File tree

7 files changed

+51
-0
lines changed

7 files changed

+51
-0
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ class SqlCompleteTest : DomaSqlTest() {
4343
"SqlCompleteTestDao/completeDirectiveFieldInsideFor.sql",
4444
"SqlCompleteTestDao/completeConcatenationOperator.sql",
4545
"SqlCompleteTestDao/completeComparisonOperator.sql",
46+
"SqlCompleteTestDao/completeParameterFirst.sql",
47+
"SqlCompleteTestDao/completeParameterFirstProperty.sql",
48+
"SqlCompleteTestDao/completeParameterSecond.sql",
49+
"SqlCompleteTestDao/completeParameterSecondProperty.sql",
4650
)
4751
myFixture.enableInspections(SqlBindVariableValidInspector())
4852
}
@@ -227,6 +231,32 @@ class SqlCompleteTest : DomaSqlTest() {
227231
)
228232
}
229233

234+
fun testCompleteParameter() {
235+
innerDirectiveCompleteTest(
236+
"SqlCompleteTestDao/completeParameterFirst.sql",
237+
listOf("employee"),
238+
listOf("employeeId", "department", "rank", "startWith"),
239+
)
240+
241+
innerDirectiveCompleteTest(
242+
"SqlCompleteTestDao/completeParameterFirstProperty.sql",
243+
listOf("employeeId", "department", "rank"),
244+
listOf("employee"),
245+
)
246+
247+
innerDirectiveCompleteTest(
248+
"SqlCompleteTestDao/completeParameterSecond.sql",
249+
listOf("employee"),
250+
listOf("employeeId", "department", "rank", "startWith"),
251+
)
252+
253+
innerDirectiveCompleteTest(
254+
"SqlCompleteTestDao/completeParameterSecondProperty.sql",
255+
listOf("managerId"),
256+
listOf("employee", "department", "rank"),
257+
)
258+
}
259+
230260
private fun innerDirectiveCompleteTest(
231261
sqlFileName: String,
232262
expectedSuggestions: List<String>,

src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,16 @@ interface SqlCompleteTestDao {
5757
@Insert(sqlFile = true)
5858
int completeConcatenationOperator(Employee employee,Integer point);
5959

60+
@Select
61+
Employee completeParameterFirst(Employee employee);
62+
63+
@Select
64+
Employee completeParameterFirstProperty(Employee employee);
65+
66+
@Select
67+
Employee completeParameterSecond(Employee employee);
68+
69+
@Select
70+
Employee completeParameterSecondProperty(Employee employee);
71+
6072
}

src/test/testData/src/main/java/doma/example/entity/Employee.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ private String getEmployeeRank() {
2727
return rank;
2828
}
2929

30+
public Integer employeeParam(Integer p1, Integer p2) {
31+
return p1 + p2;
32+
}
3033
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
select * from employee
2+
where id = /* employee.department.startWith(<caret>) */1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
select * from employee where id = /* employee.department.startWith(employee.<caret>) */1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
select * from employee where id = /* employee.employeeParam(3, <caret>) */1
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
select * from employee
2+
where id = /* employee.employeeParam(employee.employeeId, employee.<caret>m) */1

0 commit comments

Comments
 (0)