meow

Author: eggrobin

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

@@ -318,7 +318,7 @@ public static void ensureOutputDir(String dir) {
         }
     }
 
-    public static final String SRC_DIR = UnicodeTools.UNICODETOOLS_RSRC_DIR + "org/unicode/text/";
+    private static final String SRC_DIR = UnicodeTools.UNICODETOOLS_RSRC_DIR + "org/unicode/text/";
 
     /** Used for data files */
     public static final String SRC_UCA_DIR = SRC_DIR + "UCA/";

unicodetools/src/test/java/org/unicode/text/UCD/TestTestUnicodeInvariants.java

@@ -12,15 +12,13 @@
 import org.junit.jupiter.api.Test;
 import org.unicode.text.UCD.TestUnicodeInvariants.BackwardParseException;
 import org.unicode.text.utility.Settings;
-import org.unicode.text.utility.Settings.UnicodeTools;
 
 public class TestTestUnicodeInvariants {
     @Test
     void testSRC_UCD_DIR() {
         assertAll(
                 "assert that no components of Settings.SRC_UCD_DIR are null",
                 () -> assertNotNull(Settings.SRC_UCD_DIR, "Settings.SRC_UCD_DIR"),
-                () -> assertNotNull(Settings.SRC_DIR, "Settings.SRC_DIR"),
                 () ->
                         assertNotNull(
                                 Settings.UnicodeTools.UNICODETOOLS_RSRC_DIR,
@@ -43,23 +41,17 @@ void testUnicodeInvariants() throws IOException {
 
     @Test
     void testAdditionComparisons() throws IOException {
-        final var directory = new File(Settings.SRC_DIR + "UCD/AdditionComparisons/");
+        final var directory =
+                new File(
+                        Settings.UnicodeTools.UNICODETOOLS_RSRC_DIR
+                                + "org/unicode/text/UCD/AdditionComparisons/");
         if (!directory.exists()) {
             throw new IOException(
-                    "UnicodeTools.UNICODETOOLS_REPO_DIR="
-                            + UnicodeTools.UNICODETOOLS_REPO_DIR
-                            + ", "
-                            + "UnicodeTools.UNICODETOOLS_DIR="
-                            + UnicodeTools.UNICODETOOLS_DIR
-                            + ", "
-                            + "UnicodeTools.UNICODETOOLS_RSRC_DIR="
-                            + UnicodeTools.UNICODETOOLS_RSRC_DIR
-                            + ", "
-                            + "Settings.SRC_DIR="
-                            + Settings.SRC_DIR
+                    "Settings.UnicodeTools.UNICODETOOLS_RSRC_DIR="
+                            + Settings.UnicodeTools.UNICODETOOLS_RSRC_DIR
                             + ", "
                             + directory.getAbsolutePath()
-                            + " which does not exist");
+                            + " does not exist");
         }
         int rc = 0;
         for (var file : directory.listFiles()) {