4.x: Improved Helidon MP testing (helidon-io#9695)

* Improved Helidon MP testing. * Review feedback
barchetta · Feb 4, 2025 · 1baabd5 · 1baabd5
1 parent 6062259
commit 1baabd5
Show file tree

Hide file tree

Showing 148 changed files with 9,653 additions and 2,577 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -1103,6 +1103,11 @@
                 <artifactId>helidon-common-testing-virtual-threads</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.microprofile.testing</groupId>
+                <artifactId>helidon-microprofile-testing</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.microprofile.testing</groupId>
                 <artifactId>helidon-microprofile-testing-junit5</artifactId>

diff --git a/common/testing/virtual-threads/src/main/java/module-info.java b/common/testing/virtual-threads/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Oracle and/or its affiliates.
+ * Copyright (c) 2024, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 module io.helidon.common.testing.vitualthreads {
     requires jdk.jfr;
     exports io.helidon.common.testing.virtualthreads to
+            io.helidon.microprofile.testing,
             io.helidon.microprofile.testing.junit5,
             io.helidon.microprofile.testing.testng,
             io.helidon.webserver.testing.junit5;
-}
+}
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -101,6 +101,16 @@
             <artifactId>helidon-microprofile-testing-junit5</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.testing</groupId>
+            <artifactId>helidon-microprofile-testing-testng</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/docs/src/main/asciidoc/includes/attributes.adoc b/docs/src/main/asciidoc/includes/attributes.adoc
@@ -215,10 +215,14 @@ endif::[]
 :metrics-serviceapi-javadoc-base-url: {javadoc-base-url}/io.helidon.metrics.serviceapi
 :micrometer-javadoc-base-url: {javadoc-base-url}/io.helidon.integrations.micrometer
 :prometheus-javadoc-base-url: {javadoc-base-url}/io.helidon.metrics.prometheus
+:mp-config-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.config
 :mp-cors-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.cors
+:mp-restclient-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.restclient
 :mp-server-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.server
 :mp-tyrus-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.tyrus
-:mp-restclient-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.restclient
+:mp-testing-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.testing
+:mp-junit5-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.testing.junit5
+:mp-mocking-javadoc-base-url: {javadoc-base-url}/io.helidon.microprofile.testing.mocking
 :openapi-javadoc-base-url: {javadoc-base-url}/io.helidon.openapi
 :openapi-ui-javadoc-base-url: {javadoc-base-url}/io.helidon.integrations.openapi.ui
 :reactive-base-url: {javadoc-base-url}/io.helidon.common.reactive

diff --git a/docs/src/main/asciidoc/mp/guides/testing-junit5.adoc b/docs/src/main/asciidoc/mp/guides/testing-junit5.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2025 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -95,20 +95,27 @@ The test is now complete and verifies the message.
 
 The testing extension supports a few additional annotations that allow for finer control of the test execution.
 
-
 .Optional Extension Annotations
-[width="70%",options="header"]
+[cols="1,3"]
 |====================
 | Annotation | Description
-| `@HelidonTest(resetPerTest = true)` | Resets the container for each method.
 
+| `@HelidonTest(resetPerTest = true)`
+| Resets the container for each method.
 This is useful when we want to modify configuration or beans between executions. In such a case, injection into fields is not possible, as we would need a different instance for each test.
-| `@AddConfig(key = "app.greeting", value = "Unite")` |  Define additional configuration (either on class level, or method level) by adding a single configuration key/value.
+
+| `@AddConfig(key = "app.greeting", value = "Unite")`
+|  Define additional configuration (either on class level, or method level) by adding a single configuration key/value.
+
 | `@AddConfigBlock(type = "properties", value = """ +
     some.key1=some.value1 +
     some.key2=some.value2 +
-""")` |  Define additional configuration (either on class level, or method level) by adding one or more configuration key/value pairs.
-| `@Configuration(configSources = "test-config.properties")` | Adds a whole config source from classpath.
+""")`
+|  Define additional configuration (either on class level, or method level) by adding one or more configuration key/value pairs.
+
+| `@Configuration(configSources = "test-config.properties")`
+| Adds a whole config source from classpath.
+
 |====================
 
 Here's an example showing how these approaches are used to execute the same endpoint with different configuration: