Merge pull request #24666 from glefloch/fix/15013

Export application name and version in tests
quarkusio · Apr 20, 2022 · 30b369c · 30b369c
2 parents 34ac54b + 4b79122
commit 30b369c
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 10 deletions.
diff --git a/...ment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java b/...ment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java
@@ -34,7 +34,7 @@ public void testOpenApiPathAccessResource() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("tags.name[0]", Matchers.equalTo("test"))
                 .body("paths.'/resource'.get.servers[0]", Matchers.hasKey("url"))
                 .body("paths.'/resource'.get.security[0]", Matchers.hasKey("securityRequirement"))

diff --git a/.../test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java b/.../test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java
@@ -33,7 +33,7 @@ public void testOpenApiPathAccessResource() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("paths", Matchers.hasKey("/foo/resource"));
     }
 }
diff --git a/...arkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java b/...arkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java
@@ -26,7 +26,7 @@ public void testOpenApiResteasyPathHttpRootDefaultPath() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("paths", Matchers.hasKey("/http-root-path/resteasy-path/resource"));
     }
 }
diff --git a/...src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java b/...src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java
@@ -25,7 +25,7 @@ public void testOpenApiResteasyPath() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("paths", Matchers.hasKey("/foo/bar/resource"));
     }
 }
diff --git a/...ment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java b/...ment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java
@@ -31,7 +31,7 @@ public void testOpenApiPathAccessResource() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("paths", Matchers.hasKey("/resource"));
     }
 }
diff --git a/.../test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java b/.../test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java
@@ -33,7 +33,7 @@ public void testOpenApiPathAccessResource() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-smallrye-openapi-deployment API"))
                 .body("paths", Matchers.hasKey("/foo/resource"));
     }
 }
diff --git a/...rkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java b/...rkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java
@@ -28,7 +28,8 @@ public class KafkaDevServicesDevModeTestCase {
             "mp.messaging.outgoing.generated-price.topic=prices\n" +
             "mp.messaging.incoming.prices.connector=smallrye-kafka\n" +
             "mp.messaging.incoming.prices.health-readiness-enabled=false\n" +
-            "mp.messaging.incoming.prices.topic=prices\n";
+            "mp.messaging.incoming.prices.topic=prices\n" +
+            "quarkus.application.name=\n";
 
     @RegisterExtension
     public static QuarkusDevModeTest test = new QuarkusDevModeTest()

diff --git a/...dent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java b/...dent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java
@@ -102,7 +102,7 @@ private QuarkusBootstrap(Builder builder, ConfiguredClassLoading classLoadingCon
         this.additionalApplicationArchives = new ArrayList<>(builder.additionalApplicationArchives);
         this.excludeFromClassPath = new ArrayList<>(builder.excludeFromClassPath);
         this.projectRoot = builder.projectRoot != null ? builder.projectRoot.normalize() : null;
-        this.buildSystemProperties = builder.buildSystemProperties;
+        this.buildSystemProperties = builder.buildSystemProperties != null ? builder.buildSystemProperties : new Properties();
         this.mode = builder.mode;
         this.offline = builder.offline;
         this.test = builder.test;
@@ -159,7 +159,19 @@ public CuratedApplication bootstrap() throws BootstrapException {
                 appModelFactory.setEnableClasspathCache(true);
             }
         }
-        return new CuratedApplication(this, appModelFactory.resolveAppModel(), classLoadingConfig);
+        CurationResult curationResult = appModelFactory.resolveAppModel();
+        if (curationResult.getApplicationModel().getAppArtifact() != null) {
+            if (curationResult.getApplicationModel().getAppArtifact().getArtifactId() != null) {
+                buildSystemProperties.putIfAbsent("quarkus.application.name",
+                        curationResult.getApplicationModel().getAppArtifact().getArtifactId());
+            }
+            if (curationResult.getApplicationModel().getAppArtifact().getVersion() != null) {
+                buildSystemProperties.putIfAbsent("quarkus.application.version",
+                        curationResult.getApplicationModel().getAppArtifact().getVersion());
+            }
+        }
+
+        return new CuratedApplication(this, curationResult, classLoadingConfig);
     }
 
     public static ConfiguredClassLoading createClassLoadingConfig(PathCollection applicationRoot, Mode mode,

diff --git a/...sic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java b/...sic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java
@@ -0,0 +1,25 @@
+package org.acme;
+
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/app-config")
+public class ApplicationConfigResource {
+
+    @ConfigProperty(name = "quarkus.application.name")
+    String name;
+
+    @ConfigProperty(name = "quarkus.application.version")
+    String version;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return String.format("%s:%s", name, version);
+    }
+}
diff --git a/...java-library-module/application/src/test/java/org/acme/ApplicationConfigResourceTest.java b/...java-library-module/application/src/test/java/org/acme/ApplicationConfigResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ApplicationConfigResourceTest {
+
+    @Test
+    public void testAppConfigEndpoint() {
+        given()
+          .when().get("/app-config")
+          .then()
+             .statusCode(200)
+             .body(is("application:1.0.0-SNAPSHOT"));
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ApplicationConfigurationTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ApplicationConfigurationTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+public class ApplicationConfigurationTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void shouldSuccessfullyInjectApplicationConfigInTest() throws Exception {
+        File projectDir = getProjectDir("basic-java-library-module");
+
+        BuildResult testResult = runGradleWrapper(projectDir, "clean", ":application:test");
+
+        assertThat(testResult.getTasks().get(":application:test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+
+}
diff --git a/...ests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java b/...ests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java
@@ -34,7 +34,7 @@ public void testOpenApiPathAccessResource() {
                 .then()
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
-                .body("info.title", Matchers.equalTo("Generated API"))
+                .body("info.title", Matchers.equalTo("quarkus-integration-test-spring-web API"))
                 .body("paths", Matchers.hasKey("/resource"));
     }
 }