From 8880639cee9e6f9b489dffe3e7220c8cf40f1374 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 6 Dec 2023 15:07:51 +0100 Subject: [PATCH] Preparations for resolver alpha-3 (#322) Changes: * transport renames * some internals rename --- ...2741PluginMetadataResolutionErrorMessageTest.java | 12 ++---------- ...Tmng3477DependencyResolutionErrorMessageTest.java | 5 ----- .../it/MavenITmng7470ResolverTransportTest.java | 6 +++--- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java index eef4305c4d..4df02051b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -75,16 +75,8 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest extends Abst List lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8"); for (String line : lines) { sb.append(line).append(System.lineSeparator()); - if (line.matches(".*Connection refused.*")) { - foundCause = true; - break; - } - // To be fixed with https://issues.apache.org/jira/browse/MRESOLVER-429 - if (line.matches(".*ConnectException.*")) { - foundCause = true; - break; - } - if (line.matches(".*Connection to http://localhost:54312 refused.*")) { + if (line.matches( + ".*Connection to http://localhost:54312.*refused.*")) { // URL may be with or without trailing / foundCause = true; break; } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index a5f530262c..015bb71e89 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -61,11 +61,6 @@ public class MavenITmng3477DependencyResolutionErrorMessageTest extends Abstract foundCause = true; break; } - // To be fixed with https://issues.apache.org/jira/browse/MRESOLVER-429 - if (line.matches(".*org.apache.maven.its.mng3477:dep:jar:1.0.*ConnectException.*")) { - foundCause = true; - break; - } } assertTrue("Transfer error cause was not found", foundCause); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index 4221d2c38d..abfeecb442 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -107,9 +107,9 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio private static final String WAGON_LOG_SNIPPET = "[DEBUG] Using transporter WagonTransporter"; - private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter HttpTransporter"; + private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter ApacheTransporter"; - private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkHttpTransporter"; + private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkTransporter"; /** * Returns {@code true} if JDK HttpClient transport is usable (Java11 or better). @@ -119,7 +119,7 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio } /** - * Returns {@code true} if JDK HttpClient transport is present in Maven (since 4.0.0-alpha-9, the Resovler 2.0.0 + * Returns {@code true} if JDK HttpClient transport is present in Maven (since 4.0.0-alpha-9, the Resolver 2.0.0 * upgrade). */ private boolean isJdkTransportPresent() {