Update tests and implementation to comply with the CSR (env var names are case-insesitive on Windows)

Author: alexeysemenyukoracle

src/jdk.jpackage/share/native/applauncher/CfgFile.h

@@ -27,8 +27,7 @@
 #ifndef CfgFile_h
 #define CfgFile_h
 
-#include <map>
-#include "tstrings.h"
+#include "StringProcessing.h"
 
 
 class CfgFile {
@@ -90,7 +89,7 @@ class CfgFile {
         std::swap(empty, other.empty);
     }
 
-    typedef std::map<tstring, tstring> Macros;
+    typedef StringProcessing::VariableValues Macros;
 
     /**
      * Returns copy of this instance with the given macros and environment variables expanded.

src/jdk.jpackage/share/native/applauncher/StringProcessing.h

@@ -59,7 +59,16 @@ class Token {
 
 typedef std::vector<Token> TokenizedString;
 typedef std::vector<tstring> VariableNameList;
+#ifdef _WIN32
+struct less_ignore_case {
+    bool operator() (const tstring& x, const tstring& y) const {
+        return std::less<tstring>()(tstrings::toLower(x), tstrings::toLower(y));
+    }
+};
+typedef std::map<tstring, tstring, less_ignore_case> VariableValues;
+#else
 typedef std::map<tstring, tstring> VariableValues;
+#endif
 
 TokenizedString tokenize(const tstring& str);
 

test/jdk/tools/jpackage/share/AppLauncherSubstTest.java

@@ -21,13 +21,16 @@
  * questions.
  */
 
+import static jdk.internal.util.OperatingSystem.WINDOWS;
 import static jdk.jpackage.test.HelloApp.configureAndExecute;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -79,7 +82,7 @@ TestSpec create() {
 
             private String str;
             private String expectedStr;
-            private Map<String, String> env = new HashMap<>();
+            private Map<String, String> env = new LinkedHashMap<>();
         }
 
         public TestSpec {
@@ -115,6 +118,8 @@ public String toString() {
 
     @Test
     @ParameterSupplier
+    @ParameterSupplier(value = "testCaseSensitive", ifNotOS = WINDOWS)
+    @ParameterSupplier(value = "testCaseInsensitive", ifOS = WINDOWS)
     public static void test(TestSpec spec) throws IOException {
         final var cmd = JPackageCommand.helloAppImage(TEST_APP_JAVA + "*Hello")
                 .ignoreFakeRuntime()
@@ -161,6 +166,84 @@ public static Collection<Object[]> test() {
         }).toList();
     }
 
+    public static Collection<Object[]> testCaseSensitive() {
+        final List<TestSpec> testCases = new ArrayList<>();
+        for (final var token : PredefinedToken.values()) {
+            testCases.addAll(token.createTestCases(true));
+        }
+
+        testCases.addAll(Stream.of(
+                testSpec("$ALPHA $alpha").expect("A a").var("ALPHA", "A").var("alpha", "a"),
+                testSpec("$ALPHA $alpha").expect("$ALPHA a").var("alpha", "a"),
+                testSpec("$ALPHA $alpha").expect("A $alpha").var("ALPHA", "A")
+        ).map(TestSpec.Builder::create).toList());
+
+        return testCases.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
+    public static Collection<Object[]> testCaseInsensitive() {
+        final List<TestSpec> testCases = new ArrayList<>();
+        for (final var token : PredefinedToken.values()) {
+            testCases.addAll(token.createTestCases(false));
+        }
+
+        testCases.addAll(Stream.of(
+                testSpec("$ALPHA $alpha").expect("A A").var("AlphA", "A"),
+                testSpec("$ALPHA $alpha").expect("a a").var("alpha", "a"),
+                testSpec("$ALPHA $alpha").expect("A A").var("ALPHA", "A")
+        ).map(TestSpec.Builder::create).toList());
+
+        return testCases.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
+    private enum PredefinedToken {
+        APPDIR,
+        BINDIR,
+        ROOTDIR;
+
+        List<TestSpec> createTestCases(boolean caseSensitive) {
+            final var name = name();
+            final var name2 = name.transform(str -> {
+                final var chars = name.toCharArray();
+                for (int i = 0; i < chars.length; i += 2) {
+                    chars[i] = Character.toLowerCase(chars[i]);
+                }
+                return new String(chars);
+            });
+
+            if (name.equals(name2)) {
+                throw new UnsupportedOperationException();
+            }
+
+            final var testSpec = testSpec(String.format("${%s}${%s}", name, name2)).var(name, "A").var(name2, "[foo]");
+            if (caseSensitive) {
+                testSpec.expect(String.format("@@%s@@[foo]", name, name2));
+            } else {
+                testSpec.expect(String.format("@@%s@@@@%s@@", name, name));
+            }
+
+            final var testSpec2 = testSpec(String.format("${%s}${%s}", name, name2)).var(name, "A");
+            if (caseSensitive) {
+                testSpec2.expect(String.format("@@%s@@${%s}", name, name2));
+            } else {
+                testSpec2.expect(String.format("@@%s@@@@%s@@", name, name));
+            }
+
+            final var testSpec3 = testSpec(String.format("${%s}${%s}", name, name2));
+            if (caseSensitive) {
+                testSpec3.expect(String.format("@@%s@@${%s}", name, name2));
+            } else {
+                testSpec3.expect(String.format("@@%s@@@@%s@@", name, name));
+            }
+
+            return Stream.of(testSpec, testSpec2).map(TestSpec.Builder::create).toList();
+        }
+    }
+
     private static TestSpec.Builder testSpec(String str) {
         return new TestSpec.Builder().str(str);
     }