Fix tests for unavailable SQL annotation conversion intentions and update method signatures

Author: xterao

src/test/kotlin/org/domaframework/doma/intellij/action/dao/ConvertSqlActionTest.kt

@@ -65,6 +65,23 @@ abstract class ConvertSqlActionTest : DomaSqlTest() {
         convertIntention.invoke(myFixture.project, myFixture.editor, myFixture.file)
     }
 
+    protected fun doNotAvailableConvertActionTest(
+        daoName: String,
+        sqlToAnnotationPackage: String,
+        convertFamilyName: String,
+    ) {
+        addDaoJavaFile("$sqlToAnnotationPackage/$daoName.java")
+        val daoClass = findDaoClass("$sqlToAnnotationPackage.$daoName")
+        myFixture.configureFromExistingVirtualFile(daoClass.containingFile.virtualFile)
+
+        val intentions = myFixture.availableIntentions
+        val convertIntention = intentions.find { it.familyName == convertFamilyName }
+        if (convertIntention != null) {
+            fail("[$convertFamilyName] intention should be available without @Sql annotation")
+            return
+        }
+    }
+
     protected fun doTestSqlFormat(
         daoName: String,
         sqlFileName: String,

src/test/kotlin/org/domaframework/doma/intellij/action/dao/ConvertSqlAnnotationToFileActionTest.kt

@@ -110,12 +110,12 @@ class ConvertSqlAnnotationToFileActionTest : ConvertSqlActionTest() {
 
     fun testIntentionNotAvailableForMethodWithoutSqlAnnotation() {
         val daoName = "NoSqlAnnotationDao"
-        doAvailableConvertActionTest(daoName, sqlConversionPackage, convertFamilyName)
+        doNotAvailableConvertActionTest(daoName, sqlConversionPackage, convertFamilyName)
     }
 
     fun testIntentionNotAvailableForUnsupportedAnnotation() {
         val daoName = "UnsupportedAnnotationDao"
-        doAvailableConvertActionTest(daoName, sqlConversionPackage, convertFamilyName)
+        doNotAvailableConvertActionTest(daoName, sqlConversionPackage, convertFamilyName)
     }
 
     private fun doTest(

src/test/testData/src/main/java/doma/example/dao/sqltofile/bulk/BulkConvertToSqlFileDao.after.java

@@ -37,22 +37,22 @@ public interface BulkConvertToSqlFileDao {
     @Select
     Employee selectEmployee(int id);
 
-    @Insert
+    @Insert(sqlFile = true)
     int insertEmployee(Employee employee);
 
-    @Update
+    @Update(sqlFile = true)
     int updateEmployee(Employee employee);
 
-    @Delete
+    @Delete(sqlFile = true)
     int deleteEmployee(Employee employee);
 
-    @BatchInsert
+    @BatchInsert(sqlFile = true)
     int[] batchInsertEmployees(List<Employee> employees);
 
-    @BatchUpdate
+    @BatchUpdate(sqlFile = true)
     int[] batchUpdateEmployees(List<Employee> employees);
 
-    @BatchDelete
+    @BatchDelete(sqlFile = true)
     int[] batchDeleteEmployees(List<Employee> employees);
 
     @Script
@@ -64,4 +64,4 @@ public interface BulkConvertToSqlFileDao {
     // Annotation not supported
     @Function
     void executeFunc();
-}
+}