Expand Templated var name possibilities

camassia-io · Jul 28, 2022 · 3b16b8d · 3b16b8d
1 parent 53fb7b1
commit 3b16b8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...t/src/main/kotlin/io/camassia/spring/dbunit/api/extensions/DefaultCellMappingExtension.kt b/...t/src/main/kotlin/io/camassia/spring/dbunit/api/extensions/DefaultCellMappingExtension.kt
@@ -12,7 +12,7 @@ import io.camassia.spring.dbunit.api.dataset.Overrides
  */
 class DefaultTemplatedCellMappingExtension(private val defaults: Defaults) : CellMappingExtension {
 
-    private val regex = Regex("^\\[[a-zA-Z_]+\\]\$")
+    private val regex = Regex("^\\[[a-zA-Z_\\-0-9]+\\]\$")
 
     override fun applyTo(table: String, cell: Cell, overrides: Overrides): Cell {
         val value = cell.value

diff --git a/...tlin/io/camassia/spring/dbunit/api/extensions/DefaultTemplatedCellMappingExtensionTest.kt b/...tlin/io/camassia/spring/dbunit/api/extensions/DefaultTemplatedCellMappingExtensionTest.kt
@@ -30,9 +30,11 @@ internal class DefaultTemplatedCellMappingExtensionTest {
 
     @Test
     fun `should map to template override`() {
-        val output = extension.applyTo("Table", Cell("Column", "[Value]"), Overrides("[Value]" to "Override"))
-
-        assertThat(output).isEqualTo(Cell("Column", "Override"))
+        assertThat(extension.applyTo("Table", Cell("Column", "[value]"), Overrides("[value]" to "Override"))).isEqualTo(Cell("Column", "Override"))
+        assertThat(extension.applyTo("Table", Cell("Column", "[VALUE]"), Overrides("[VALUE]" to "Override"))).isEqualTo(Cell("Column", "Override"))
+        assertThat(extension.applyTo("Table", Cell("Column", "[VALUE123]"), Overrides("[VALUE123]" to "Override"))).isEqualTo(Cell("Column", "Override"))
+        assertThat(extension.applyTo("Table", Cell("Column", "[VALUE_123]"), Overrides("[VALUE_123]" to "Override"))).isEqualTo(Cell("Column", "Override"))
+        assertThat(extension.applyTo("Table", Cell("Column", "[VALUE-123]"), Overrides("[VALUE-123]" to "Override"))).isEqualTo(Cell("Column", "Override"))
     }
 
     @Test