This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 15303ce0515d2abbcc64a8d9bf3b66db37954d11 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Mon Oct 26 01:05:24 2026 +0100 Re-enable three disabled tests (#1796, #1284) testCygwin tested toCygwin(), which runs cygpath when it is on the PATH, as on Git for Windows; it now tests the fallback conversion instead. SocketFamilyTest#testUnixFromTo was disabled for multi-release jars, which master no longer builds. ConcurrentDownloadsTest runs with Mimir off so the artifacts are downloaded again. --- .../java/org/mvndaemon/mvnd/common/SocketFamilyTest.java | 2 -- daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java | 13 ++++++++++--- .../src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java | 7 +++---- .../java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java b/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java index f98601c1..ff3e1ec4 100644 --- a/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java +++ b/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java @@ -23,7 +23,6 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.UnknownHostException; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; @@ -68,7 +67,6 @@ public class SocketFamilyTest { @Test @EnabledForJreRange(min = JRE.JAVA_16) - @Disabled("Test framework does not support multi-release expanded jars") void testUnixFromTo() { SocketAddress address = SocketFamily.fromString("unix:/tmp/foo-0123456.socket"); assertEquals(SocketFamily.unix, SocketFamily.familyOf(address)); diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java b/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java index dedd2bc6..21851787 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java @@ -103,14 +103,21 @@ public class EnvHelper { String p = path.endsWith("\\") ? path.substring(0, path.length() - 1) : path; return ExecHelper.exec(false, "cygpath", p).trim(); } catch (IOException e) { - String root = path.substring(0, 1); - String p = path.substring(3); - return "/cygdrive/" + root.toLowerCase(Locale.ROOT) + "/" + p.replace('\\', '/'); + return toCygdrive(path); } } return path; } + /** + * The conversion {@link #toCygwin(String)} falls back to when {@code cygpath} cannot be run. + */ + static String toCygdrive(String path) { + String root = path.substring(0, 1); + String p = path.substring(3); + return "/cygdrive/" + root.toLowerCase(Locale.ROOT) + "/" + p.replace('\\', '/'); + } + static void chDir(String workingDir) throws Exception { CLibrary.chdir(workingDir); System.setProperty("user.dir", workingDir); diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java b/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java index 69d6a49e..f946cb8d 100644 --- a/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java +++ b/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java @@ -28,7 +28,6 @@ import java.util.Locale; import java.util.Map; import java.util.UUID; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mvndaemon.mvnd.common.Os; @@ -72,8 +71,8 @@ public class EnvHelperTest { } @Test - @Disabled - void testCygwin() throws Exception { - assertEquals("/cygdrive/c/work/tmp/", EnvHelper.toCygwin("C:\\work\\tmp\\")); + void testCygwin() { + // toCygwin() itself runs cygpath when it is on the PATH (Git for Windows ships one), so test the fallback + assertEquals("/cygdrive/c/work/tmp/", EnvHelper.toCygdrive("C:\\work\\tmp\\")); } } diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java index d4b9bb66..19661ff7 100644 --- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import java.io.IOException; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mvndaemon.mvnd.assertj.TestClientOutput; import org.mvndaemon.mvnd.client.Client; @@ -33,7 +32,6 @@ import org.mvndaemon.mvnd.junit.TestParameters; import static org.junit.jupiter.api.Assertions.assertTrue; -@Disabled("Due use of Mimir in ITs this test does not download but gets from Mimir cache instead") @MvndTest(projectDir = "src/test/projects/concurrent-downloads") class ConcurrentDownloadsTest { @@ -48,7 +46,9 @@ class ConcurrentDownloadsTest { final TestClientOutput o = new TestClientOutput(); Client client = clientFactory.newClient(parameters.withTransferProgress()); - client.execute(o, "clean", "install", "-e", "-B").assertSuccess(); + // Mimir would serve the artifacts from its cache instead of downloading them + client.execute(o, "clean", "install", "-e", "-B", "-Dmimir.enabled=false") + .assertSuccess(); int maxConcurrentDownloads = 0; int cur = 0;
