Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions

View File

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryException;
*
* @author Derek Hulley
*/
@SuppressWarnings("unused")
public class ConstraintsTest extends TestCase
{
@Override
@@ -229,8 +230,8 @@ public class ConstraintsTest extends TestCase
public void testRegexConstraintFilename() throws Exception
{
// we assume UTF-8
String expression = ".*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\xA3\\xAC\\%\\&\\+\\;]+.*";
String invalidChars = "\"*\\><?/:|£%&+;";
String expression = new String(".*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\¬\\£\\%\\&\\+\\;]+.*".getBytes("UTF-8"));
String invalidChars = new String("\"*\\><?/:|%&+;£".getBytes("UTF-8"));
RegexConstraint constraint = new RegexConstraint();
constraint.setExpression(expression);