Fix TestHTTPEndpoint without TestHTTPResource

Author: gian1200

integration-tests/main/src/test/java/io/quarkus/it/main/TestHTTPResourceClassTestCase.java

@@ -19,7 +19,7 @@ public class TestHTTPResourceClassTestCase {
 
     URL testRootEndpoint;
 
-    @TestHTTPResource("service")
+    @TestHTTPResource("int/10")
     URL testServiceEndpoint;
 
     @TestHTTPEndpoint(GreetingEndpoint.class)
@@ -40,19 +40,18 @@ public void shouldConfigURLWithTestHTTPEndpointOnClass() {
     public void shouldConfigURLWithTestHTTPEndpointOnClassAndTestHTTPResourceOnField() {
         given()
                 .when().get(testServiceEndpoint).then()
-                .body(is("external"));
+                .body(is("11"));
     }
 
     @Test
     public void shouldConfigURLAndOverrideTestHTTPEndpointOnClass() {
         given()
-                .pathParam("name", "some-random-name")
-                .when().get(externalGreetingEndpoint).then()
-                .body(is("some-random-name"));
+                .when().get(externalGreetingEndpoint.toString() + "/anotherName").then()
+                .body(is("Hello anotherName"));
 
         given()
                 .when().get(externalGreetingNameEndpoint).then()
-                .body(is("name"));
+                .body(is("Hello name"));
     }
 
 }

integration-tests/main/src/test/java/io/quarkus/it/main/TestHTTPResourceFieldTestCase.java

@@ -19,7 +19,7 @@ public class TestHTTPResourceFieldTestCase {
     URL testRootEndpoint;
 
     @TestHTTPEndpoint(TestResource.class)
-    @TestHTTPResource("service")
+    @TestHTTPResource("int/10")
     URL testServiceEndpoint;
 
     @Test
@@ -33,7 +33,7 @@ public void shouldConfigURLWithTestHTTPEndpointOnField() {
     public void shouldConfigURLWithTestHTTPEndpointAndTestHTTPResourceOnField() {
         given()
                 .when().get(testServiceEndpoint).then()
-                .body(is("external"));
+                .body(is("11"));
     }
 
 }

test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java

@@ -55,15 +55,15 @@ public static void inject(Object testCase, List<Function<Class<?>, String>> endp
             TestHTTPEndpoint classEndpointAnnotation = c.getAnnotation(TestHTTPEndpoint.class);
             for (Field f : c.getDeclaredFields()) {
                 TestHTTPResource resource = f.getAnnotation(TestHTTPResource.class);
-                if (resource != null) {
+                TestHTTPEndpoint endpointAnnotation = f.getAnnotation(TestHTTPEndpoint.class);
+                if (resource != null || classEndpointAnnotation != null || endpointAnnotation != null) {
                     TestHTTPResourceProvider<?> provider = providers.get(f.getType());
                     if (provider == null) {
                         throw new RuntimeException(
                                 "Unable to inject TestHTTPResource field " + f + " as no provider exists for the type");
                     }
-                    String path = resource.value();
+                    String path = resource != null ? resource.value() : "";
                     String endpointPath = null;
-                    TestHTTPEndpoint endpointAnnotation = f.getAnnotation(TestHTTPEndpoint.class);
                     if (endpointAnnotation != null) {
                         for (Function<Class<?>, String> func : endpointProviders) {
                             endpointPath = func.apply(endpointAnnotation.value());
@@ -99,7 +99,7 @@ public static void inject(Object testCase, List<Function<Class<?>, String>> endp
                         path = endpointPath;
                     }
                     String val;
-                    if (resource.ssl()) {
+                    if (resource != null && resource.ssl()) {
                         if (path.startsWith("/")) {
                             val = getSslUri() + path;
                         } else {