Fixed Setting, testing UnicodeSet parsing (#33)

Author: macchiati

unicodetools/org/unicode/text/utility/Settings.java

@@ -6,14 +6,21 @@
 public class Settings {
 
     public static final boolean BUILD_FOR_COMPARE = org.unicode.cldr.util.CldrUtility.getProperty("BUILD_FOR_COMPARE", "false").startsWith("t");
-        
+    
+        public static final String SVN_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("SVN_DIR", CLDRPaths.BASE_DIRECTORY + "/../"), null);
+    
+        public static final String AUX_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("CLDR_TMP_DIR",
+            CldrUtility.getPath(SVN_DIRECTORY, "cldr-aux/")), null);
+    
+        public static final String UCD_DATA_DIRECTORY = CldrUtility.getPath(SVN_DIRECTORY + "unicodetools/unicodetools/data/", null);
+    
     public static final String SVN_WORKSPACE_DIRECTORY = Utility.fixFileName(
-    		CldrUtility.getProperty("SVN_WORKSPACE", CLDRPaths.SVN_DIRECTORY)) + "/";
+    		CldrUtility.getProperty("SVN_WORKSPACE", SVN_DIRECTORY)) + "/";
     public static final String OTHER_WORKSPACE_DIRECTORY = Utility.fixFileName(
             CldrUtility.getProperty("OTHER_WORKSPACE", CLDRPaths.LOCAL_DIRECTORY)) + "/";
 
     public static final String BASE_DIRECTORY = Utility.fixFileName(
-		CldrUtility.getProperty("BASE_DIRECTORY", CLDRPaths.SVN_DIRECTORY + "../")) + "/";
+		CldrUtility.getProperty("BASE_DIRECTORY", SVN_DIRECTORY + "../")) + "/";
 
     /**
      * Used for the default version.
@@ -25,7 +32,7 @@ public class Settings {
 
     public static final String UNICODETOOLS_DIRECTORY =
             CldrUtility.getProperty("UNICODETOOLS_DIR",
-        	    CLDRPaths.SVN_DIRECTORY + "unicodetools/unicodetools") + '/';
+        	    SVN_DIRECTORY + "unicodetools/unicodetools") + '/';
     public static final String UNICODEJSPS_DIRECTORY = SVN_WORKSPACE_DIRECTORY + "unicodetools/UnicodeJsps/";
     public static final String UNICODE_DRAFT_DIRECTORY =
             CldrUtility.getProperty("UNICODE_DRAFT_DIR",

unicodetools/org/unicode/utilities/PolaritySet.java

@@ -35,6 +35,10 @@ public static Operation fromDisplay(String op) {
     private boolean isPositive;
     private Set<T> source;
 
+    public static <T> PolaritySet<T> of() {
+	return new PolaritySet<T>(Collections.emptySet(), true);
+    }
+
     public static <T> PolaritySet<T> of(PolaritySet<T> left) {
 	return new PolaritySet<T>(left.source, left.isPositive);
     }

unicodetools/org/unicode/utilities/TestUnicodeSetParser.java

@@ -0,0 +1,53 @@
+package org.unicode.utilities;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.unicode.cldr.util.RegexUtilities;
+
+import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.impl.UnicodeRegex;
+import com.ibm.icu.text.UnicodeSet;
+
+public class TestUnicodeSetParser extends TestFmwk {
+    public static void main(String[] args) {
+	new TestUnicodeSetParser().run(args);
+    }
+
+    public void TestSimple() {
+	UnicodeSetParser parser = new UnicodeSetParser();
+	
+	String[] tests = {
+		"[a-b]",
+		"\\p{sc=Runic}",
+		"[\\p{script=runic}&\\p{gc=Nl}]",
+		"[\\p{script=runic}-\\p{gc=Nl}]",
+		"[[a-b]&[^[^[c-d]]]]",
+		};
+	for (String test : tests) {
+	    UnicodeSet expected = new UnicodeSet(test);
+	    UnicodeSet actual = parser.applyPattern(new UnicodeSet(), test); 
+	    assertEquals(test, expected, actual);
+	}
+	
+    }
+    
+    public void TestRegex() {
+	String[][] tests = {
+		{"[a-c&&b[d]&&b]", "[[a-c]&[bd]&[ab]]"}
+	};
+	for (String[] row : tests) {
+		Matcher matcher = Pattern.compile(row[0]).matcher("");
+		UnicodeSet actual = new UnicodeSet();
+		StringBuilder buf = new StringBuilder("a");
+		for (char cp = 'a'; cp <= 'z'; ++cp) {
+		    buf.setCharAt(0, cp);
+		    if (matcher.reset(buf).matches()) {
+			actual.add(cp);
+		    }
+		}
+		UnicodeSet expected = new UnicodeSet(row[1]);
+		assertEquals(row[0], expected, actual);
+	}
+    }
+}