Eliminate disallowed characters in test debug IDs

This fixes the test CustomDateFormats for Vaadin 7.2, where the
set of allowed characters is narrower than in 7.1.

Change-Id: Ife8418aa589914eff665e47fa95c4353bcdb2aff

2 files changed, 5 insertions, 3 deletions

diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
index 1acdded4cb..b20e7295f7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
@@ -292,7 +292,7 @@
 </tr>
 <tr>
 	<td>assertValue</td>
-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'年'M'月'd'日'/domChild[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'X'M'X'd'X'/domChild[0]</td>
 	<td>2010年2月1日</td>
 </tr>
 <tr>
@@ -363,12 +363,12 @@
 </tr>
 <tr>
 	<td>assertValue</td>
-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM d, yyyy/domChild[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM dX yyyy/domChild[0]</td>
 	<td>February 1, 2010</td>
 </tr>
 <tr>
 	<td>assertValue</td>
-	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM d, yyyy/domChild[0]</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM dX yyyy/domChild[0]</td>
 	<td>Feb 1, 2010</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 015a974b3e..77637fb339 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
@@ -147,6 +147,8 @@ public class CustomDateFormats extends TestBase {
         df.setDateFormat(pattern);
         df.setImmediate(true);
         String debugId = pattern.replace('/', 'X');
+        // only certain characters are allowed in debug IDs
+        debugId = debugId.replaceAll("[^-a-zA-Z .'_]", "X");
         while (usedDebugIds.contains(debugId)) {
             debugId = debugId + "-";
         }