Update test cases for custom function definition class reference method change

xterao · xterao · commit 990f6ec1f8db · 2025-05-21T14:20:27.000+09:00
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/DomaSqlTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/DomaSqlTest.kt
@@ -28,10 +28,9 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiClass
 import com.intellij.testFramework.PsiTestUtil
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import org.domaframework.doma.intellij.common.CommonPathParameterUtil
 import org.domaframework.doma.intellij.common.RESOURCES_META_INF_PATH
 import org.domaframework.doma.intellij.extension.getResourcesSQLFile
-import org.domaframework.doma.intellij.setting.SettingComponent
-import org.domaframework.doma.intellij.setting.state.DomaToolsCustomFunctionSettings
 import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.java.JavaSourceRootType
 import org.junit.Ignore
@@ -68,6 +67,7 @@ open class DomaSqlTest : LightJavaCodeInsightFixtureTestCase() {
     override fun tearDown() {
         try {
             deleteSdk()
+            CommonPathParameterUtil.clearCache()
         } finally {
             super.tearDown()
         }
@@ -169,7 +169,7 @@ open class DomaSqlTest : LightJavaCodeInsightFixtureTestCase() {
         )
     }
 
-    fun addResourceEmptyFile(vararg sqlFileNames: String) {
+    fun addResourceEmptySqlFile(vararg sqlFileNames: String) {
         for (sqlFileName in sqlFileNames) {
             myFixture.addFileToProject(
                 "main/$resourceRoot/$RESOURCES_META_INF_PATH/$packagePath/dao/$sqlFileName",
@@ -178,6 +178,14 @@ open class DomaSqlTest : LightJavaCodeInsightFixtureTestCase() {
         }
     }
 
+    fun addResourceCompileFile(readFileName: String) {
+        val file = File("$testDataPath/$resourceRoot/$readFileName")
+        myFixture.addFileToProject(
+            "main/$resourceRoot/doma.compile.config",
+            file.readText(),
+        )
+    }
+
     fun addSqlFile(vararg sqlNames: String) {
         for (sqlName in sqlNames) {
             val file = File("$testDataPath/$resourceRoot/$RESOURCES_META_INF_PATH/$packagePath/dao/$sqlName")
@@ -209,12 +217,4 @@ open class DomaSqlTest : LightJavaCodeInsightFixtureTestCase() {
             file.readText(),
         )
     }
-
-    protected fun settingCustomFunctions(newClassNames: MutableList<String>) {
-        val settings = DomaToolsCustomFunctionSettings.getInstance(project)
-        val component = SettingComponent()
-        component.customFunctionClassNames = newClassNames.toMutableList()
-        settings.apply(component)
-        assertEquals(newClassNames, settings.getState().customFunctionClassNames)
-    }
 }
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.complate.sql
 
 import org.domaframework.doma.intellij.DomaSqlTest
-import org.domaframework.doma.intellij.inspection.sql.inspector.SqlBindVariableValidInspector
 
 /**
  * Code completion testing in SQL
@@ -60,8 +59,8 @@ class SqlCompleteTest : DomaSqlTest() {
             "$testDapName/completeOptionalBatchAnnotation.sql",
             "$testDapName/completeForDirectiveItem.sql",
             "$testDapName/completeImplementCustomFunction.sql",
+            "$testDapName/completeNotImplementCustomFunction.sql",
         )
-        myFixture.enableInspections(SqlBindVariableValidInspector())
     }
 
     fun testCompleteDaoArgument() {
@@ -266,12 +265,16 @@ class SqlCompleteTest : DomaSqlTest() {
                 "isNotBlank()",
             ),
             listOf(
-                "escape()",
-                "prefix()",
-                "infix()",
-                "suffix()",
-                "roundDownTimePart()",
-                "roundUpTimePart()",
+                "userId()",
+                "userName()",
+                "userAge()",
+                "langCode()",
+                "isGest()",
+                "getId()",
+                "getName()",
+                "getAge()",
+                "getLangCode()",
+                "isManager()",
             ),
         )
     }
@@ -402,9 +405,7 @@ class SqlCompleteTest : DomaSqlTest() {
     }
 
     fun testCompleteImplementCustomFunction() {
-        settingCustomFunctions(
-            mutableListOf("doma.example.expression.TestExpressionFunctions", "doma.example.expression.TestNotExpressionFunctions"),
-        )
+        addResourceCompileFile("doma.compile.config")
         innerDirectiveCompleteTest(
             "$testDapName/completeImplementCustomFunction.sql",
             listOf("userId()", "userName()", "userAge()", "langCode()", "isGest()", "isBlank()", "isNotBlank()"),
@@ -413,9 +414,15 @@ class SqlCompleteTest : DomaSqlTest() {
     }
 
     fun testCompleteNotImplementCustomFunction() {
+        addResourceCompileFile("invalid.doma.compile.config")
         innerDirectiveCompleteTest(
-            "$testDapName/completeImplementCustomFunction.sql",
-            listOf("isEmpty()", "roundDownTimePart()", "isBlank()", "isNotBlank()"),
+            "$testDapName/completeNotImplementCustomFunction.sql",
+            listOf(
+                "isEmpty()",
+                "isNotEmpty()",
+                "isBlank()",
+                "isNotBlank()",
+            ),
             listOf(
                 "userId()",
                 "userName()",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoGenerateSqlActionTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoGenerateSqlActionTest.kt
@@ -60,7 +60,7 @@ class DaoGenerateSqlActionTest : DomaSqlTest() {
             "gutteraction/SqlProcessorGutterTestDao.java",
         )
 
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "quickfix/SelectQuickFixTestDao/existsSQLFile.sql",
             "quickfix/InsertQuickFixTestDao/existsSQLFile.sql",
             "quickfix/UpdateQuickFixTestDao/existsSQLFile.sql",
@@ -71,7 +71,7 @@ class DaoGenerateSqlActionTest : DomaSqlTest() {
             "quickfix/ScriptQuickFixTestDao/existsSQLFile.script",
             "quickfix/SqlProcessorQuickFixTestDao/existsSQLFile.sql",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "gutteraction/SelectGutterTestDao/existsSQLFile1.sql",
             "gutteraction/InsertGutterTestDao/existsSQLFile2.sql",
             "gutteraction/UpdateGutterTestDao/existsSQLFile1.sql",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoGutterActionTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoGutterActionTest.kt
@@ -45,7 +45,7 @@ class DaoGutterActionTest : DomaSqlTest() {
             "$packageName/ScriptGutterTestDao.java",
             "$packageName/SqlProcessorGutterTestDao.java",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "$packageName/SelectGutterTestDao/existsSQLFile1.sql",
             "$packageName/InsertGutterTestDao/existsSQLFile1.sql",
             "$packageName/UpdateGutterTestDao/existsSQLFile1.sql",
@@ -56,7 +56,7 @@ class DaoGutterActionTest : DomaSqlTest() {
             "$packageName/ScriptGutterTestDao/existsSQLFile1.script",
             "$packageName/SqlProcessorGutterTestDao/existsSQLFile1.sql",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "$packageName/SelectGutterTestDao/existsSQLFile2.sql",
             "$packageName/InsertGutterTestDao/existsSQLFile2.sql",
             "$packageName/UpdateGutterTestDao/existsSQLFile2.sql",
@@ -67,7 +67,7 @@ class DaoGutterActionTest : DomaSqlTest() {
             "$packageName/ScriptGutterTestDao/existsSQLFile2.script",
             "$packageName/SqlProcessorGutterTestDao/existsSQLFile2.sql",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "$packageName/BatchInsertGutterTestDao/existsSQLFile3.sql",
             "$packageName/BatchUpdateGutterTestDao/existsSQLFile3.sql",
             "$packageName/BatchDeleteGutterTestDao/existsSQLFile3.sql",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoJumpActionTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/gutteraction/dao/DaoJumpActionTest.kt
@@ -61,7 +61,7 @@ class DaoJumpActionTest : DomaSqlTest() {
             "$packageName/$notDisplayedPackage/SqlProcessorInvalidCaretTestDao.java",
             "$packageName/$notDisplayedPackage/InvalidCaretTestDao.java",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "$packageName/SelectGutterTestDao/existsSQLFile1.sql",
             "$packageName/InsertGutterTestDao/existsSQLFile1.sql",
             "$packageName/UpdateGutterTestDao/existsSQLFile1.sql",
@@ -72,7 +72,7 @@ class DaoJumpActionTest : DomaSqlTest() {
             "$packageName/ScriptGutterTestDao/existsSQLFile1.script",
             "$packageName/SqlProcessorGutterTestDao/existsSQLFile1.sql",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "$packageName/SelectGutterTestDao/existsSQLFile2.sql",
             "$packageName/InsertGutterTestDao/existsSQLFile2.sql",
             "$packageName/UpdateGutterTestDao/existsSQLFile2.sql",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/DomaSqlExistTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/DomaSqlExistTest.kt
@@ -32,7 +32,7 @@ class DomaSqlExistTest : DomaSqlTest() {
             "ScriptTestDao.java",
             "SqlProcessorTestDao.java",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "SelectTestDao/existsSQLFile.sql",
             "InsertTestDao/existsSQLFile.sql",
             "UpdateTestDao/existsSQLFile.sql",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/DomaSqlQuickFixTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/DomaSqlQuickFixTest.kt
@@ -37,7 +37,7 @@ class DomaSqlQuickFixTest : DomaSqlTest() {
             "quickfix/SqlProcessorQuickFixTestDao.java",
         )
 
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "quickfix/SelectQuickFixTestDao/existsSQLFile.sql",
             "quickfix/InsertQuickFixTestDao/existsSQLFile.sql",
             "quickfix/UpdateQuickFixTestDao/existsSQLFile.sql",
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/inspection/sql/ParameterDefinedTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/inspection/sql/ParameterDefinedTest.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.inspection.sql
 
 import org.domaframework.doma.intellij.DomaSqlTest
-import org.domaframework.doma.intellij.common.helper.ActiveProjectHelper
 import org.domaframework.doma.intellij.inspection.sql.inspector.SqlBindVariableValidInspector
 
 /**
@@ -41,6 +40,7 @@ class ParameterDefinedTest : DomaSqlTest() {
             "$testDaoName/bindVariableForItemHasNextAndIndex.sql",
             "$testDaoName/optionalDaoParameterFieldAccess.sql",
             "$testDaoName/implementCustomFunctions.sql",
+            "$testDaoName/invalidImplementCustomFunctions.sql",
         )
         myFixture.enableInspections(SqlBindVariableValidInspector())
     }
@@ -126,18 +126,22 @@ class ParameterDefinedTest : DomaSqlTest() {
     }
 
     fun testImplementCustomFunctions() {
-        if (project != null) {
-            ActiveProjectHelper.setCurrentActiveProject(project)
-        }
-        settingCustomFunctions(
-            mutableListOf("doma.example.expression.TestExpressionFunctions", "doma.example.expression.TestNotExpressionFunctions"),
-        )
-
+        addResourceCompileFile("doma.compile.config")
         val sqlFile =
             findSqlFile("$testDaoName/implementCustomFunctions.sql")
         assertNotNull("Not Found SQL File", sqlFile)
         if (sqlFile == null) return
 
         myFixture.testHighlighting(false, false, false, sqlFile)
     }
+
+    fun testInvalidImplementCustomFunctions() {
+        addResourceCompileFile("invalid.doma.compile.config")
+        val sqlFile =
+            findSqlFile("$testDaoName/invalidImplementCustomFunctions.sql")
+        assertNotNull("Not Found SQL File", sqlFile)
+        if (sqlFile == null) return
+
+        myFixture.testHighlighting(false, false, false, sqlFile)
+    }
 }
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/refactor/DaoMethodRenameTestCase.kt b/src/test/kotlin/org/domaframework/doma/intellij/refactor/DaoMethodRenameTestCase.kt
@@ -29,7 +29,7 @@ class DaoMethodRenameTestCase : DomaSqlTest() {
             "RenameDaoMethodWithoutSql.java",
             "RenameDaoMethodNotExistSql.java",
         )
-        addResourceEmptyFile(
+        addResourceEmptySqlFile(
             "RenameDaoMethod/renameDaoMethodName.sql",
             "RenameDao/renameDaoClassName.sql",
         )
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/reference/SqlReferenceTestCase.kt b/src/test/kotlin/org/domaframework/doma/intellij/reference/SqlReferenceTestCase.kt
@@ -128,9 +128,7 @@ class SqlReferenceTestCase : DomaSqlTest() {
     }
 
     fun testReferenceCustomFunction() {
-        settingCustomFunctions(
-            mutableListOf("doma.example.expression.TestExpressionFunctions", "doma.example.expression.TestNotExpressionFunctions"),
-        )
+        addResourceCompileFile("doma.compile.config")
         referenceTest(
             "referenceCustomFunction",
             mapOf(
diff --git a/src/test/testData/src/main/java/doma/example/dao/EmployeeSummaryDao.java b/src/test/testData/src/main/java/doma/example/dao/EmployeeSummaryDao.java
@@ -42,4 +42,7 @@ interface EmployeeSummaryDao {
 
   @Select
   EmployeeSummary implementCustomFunctions(EmployeeSummary employee);
+
+  @Select
+  EmployeeSummary invalidImplementCustomFunctions(EmployeeSummary employee);
 }
diff --git a/src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java b/src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java
@@ -103,4 +103,7 @@ interface SqlCompleteTestDao {
   @Select
   Employee completeImplementCustomFunction(Project project);
 
+  @Select
+  Employee completeNotImplementCustomFunction(Project project);
+
 }
diff --git a/src/test/testData/src/main/resources/META-INF/doma/example/dao/EmployeeSummaryDao/bindVariableForNonEntityClass.sql b/src/test/testData/src/main/resources/META-INF/doma/example/dao/EmployeeSummaryDao/bindVariableForNonEntityClass.sql
@@ -25,9 +25,9 @@
             AND pe.end_date >= CURRENT_DATE
         /*%end*/
         -- Reference error for a non-existent field
-        /*%for <error descr="The type that can be used in the for directive is an Iterable type">child</error> : employee.<error descr="The field or method [projectIds] does not exist in the class [EmployeeSummary]">projectIds</error> */
+        /*%for <error descr="The type that can be used in the loop directive is an Iterable type">child</error> : employee.<error descr="The field or method [projectIds] does not exist in the class [EmployeeSummary]">projectIds</error> */
            -- An error occurred because the referenced element was not correctly defined.
-           AND pe.parent_project = /* <error descr="The type that can be used in the for directive is an Iterable type">child</error>.projectId */0
+           AND pe.parent_project = /* <error descr="The type that can be used in the loop directive is an Iterable type">child</error>.projectId */0
            -- Reference error for a non-existent method
           AND pe.member_id IN /* employee.<error descr="The field or method [getTopProject] does not exist in the class [EmployeeSummary]">getTopProject</error>() */(0,1,2)
         /*%end */
diff --git a/src/test/testData/src/main/resources/META-INF/doma/example/dao/EmployeeSummaryDao/invalidImplementCustomFunctions.sql b/src/test/testData/src/main/resources/META-INF/doma/example/dao/EmployeeSummaryDao/invalidImplementCustomFunctions.sql
@@ -0,0 +1,10 @@
+SELECT
+    e.employee_id
+    , u.user_id
+    , u.user_name
+  FROM user u
+ WHERE p.employee_id = /* employee.employeeId */0
+   AND p.user_id = /* employee.userId */0
+    OR is_gest = /* @<error descr="An invalid ExpressionFunctions implementation class is configured in doma.compile.config">isManager</error>() */false
+    OR flag = /* @<error descr="An invalid ExpressionFunctions implementation class is configured in doma.compile.config">authUser</error>() */false
+   AND lang = /* @isBlank() */'en'
diff --git a/src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeImplementCustomFunction.sql b/src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeImplementCustomFunction.sql
@@ -1,4 +1,4 @@
 SELECT * FROM project
 WHERE project_id = /* project.projectId */0
 AND manager = /* project.manager.userId */0
-AND lang = /* @<caret> */'en'
+AND lang = /* @<caret>() */'en'
diff --git a/src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeNotImplementCustomFunction.sql b/src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeNotImplementCustomFunction.sql
@@ -0,0 +1,4 @@
+SELECT * FROM project
+WHERE project_id = /* project.projectId */0
+AND manager = /* project.manager.userId */0
+AND lang = /* @<caret> */'en'
diff --git a/src/test/testData/src/main/resources/doma.compile.config b/src/test/testData/src/main/resources/doma.compile.config
@@ -0,0 +1 @@
+doma.expr.functions=doma.example.expression.TestExpressionFunctions
diff --git a/src/test/testData/src/main/resources/invalid.doma.compile.config b/src/test/testData/src/main/resources/invalid.doma.compile.config
@@ -0,0 +1 @@
+doma.expr.functions=doma.example.expression.TestNotExpressionFunctions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class DomaSqlExistTest : DomaSqlTest() {`
`32`	`32`	`"ScriptTestDao.java",`
`33`	`33`	`"SqlProcessorTestDao.java",`
`34`	`34`	`)`
`35`		`- addResourceEmptyFile(`
	`35`	`+ addResourceEmptySqlFile(`
`36`	`36`	`"SelectTestDao/existsSQLFile.sql",`
`37`	`37`	`"InsertTestDao/existsSQLFile.sql",`
`38`	`38`	`"UpdateTestDao/existsSQLFile.sql",`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DomaSqlQuickFixTest : DomaSqlTest() {`
`37`	`37`	`"quickfix/SqlProcessorQuickFixTestDao.java",`
`38`	`38`	`)`
`39`	`39`
`40`		`- addResourceEmptyFile(`
	`40`	`+ addResourceEmptySqlFile(`
`41`	`41`	`"quickfix/SelectQuickFixTestDao/existsSQLFile.sql",`
`42`	`42`	`"quickfix/InsertQuickFixTestDao/existsSQLFile.sql",`
`43`	`43`	`"quickfix/UpdateQuickFixTestDao/existsSQLFile.sql",`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class DaoMethodRenameTestCase : DomaSqlTest() {`
`29`	`29`	`"RenameDaoMethodWithoutSql.java",`
`30`	`30`	`"RenameDaoMethodNotExistSql.java",`
`31`	`31`	`)`
`32`		`- addResourceEmptyFile(`
	`32`	`+ addResourceEmptySqlFile(`
`33`	`33`	`"RenameDaoMethod/renameDaoMethodName.sql",`
`34`	`34`	`"RenameDao/renameDaoClassName.sql",`
`35`	`35`	`)`