Support Arm64: Java tests

src/test/java/org/jvnet/winp/PlatformSpecificProcessTest.java

@@ -79,10 +79,13 @@ public PlatformSpecificProcessTest(ExecutablePlatform p) {
     public void verifyTargetPlatform() {
 
         // Run 64bit tests only if the platform supports it
-        if (executablePlatform == ExecutablePlatform.X64) {
+        if (executablePlatform == ExecutablePlatform.X64 || executablePlatform == ExecutablePlatform.ARM64) {
             TestHelper.assumeIs64BitHost();
         }
-
+        if (executablePlatform == ExecutablePlatform.ARM64) {
+            TestHelper.assumeIsArm64Host();
+        }
+
         File exec = getTestAppExecutable(executablePlatform);
         System.out.println("Target executable: " + exec.getAbsolutePath());
         Assert.assertTrue("Cannot locate the required executable: " + exec.getAbsolutePath(), exec.exists());
@@ -193,6 +196,6 @@ private String getExpectedPEBName(boolean processIsRunning) {
 
     @Parameters
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] { {ExecutablePlatform.X64}, {ExecutablePlatform.X86}});  
+        return Arrays.asList(new Object[][] { {ExecutablePlatform.ARM64}, {ExecutablePlatform.X64}, {ExecutablePlatform.X86}});
     }
 }

src/test/java/org/jvnet/winp/profiling/ProfileSingleEnvVars_ARM64.java

@@ -0,0 +1,53 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.; 2022 JetBrains s.r.o.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.jvnet.winp.profiling;
+
+import java.io.File;
+import org.junit.Before;
+import org.junit.Test;
+import org.jvnet.winp.WinProcess;
+import org.jvnet.winp.util.ExecutablePlatform;
+import org.jvnet.winp.util.ProcessSpawningTest;
+import org.jvnet.winp.util.TestHelper;
+
+/**
+ * Runs profiling for a single ARM64 application.
+ */
+public class ProfileSingleEnvVars_ARM64 extends ProcessSpawningTest {
+
+    @Before
+    public void assumeArm64() {
+        TestHelper.assumeIsArm64Host();
+    }
+
+    @Test
+    public void doProfile() throws Exception {
+        File executable = getTestAppExecutable(ExecutablePlatform.ARM64);
+        Process proc = spawnProcess(false, false, executable.getAbsolutePath());
+        WinProcess wp = new WinProcess(proc);
+        wp.getEnvironmentVariables();
+        killSpawnedProcess();
+    }
+
+}

src/test/java/org/jvnet/winp/profiling/ProfileSingleEnvVars_64bit.java → src/test/java/org/jvnet/winp/profiling/ProfileSingleEnvVars_X64.java

@@ -35,7 +35,7 @@
  * Runs profiling for a single 64bit application.
  * @author Oleg Nenashev
  */
-public class ProfileSingleEnvVars_64bit extends ProcessSpawningTest {
+public class ProfileSingleEnvVars_X64 extends ProcessSpawningTest {
 
     @Before
     public void assumeIs64Bit() {

src/test/java/org/jvnet/winp/util/ExecutablePlatform.java

@@ -28,6 +28,7 @@
  * @author Oleg Nenashev
  */
 public enum ExecutablePlatform {
+    ARM64,
     X64,
     X86
     //TODO: Add support of ARM?

src/test/java/org/jvnet/winp/util/ProcessSpawningTest.java

@@ -86,6 +86,9 @@ public Process spawnProcess(boolean delayAfterCreate, boolean spotcheckProcess,
     protected static File getTestAppExecutable(ExecutablePlatform executablePlatform) {
         final String executable;
         switch (executablePlatform) {
+            case ARM64:
+                executable = "native/Arm64/Release/testapp.arm64.exe";
+                break;
             case X64:
                 executable = "native/x64/Release/testapp.x64.exe";
                 break;

src/test/java/org/jvnet/winp/util/TestHelper.java

@@ -24,6 +24,7 @@
 
 package org.jvnet.winp.util;
 
+import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import org.hamcrest.core.StringContains;
 import org.junit.Assume;
@@ -49,7 +50,15 @@ public static void assumeIs64BitHost() {
         Assume.assumeThat("This test can run ony on 64-bit platforms.", 
                 System.getProperty("sun.arch.data.model"), equalTo("64"));
     }
-
+
+    /**
+     * Checks if current system may run ARM64 binaries and skips the test otherwise.
+     */
+    public static void assumeIsArm64Host() {
+        Assume.assumeThat("This test can run ony on ARM64-compatible platforms.",
+                System.getProperty("os.arch"), anyOf(equalTo("aarch64"), equalTo("arm64")));
+    }
+
     public static boolean is64BitJVM() {
         return "64".equals(System.getProperty("sun.arch.data.model"));
     }