Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-10 14:46:54 +00:00
parent 8433c03ed0
commit 6418bb6d23
3 changed files with 7 additions and 4 deletions

View File

@@ -229,12 +229,12 @@ public class ConstraintsTest extends TestCase
public void testRegexConstraintFilename() throws Exception
{
// we assume UTF-8
String expression = "[^\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\¬\\£\\%\\&\\+\\;]+";
String expression = ".*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\xA3\\xAC\\%\\&\\+\\;]+.*";
String invalidChars = "\"*\\><?/:|£%&+;";
RegexConstraint constraint = new RegexConstraint();
constraint.setExpression(expression);
constraint.setRequiresMatch(true);
constraint.setRequiresMatch(false);
constraint.initialize();
// check that all the invalid chars cause failures
@@ -249,6 +249,7 @@ public class ConstraintsTest extends TestCase
evaluate(constraint, "Company Home", false);
}
private enum DummyEnum
{
ABC,