Preparations for resolver alpha-3 (#322)

Changes: * transport renames * some internals rename
apache · Dec 6, 2023 · 69ecbaf · 69ecbaf
1 parent ef42504
commit 69ecbaf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/...test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/...test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
@@ -75,16 +75,8 @@ private void testit(String test, String goal) throws Exception {
             List<String> 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/...src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/...src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
@@ -61,11 +61,6 @@ public void testit() throws Exception {
                     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/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
@@ -107,9 +107,9 @@ private void performTest(/* nullable */ final String transport, final String log
 
     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 @@ private boolean isJdkTransportUsable() {
     }
 
     /**
-     * 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() {