Merge pull request #791 from hcf/utf-8-characters-in-symbols

Utf 8 characters in symbols
unclebob · Sep 24, 2015 · 5da06ec · 5da06ec
2 parents c3d6941 + 8409885
commit 5da06ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/fitnesse/testsystems/slim/tables/SlimTable.java b/src/fitnesse/testsystems/slim/tables/SlimTable.java
@@ -30,7 +30,7 @@
 import static fitnesse.testsystems.slim.tables.ComparatorUtil.approximatelyEqual;
 
 public abstract class SlimTable {
-  private static final Pattern SYMBOL_ASSIGNMENT_PATTERN = Pattern.compile("\\A\\s*\\$(\\w+)\\s*=\\s*\\Z");
+  private static final Pattern SYMBOL_ASSIGNMENT_PATTERN = Pattern.compile("\\A\\s*\\$([\\w\\p{L}]+)\\s*=\\s*\\Z");
 
   private String tableName;
   private int instructionNumber = 0;

diff --git a/test/fitnesse/testsystems/slim/tables/ScriptTableTest.java b/test/fitnesse/testsystems/slim/tables/ScriptTableTest.java
@@ -415,6 +415,16 @@ public void setSymbol() throws Exception {
     assertEquals(expectedInstructions, instructions());
   }
 
+  @Test
+  public void setSymbolUTF8() throws Exception {
+    buildInstructionsFor("|$ÆØÅ=|function|arg|\n", false);
+    List<CallAndAssignInstruction> expectedInstructions =
+      asList(
+        new CallAndAssignInstruction("scriptTable_id_0", "ÆØÅ", "scriptTableActor", "function", new Object[]{"arg"})
+      );
+    assertEquals(expectedInstructions, instructions());
+  }
+
   @Test
   public void useSymbol() throws Exception {
     buildInstructionsFor("|function|$V|\n", false);