Merge pull request #23095 from geoand/#23084

Make @TestHTTPEndpoint work with path variables
quarkusio · Jan 21, 2022 · 38111b8 · 38111b8
2 parents c458f08 + c57f3a0
commit 38111b8
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/otherTest/{name:[a-z]{1,10}}")
+public class TestResourceWithVariable {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello(@PathParam("name") String name) {
+        return "hello " + name;
+    }
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.it.rest.TestResource;
+import io.quarkus.it.rest.TestResourceWithVariable;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
@@ -278,4 +279,15 @@ public void testSSE() throws Exception {
                         containsString("<settings><foo bar=\"1\"/></settings>"),
                         containsString("<settings><foo bar=\"2\"/></settings>"));
     }
+
+    @Test
+    @TestHTTPEndpoint(TestResourceWithVariable.class)
+    public void testPathVariable() {
+        RestAssured.given()
+                .pathParam("name", "yolo")
+                .when().get()
+                .then()
+                .statusCode(200)
+                .body(is("hello yolo"));
+    }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -458,9 +458,42 @@ public static String getEndpointPath(ExtensionContext context, List<Function<Cla
                         + " for test method " + context.getRequiredTestMethod());
             }
         }
+        if (endpointPath != null) {
+            if (endpointPath.indexOf(':') != -1) {
+                return sanitizeEndpointPath(endpointPath);
+            }
+        }
+
         return endpointPath;
     }
 
+    /**
+     * Remove any sort of regex restrictions from "variables in the path"
+     */
+    private static String sanitizeEndpointPath(String path) {
+        int openBrackets = 0;
+        boolean inRegex = false;
+        StringBuilder replaced = new StringBuilder(path.length() - 1);
+        for (int i = 0; i < path.length(); i++) {
+            char c = path.charAt(i);
+            if (c == '{') {
+                openBrackets++;
+            } else if (c == '}') {
+                openBrackets--;
+                if (openBrackets == 0) {
+                    inRegex = false;
+                }
+            } else if ((c == ':') && (openBrackets > 0)) {
+                inRegex = true;
+            }
+            if (!inRegex) {
+                replaced.append(c);
+            }
+
+        }
+        return replaced.toString();
+    }
+
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
         if (isNativeOrIntegrationTest(context.getRequiredTestClass())) {