Fix expand directive handling in SQL validation and correct variable names in test data

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/common/validation/result/ValidationTestDataResult.kt

@@ -24,17 +24,24 @@ import org.domaframework.doma.intellij.common.psi.PsiParentClass
 class ValidationTestDataResult(
     override val identify: PsiElement?,
     override val shortName: String = "",
+    private val expand: Boolean,
 ) : ValidationResult(identify, null, shortName) {
     override fun setHighlight(
         highlightRange: TextRange,
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
     ) {
+        val message =
+            if (expand) {
+                MessageBundle.message("inspection.invalid.sql.expand")
+            } else {
+                MessageBundle.message("inspection.invalid.sql.testdata")
+            }
         val project = identify.project
         holder.registerProblem(
             identify,
-            MessageBundle.message("inspection.invalid.sql.testdata"),
+            message,
             problemHighlightType(project, shortName),
             highlightRange,
         )

src/test/testData/src/main/resources/META-INF/doma/example/dao/inspection/TestDataCheckDao/expandDirective.sql

@@ -1,2 +1,2 @@
 SELECT /*%expand*/* FROM employee
- WHERE rank < <error descr="Test data is required after a bind variable directive or a literal variable directive">/* emplotee.rank */</error>*
+ WHERE rank < <error descr="Test data is required after a bind variable directive or a literal variable directive">/* employee.rank */</error>*

src/test/testData/src/main/resources/META-INF/doma/example/dao/inspection/TestDataCheckDao/invalidExpandDirective.sql

@@ -1,2 +1,2 @@
 SELECT <error descr="Asterisk is required after expand variable">/*%expand*/</error>0 FROM employee
- WHERE rank < /* emplotee.rank */0
+ WHERE rank < /* employee.rank */0

src/test/testData/src/main/resources/META-INF/doma/example/dao/inspection/TestDataCheckDao/populateDirective.sql

@@ -1,3 +1,3 @@
 UPDATE employee
    SET /*%populate*/id = id
- WHERE rank < <error descr="Test data is required after a bind variable directive or a literal variable directive">/* emplotee.rank */</error>
+ WHERE rank < <error descr="Test data is required after a bind variable directive or a literal variable directive">/* employee.rank */</error>