Update MinimizeMacWindows app and merge the java src into one src location

buildenv/jenkins/aqaTestPipeline.groovy

@@ -350,6 +350,8 @@ def remoteTriggerTemurinJCK () {
         blockBuildUntilComplete: true,
         job: 'AQA_Test_Pipeline',
         parameters: MapParameters(parameters: [MapParameter(name: 'SDK_RESOURCE', value: 'customized'),
+                                                MapParameter(name: 'ADOPTOPENJDK_REPO', value: params.ADOPTOPENJDK_REPO),
+                                                MapParameter(name: 'ADOPTOPENJDK_BRANCH', value: params.ADOPTOPENJDK_BRANCH),
                                                 MapParameter(name: 'TARGETS', value: TARGETS),
                                                 MapParameter(name: 'JCK_GIT_REPO', value: env.JCK_GIT_REPO),
                                                 MapParameter(name: 'CUSTOMIZED_SDK_URL', value: params.CUSTOMIZED_SDK_URL),

buildenv/jenkins/src/ListJavaFonts.java

@@ -0,0 +1,12 @@
+import java.awt.GraphicsEnvironment;
+
+// List the System Java fonts installed
+public class ListJavaFonts {
+    public static void main(String[] args) {
+        String java_fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+
+        for(String font : java_fonts) {
+            System.out.println(font);
+        }
+    }
+}

buildenv/jenkins/src/MinimizeMacWindows.java

@@ -3,21 +3,36 @@
 
 public class MinimizeMacWindows {
   public static void main(String... args) throws Exception {
+    int delay = 500;
 
-    System.out.println("MinimizeMacWindows: Minimizing all other app windows Cmd+Alt+H");
-
+    // Minimize all windows...
+    System.out.println("MinimizeMacWindows: Issuing Alt-Cmd-H to minimize all 'other' Windows");
     Robot r = new Robot();
     r.keyPress(KeyEvent.VK_META);
-    r.delay(250);
+    r.delay(delay);
     r.keyPress(KeyEvent.VK_ALT);
-    r.delay(250);
+    r.delay(delay);
     r.keyPress(KeyEvent.VK_H);
-    r.delay(250);
+    r.delay(delay);
     r.keyRelease(KeyEvent.VK_H);
-    r.delay(250);
+    r.delay(delay);
+    r.keyRelease(KeyEvent.VK_ALT);
+    r.delay(delay);
+    r.keyRelease(KeyEvent.VK_META);
+    r.delay(delay);
+
+    System.out.println("MinimizeMacWindows: Issuing Alt-Cmd-M to minimize all 'front' Windows");
+    r.keyPress(KeyEvent.VK_META);
+    r.delay(delay);
+    r.keyPress(KeyEvent.VK_ALT);
+    r.delay(delay);
+    r.keyPress(KeyEvent.VK_M);
+    r.delay(delay);
+    r.keyRelease(KeyEvent.VK_M);
+    r.delay(delay);
     r.keyRelease(KeyEvent.VK_ALT);
-    r.delay(250);
+    r.delay(delay);
     r.keyRelease(KeyEvent.VK_META);
-    r.delay(250);
+    r.delay(delay);
   }
 }

jck/interactives/arctic_tests/runTests.sh

@@ -19,9 +19,8 @@ SLEEP_TIME=5
 export LC_ALL=POSIX
 
 setupLinuxEnv() {
+    TEST_ROOT_DIR="$1"
     echo "Setup Linux Environment"
-    # Fetch the prebuilt arctic jar (will be pulled from prereq build eventually)
-    # wget -q https://ci.adoptium.net/job/Build_Arctic/5/artifact/upload/arctic-0.8.1.jar
 
     # Set environment variables, makes the assumption that JDK21 is the default java in /usr/bin/java
     export ARCTIC_JDK=/usr/bin/java
@@ -67,75 +66,35 @@ setupLinuxEnv() {
 }
 
 setupMacEnv() {
+    TEST_ROOT_DIR="$1"
     export AWT_FORCE_HEADFUL=true
     echo "Setup Mac Environment"
 
     # Point to specific system installed Temurin-21
     export ARCTIC_JDK=/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home/bin/java
 
-    cat <<EOF > JMinWindows.java
-		import java.awt.Robot;
-		import java.awt.event.KeyEvent;
-		import java.awt.Desktop;
-		import java.io.File;
-		public class JMinWindows {
-		public static void main(String... args) throws Exception {
-                    System.out.println("JMinWindows: Opening Finder on home folder so Finder becomes active front window and will get closed by Alt-Cmd-M");
-		    Desktop.getDesktop().open(new File(System.getProperty("user.home")));
-		    System.out.println("JMinWindows: Issuing Alt-Cmd-H to minimize all 'other' Windows");
-		    Robot r = new Robot();
-		    r.keyPress(KeyEvent.VK_META);
-		    r.delay(250);
-		    r.keyPress(KeyEvent.VK_ALT);
-		    r.delay(250);
-		    r.keyPress(KeyEvent.VK_H);
-		    r.delay(250);
-		    r.keyRelease(KeyEvent.VK_H);
-		    r.delay(250);
-		    r.keyRelease(KeyEvent.VK_ALT);
-		    r.delay(250);
-		    r.keyRelease(KeyEvent.VK_META);
-		    r.delay(250);
-		    System.out.println("JMinWindows: Issuing Alt-Cmd-M to minimize all Finder Windows");
-                    r.keyPress(KeyEvent.VK_META);
-                    r.delay(250);
-                    r.keyPress(KeyEvent.VK_ALT);
-                    r.delay(250);
-                    r.keyPress(KeyEvent.VK_M);
-                    r.delay(250);
-                    r.keyRelease(KeyEvent.VK_M);
-                    r.delay(250);
-                    r.keyRelease(KeyEvent.VK_ALT);
-                    r.delay(250);
-                    r.keyRelease(KeyEvent.VK_META);
-                    r.delay(250);
-		  }
-		}
-EOF
-
-		javac JMinWindows.java
-		java -Djava.awt.headless=false JMinWindows
-
-        echo "Running java ListJavaFonts..."
-
-cat <<EOF > ListJavaFonts.java
-                import java.awt.GraphicsEnvironment;
-                public class ListJavaFonts {
-                    public static void main( String[] args ) {
-                        String java_fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
-                        for(String font : java_fonts) System.out.println( font );
-                    }
-                }
-EOF
-
-        javac ListJavaFonts.java
-        echo "================================================"
-        java ListJavaFonts
-        echo "================================================"
+    echo "Minimize all Mac Windows on Desktop"
+    javac "${TEST_ROOT_DIR}/buildenv/jenkins/src/MinimizeMacWindows.java"
+    echo "================================================"
+    java -Djava.awt.headless=false -cp "${TEST_ROOT_DIR}/buildenv/jenkins/src" MinimizeMacWindows
+    echo "================================================"
 
+    echo "Running java ListJavaFonts..."
+    javac "${TEST_ROOT_DIR}/buildenv/jenkins/src/ListJavaFonts.java"
+    echo "================================================"
+    java -cp "${TEST_ROOT_DIR}/buildenv/jenkins/src" ListJavaFonts
+    echo "================================================"
+
+    echo "Killing all Preview and TextEdit apps"
+    killall Preview 2>/dev/null
+    killall TextEdit 2>/dev/null
+
+    echo "Tell Finder to close every window using AppleScript"
+    osascript -e 'tell application "Finder" to close every window'
 }
 
 setupWindowsEnv() {
+    TEST_ROOT_DIR="$1"
     echo "Setup Windows Environment"
 
     # Point to specific system installed openjdk-21
@@ -144,12 +103,12 @@ setupWindowsEnv() {
 
 JOPTIONS="-Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true -Dsun.rmi.activation.execPolicy=none -Djdk.xml.maxXMLNameLimit=4000"
 
-# Verify that the contents are present in jck_run
-TEST_GROUP=$1
-SPEC=$2
-VERSION=$3
-JCK_VERSION_NUMBER=$4
-TEST_SUB_DIR=$5
+TEST_ROOT=$1
+TEST_GROUP=$2
+SPEC=$3
+VERSION=$4
+JCK_VERSION_NUMBER=$5
+TEST_SUB_DIR=$6
 STARTING_SCOPE=$VERSION
 if [ $VERSION -eq 8 ]; then
     STARTING_SCOPE="default"
@@ -160,17 +119,17 @@ if [[ $SPEC =~ osx.* ]]; then
     OSNAME="mac"
     JENKINS_HOME_DIR="/Users/jenkins"
     PPROP_LINE='s#arctic.common.repository.json.path.*$#arctic.common.repository.json.path = /Users/jenkins/jck_run/arctic/mac/arctic_tests#g'
-    setupMacEnv
+    setupMacEnv "${TEST_ROOT}"
 elif [[ $SPEC =~ linux.* ]]; then
     OSNAME="linux"
     JENKINS_HOME_DIR=/home/jenkins
     PPROP_LINE='s#arctic.common.repository.json.path.*$#arctic.common.repository.json.path = /home/jenkins/jck_run/arctic/linux/arctic_tests#g'
-    setupLinuxEnv
+    setupLinuxEnv "${TEST_ROOT}"
 elif [[ $SPEC =~ win.* ]]; then
     OSNAME="windows"
     JENKINS_HOME_DIR="c:/Users/jenkins"
     PPROP_LINE='s#arctic.common.repository.json.path.*$#arctic.common.repository.json.path = c:/Users/jenkins/jck_run/arctic/windows/arctic_tests#g'
-    setupWindowsEnv
+    setupWindowsEnv "${TEST_ROOT}"
 fi
 
 ARCTIC_GROUP="${TEST_SUB_DIR}"
@@ -346,8 +305,10 @@ for i in "${active_versions[@]}"; do
             fi
 
             # Check testcase started successfully.
-            ps -p $test_pid
-            rc=$?
+            if [[ $skipped == false ]]; then
+              ps -p $test_pid
+              rc=$?
+            fi
             if [[ $skipped == true ]] || [[ $rc != 0 ]]; then
               if [[ $skipped == false ]]; then
                 echo "ERROR: Test class failed prior to playback."

jck/interactives/playlist.xml

@@ -19,7 +19,7 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh custom ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} ${JCKINTERACTIVES_CUSTOM_TARGET}; \
+		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh $(Q)$(TEST_ROOT)$(Q) custom ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} ${JCKINTERACTIVES_CUSTOM_TARGET}; \
 		$(TEST_STATUS)
 		</command>
 		<levels>
@@ -34,7 +34,7 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh java_awt ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} api/java_awt; \
+		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh $(Q)$(TEST_ROOT)$(Q) java_awt ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} api/java_awt; \
 		$(TEST_STATUS)
 		</command>
 		<disables>
@@ -55,7 +55,7 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh javax_swing ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} api/javax_swing; \
+		<command>$(TEST_ROOT)$(D)jck$(D)interactives$(D)arctic_tests$(D)runTests.sh $(Q)$(TEST_ROOT)$(Q) javax_swing ${SPEC} ${JDK_VERSION} ${JCK_VERSION_NUMBER} api/javax_swing; \
 		$(TEST_STATUS)
 		</command>
 		<disables>