diff --git a/README.md b/README.md index 658ba192..363ca4be 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MicroShed Testing -[![](https://jitpack.io/v/dev-tools-for-enterprise-java/system-test.svg)](https://jitpack.io/#dev-tools-for-enterprise-java/system-test) -[![Build Status](https://travis-ci.org/dev-tools-for-enterprise-java/system-test.svg?branch=master)](https://travis-ci.org/dev-tools-for-enterprise-java/system-test) +[![](https://jitpack.io/v/microshed/microshed-testing.svg)](https://jitpack.io/#microshed/microshed-testing) +[![Build Status](https://travis-ci.org/MicroShed/microshed-testing.svg?branch=master)](https://travis-ci.org/MicroShed/microshed-testing) [![License](https://img.shields.io/badge/License-ASL%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0) # Goals @@ -25,8 +25,8 @@ Then add `system-test` and `junit-jupiter` as test-scoped dependencies: ```xml - com.github.dev-tools-for-enterprise-java - system-test + com.github.microshed + microshed-testing v0.3-alpha test @@ -42,11 +42,11 @@ Then add `system-test` and `junit-jupiter` as test-scoped dependencies: ``` -# How to run locally: +# How to try out a sample locally: ### Run with Gradle: ``` -./gradlew :system-test-jaxrs-json:test +./gradlew :microshed-testing-jaxrs-json:test ``` ### Run with Maven: @@ -68,20 +68,14 @@ To change which app server is used, [un]comment sections of the test app's Docke # Proposed mockup: ```java -import org.aguibert.testcontainers.framework.MicroProfileApplication; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; -import org.junit.jupiter.api.Test; -import org.testcontainers.junit.jupiter.Testcontainers; - -@Testcontainers -@MicroProfileTest +@MicroShedTest public class BasicJAXRSServiceTest { - @Container // (1) + @Container public static MicroProfileApplication app = new MicroProfileApplication() .withAppContextRoot("/myservice"); - @Inject // (2) + @Inject public static PersonService personSvc; @Test @@ -96,14 +90,3 @@ public class BasicJAXRSServiceTest { } ``` -### Explanation of mockup -1. Extend Testcontainers with a `MicroProfileApplication` class that can work -for any JEE/MP implementation. By annotating with `@Container`, Testcontainers -will automatically find/build the Dockerfile in this project and start it, then -wait for the application context root to be ready. -2. Use the `@Inject` annotation to create a REST Client proxy of the `PersonService` -class which is being tested. This is basically a convenience for the test client making -HTTP requests on the server and then parsing back the response. -3. Easily invoke HTTP requests on the running server and have the response bound -back into a POJO (or an exception class if an error occurred) - diff --git a/core/build.gradle b/core/build.gradle index 105a6f68..6c4b1314 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -5,8 +5,8 @@ plugins { publishing { publications { maven(MavenPublication) { - groupId = 'org.eclipse.microprofile.sandbox' - artifactId = 'system-test' + groupId = 'org.microshed' + artifactId = 'microshed-testing' version = '0.1-SNAPSHOT' from components.java @@ -14,7 +14,7 @@ publishing { } } -description = "MicroProfile System Testing framework" +description = "MicroShed Testing Framework" dependencies { compile group: 'javax.inject', name: 'javax.inject', version: '1' diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/ApplicationEnvironment.java b/core/src/main/java/org/microshed/testing/ApplicationEnvironment.java similarity index 95% rename from core/src/main/java/org/eclipse/microprofile/system/test/ApplicationEnvironment.java rename to core/src/main/java/org/microshed/testing/ApplicationEnvironment.java index d72ca52a..dd63fbb4 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/ApplicationEnvironment.java +++ b/core/src/main/java/org/microshed/testing/ApplicationEnvironment.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test; +package org.microshed.testing; import java.util.HashSet; import java.util.Optional; @@ -26,7 +26,7 @@ public interface ApplicationEnvironment { /** - * The default priority returned by an implementation of {@link ApplicationEnvironment.isAvailable()} + * The default priority returned by an implementation of {@link ApplicationEnvironment#isAvailable} * In general, built-in ApplicationEnvironment implementations have a priority less than the default * and user-defined priorities will have a greater than default priority. */ @@ -66,7 +66,7 @@ public static ApplicationEnvironment load() { .sorted((c1, c2) -> c1.getClass().getCanonicalName().compareTo(c2.getClass().getCanonicalName())) .sorted((c1, c2) -> Integer.compare(c2.getPriority(), c1.getPriority())) .findFirst(); - return selectedEnv.orElseThrow(() -> new IllegalStateException("No available " + ApplicationEnvironment.class + " was discovered.")); + return selectedEnv.orElseThrow(() -> new IllegalStateException("No available " + ApplicationEnvironment.class.getSimpleName() + " was discovered.")); } /** diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/ManuallyStartedConfiguration.java b/core/src/main/java/org/microshed/testing/ManuallyStartedConfiguration.java similarity index 98% rename from core/src/main/java/org/eclipse/microprofile/system/test/ManuallyStartedConfiguration.java rename to core/src/main/java/org/microshed/testing/ManuallyStartedConfiguration.java index 3f0488a7..be48a1ce 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/ManuallyStartedConfiguration.java +++ b/core/src/main/java/org/microshed/testing/ManuallyStartedConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test; +package org.microshed.testing; /** * Configuration representing application and dependent services already diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfig.java b/core/src/main/java/org/microshed/testing/SharedContainerConfig.java similarity index 87% rename from core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfig.java rename to core/src/main/java/org/microshed/testing/SharedContainerConfig.java index 78f76e5d..adb00011 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfig.java +++ b/core/src/main/java/org/microshed/testing/SharedContainerConfig.java @@ -16,22 +16,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test; +package org.microshed.testing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTestExtension; import org.junit.jupiter.api.extension.ExtendWith; +import org.microshed.testing.jupiter.MicroShedTestExtension; /** * References a SharedContainerConfiguration to be used by a test class */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) -@ExtendWith(MicroProfileTestExtension.class) +@ExtendWith(MicroShedTestExtension.class) public @interface SharedContainerConfig { public Class value(); diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfiguration.java b/core/src/main/java/org/microshed/testing/SharedContainerConfiguration.java similarity index 96% rename from core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfiguration.java rename to core/src/main/java/org/microshed/testing/SharedContainerConfiguration.java index 6103f732..857c89d1 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/SharedContainerConfiguration.java +++ b/core/src/main/java/org/microshed/testing/SharedContainerConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test; +package org.microshed.testing; /** * To be used in conjunction with {@link SharedContainerConfig} diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/JsonBProvider.java b/core/src/main/java/org/microshed/testing/jaxrs/JsonBProvider.java similarity index 98% rename from core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/JsonBProvider.java rename to core/src/main/java/org/microshed/testing/jaxrs/JsonBProvider.java index 18faca40..d44b9024 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/JsonBProvider.java +++ b/core/src/main/java/org/microshed/testing/jaxrs/JsonBProvider.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jaxrs; +package org.microshed.testing.jaxrs; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/RestClientBuilder.java b/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java similarity index 99% rename from core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/RestClientBuilder.java rename to core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java index e1892627..329fb120 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jaxrs/RestClientBuilder.java +++ b/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jaxrs; +package org.microshed.testing.jaxrs; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTest.java b/core/src/main/java/org/microshed/testing/jupiter/MicroShedTest.java similarity index 88% rename from core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTest.java rename to core/src/main/java/org/microshed/testing/jupiter/MicroShedTest.java index 83e06391..cf6b40dc 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTest.java +++ b/core/src/main/java/org/microshed/testing/jupiter/MicroShedTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jupiter; +package org.microshed.testing.jupiter; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -27,7 +27,7 @@ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) -@ExtendWith(MicroProfileTestExtension.class) -public @interface MicroProfileTest { +@ExtendWith(MicroShedTestExtension.class) +public @interface MicroShedTest { } diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTestExtension.java b/core/src/main/java/org/microshed/testing/jupiter/MicroShedTestExtension.java similarity index 88% rename from core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTestExtension.java rename to core/src/main/java/org/microshed/testing/jupiter/MicroShedTestExtension.java index 9590c479..895e7ac4 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jupiter/MicroProfileTestExtension.java +++ b/core/src/main/java/org/microshed/testing/jupiter/MicroShedTestExtension.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jupiter; +package org.microshed.testing.jupiter; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -24,14 +24,14 @@ import javax.inject.Inject; -import org.eclipse.microprofile.system.test.ApplicationEnvironment; -import org.eclipse.microprofile.system.test.jaxrs.RestClientBuilder; -import org.eclipse.microprofile.system.test.jwt.JwtBuilder; -import org.eclipse.microprofile.system.test.jwt.JwtConfig; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionConfigurationException; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.platform.commons.support.AnnotationSupport; +import org.microshed.testing.ApplicationEnvironment; +import org.microshed.testing.jaxrs.RestClientBuilder; +import org.microshed.testing.jwt.JwtBuilder; +import org.microshed.testing.jwt.JwtConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,9 +40,9 @@ * Currently this is tied to Testcontainers managing runtime build/deployment, but in a future version * it could be refactored to allow for a different framework managing the runtime build/deployment. */ -public class MicroProfileTestExtension implements BeforeAllCallback { +public class MicroShedTestExtension implements BeforeAllCallback { - static final Logger LOGGER = LoggerFactory.getLogger(MicroProfileTestExtension.class); + static final Logger LOGGER = LoggerFactory.getLogger(MicroShedTestExtension.class); @Override public void beforeAll(ExtensionContext context) throws Exception { diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtBuilder.java b/core/src/main/java/org/microshed/testing/jwt/JwtBuilder.java similarity index 98% rename from core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtBuilder.java rename to core/src/main/java/org/microshed/testing/jwt/JwtBuilder.java index 1a1a21dd..39b1265a 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtBuilder.java +++ b/core/src/main/java/org/microshed/testing/jwt/JwtBuilder.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jwt; +package org.microshed.testing.jwt; import java.security.Key; diff --git a/core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtConfig.java b/core/src/main/java/org/microshed/testing/jwt/JwtConfig.java similarity index 96% rename from core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtConfig.java rename to core/src/main/java/org/microshed/testing/jwt/JwtConfig.java index 252fa298..e7c4133d 100644 --- a/core/src/main/java/org/eclipse/microprofile/system/test/jwt/JwtConfig.java +++ b/core/src/main/java/org/microshed/testing/jwt/JwtConfig.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.jwt; +package org.microshed.testing.jwt; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/resources/META-INF/services/org.eclipse.microprofile.system.test.ApplicationEnvironment b/core/src/main/resources/META-INF/services/org.eclipse.microprofile.system.test.ApplicationEnvironment deleted file mode 100644 index cce06f14..00000000 --- a/core/src/main/resources/META-INF/services/org.eclipse.microprofile.system.test.ApplicationEnvironment +++ /dev/null @@ -1,3 +0,0 @@ -org.eclipse.microprofile.system.test.ManuallyStartedConfiguration -org.eclipse.microprofile.system.test.testcontainers.TestcontainersConfiguration -org.eclipse.microprofile.system.test.testcontainers.HollowTestcontainersConfiguration \ No newline at end of file diff --git a/core/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment b/core/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment new file mode 100644 index 00000000..84272bb3 --- /dev/null +++ b/core/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment @@ -0,0 +1 @@ +org.microshed.testing.ManuallyStartedConfiguration \ No newline at end of file diff --git a/modules/liberty/build.gradle b/modules/liberty/build.gradle index 68257c33..b2342288 100644 --- a/modules/liberty/build.gradle +++ b/modules/liberty/build.gradle @@ -5,8 +5,8 @@ plugins { publishing { publications { maven(MavenPublication) { - groupId = 'org.eclipse.microprofile.sandbox' - artifactId = 'system-test-liberty' + groupId = 'org.microshed' + artifactId = 'microshed-testing-liberty' version = '0.1-SNAPSHOT' from components.java @@ -17,7 +17,7 @@ publishing { description = "MicroProfile and JavaEE Testing framework :: Liberty extensions" dependencies { - compile project(':system-test-testcontainers') + compile project(':microshed-testing-testcontainers') } -publishToMavenLocal.dependsOn ':system-test-testcontainers:publishToMavenLocal' +publishToMavenLocal.dependsOn ':microshed-testing-testcontainers:publishToMavenLocal' diff --git a/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java b/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java index c08fb20a..95a8018f 100644 --- a/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java +++ b/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.testcontainers.containers.microprofile.spi.ServerAdapter; +import org.microshed.testing.testcontainers.spi.ServerAdapter; import org.testcontainers.images.builder.ImageFromDockerfile; public class LibertyAdapter implements ServerAdapter { diff --git a/modules/liberty/src/main/resources/META-INF/services/org.testcontainers.containers.microprofile.spi.ServerAdapter b/modules/liberty/src/main/resources/META-INF/services/org.microshed.testing.testcontainers.spi.ServerAdapter similarity index 100% rename from modules/liberty/src/main/resources/META-INF/services/org.testcontainers.containers.microprofile.spi.ServerAdapter rename to modules/liberty/src/main/resources/META-INF/services/org.microshed.testing.testcontainers.spi.ServerAdapter diff --git a/modules/testcontainers/build.gradle b/modules/testcontainers/build.gradle index 569ef16f..0faf2989 100644 --- a/modules/testcontainers/build.gradle +++ b/modules/testcontainers/build.gradle @@ -5,8 +5,8 @@ plugins { publishing { publications { maven(MavenPublication) { - groupId = 'org.eclipse.microprofile.sandbox' - artifactId = 'system-test-testcontainers' + groupId = 'org.microshed' + artifactId = 'microshed-testing-testcontainers' version = '0.1-SNAPSHOT' from components.java @@ -14,12 +14,12 @@ publishing { } } -description = "MicroProfile and JavaEE Testing framework" +description = "MicroShed Testing :: Testcontainers extension" dependencies { - compile project(':system-test-core') + compile project(':microshed-testing-core') compile "org.testcontainers:junit-jupiter:1.12.0" testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' } -publishToMavenLocal.dependsOn ':system-test-core:publishToMavenLocal' +publishToMavenLocal.dependsOn ':microshed-testing-core:publishToMavenLocal' diff --git a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/ImageFromDockerfile.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ImageFromDockerfile.java similarity index 94% rename from modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/ImageFromDockerfile.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ImageFromDockerfile.java index 0cf4081c..525e66c9 100644 --- a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/ImageFromDockerfile.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ImageFromDockerfile.java @@ -1,4 +1,4 @@ -package org.testcontainers.containers.microprofile; +package org.microshed.testing.testcontainers; import java.nio.file.Path; import java.util.Optional; diff --git a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/MicroProfileApplication.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/MicroProfileApplication.java similarity index 94% rename from modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/MicroProfileApplication.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/MicroProfileApplication.java index 438bc3c8..746896ea 100644 --- a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/MicroProfileApplication.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/MicroProfileApplication.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.testcontainers.containers.microprofile; +package org.microshed.testing.testcontainers; import java.io.File; import java.io.IOException; @@ -39,15 +39,15 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import org.eclipse.microprofile.system.test.ApplicationEnvironment; -import org.eclipse.microprofile.system.test.testcontainers.HollowTestcontainersConfiguration; -import org.eclipse.microprofile.system.test.testcontainers.TestcontainersConfiguration; import org.junit.jupiter.api.extension.ExtensionConfigurationException; +import org.microshed.testing.ApplicationEnvironment; +import org.microshed.testing.testcontainers.config.HollowTestcontainersConfiguration; +import org.microshed.testing.testcontainers.config.TestcontainersConfiguration; +import org.microshed.testing.testcontainers.spi.ServerAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.microprofile.spi.ServerAdapter; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.WaitStrategy; @@ -258,10 +258,10 @@ public Integer getFirstMappedPort() { } /** - * Sets the application context root. The protocol, hostname, and port do not need to be - * included in the appContextRoot parameter. For example, an application - * "foo.war" is available at http://localhost:8080/foo/ the context root can - * be set using withAppContextRoot("/foo"). + * @param appContextRoot the application context root. The protocol, hostname, and port do not need to be + * included in the appContextRoot parameter. For example, an application + * "foo.war" is available at http://localhost:8080/foo/ the context root can + * be set using withAppContextRoot("/foo"). */ public SELF withAppContextRoot(String appContextRoot) { Objects.requireNonNull(appContextRoot); @@ -297,7 +297,7 @@ public SELF withReadinessPath(String readinessUrl) { * * @param readinessUrl The HTTP endpoint to be polled for readiness. Once the endpoint * returns HTTP 200 (OK), the container is considered to be ready. - * @param timeout The amount of time to wait for the container to be ready. + * @param timeoutSeconds The amount of time (in seconds) to wait for the container to be ready. */ public SELF withReadinessPath(String readinessUrl, int timeoutSeconds) { Objects.requireNonNull(readinessUrl); diff --git a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/SystemOutLogConsumer.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/SystemOutLogConsumer.java similarity index 92% rename from modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/SystemOutLogConsumer.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/SystemOutLogConsumer.java index 7ca94669..5ca4635c 100644 --- a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/SystemOutLogConsumer.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/SystemOutLogConsumer.java @@ -1,7 +1,7 @@ /** * */ -package org.testcontainers.containers.microprofile; +package org.microshed.testing.testcontainers; import java.util.function.Consumer; diff --git a/modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/HollowTestcontainersConfiguration.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/HollowTestcontainersConfiguration.java similarity index 95% rename from modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/HollowTestcontainersConfiguration.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/HollowTestcontainersConfiguration.java index b75f05d5..18b70c22 100644 --- a/modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/HollowTestcontainersConfiguration.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/HollowTestcontainersConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.testcontainers; +package org.microshed.testing.testcontainers.config; import java.lang.reflect.Method; import java.net.MalformedURLException; @@ -26,13 +26,13 @@ import java.util.Set; import java.util.stream.Collectors; -import org.eclipse.microprofile.system.test.ApplicationEnvironment; -import org.eclipse.microprofile.system.test.ManuallyStartedConfiguration; import org.junit.jupiter.api.extension.ExtensionConfigurationException; +import org.microshed.testing.ApplicationEnvironment; +import org.microshed.testing.ManuallyStartedConfiguration; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.microprofile.MicroProfileApplication; public class HollowTestcontainersConfiguration extends TestcontainersConfiguration { diff --git a/modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/TestcontainersConfiguration.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/TestcontainersConfiguration.java similarity index 95% rename from modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/TestcontainersConfiguration.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/TestcontainersConfiguration.java index f40ccc84..1dc46ab0 100644 --- a/modules/testcontainers/src/main/java/org/eclipse/microprofile/system/test/testcontainers/TestcontainersConfiguration.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/config/TestcontainersConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.testcontainers; +package org.microshed.testing.testcontainers.config; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -26,19 +26,19 @@ import java.util.Set; import java.util.stream.Stream; -import org.eclipse.microprofile.system.test.ApplicationEnvironment; -import org.eclipse.microprofile.system.test.SharedContainerConfig; -import org.eclipse.microprofile.system.test.SharedContainerConfiguration; -import org.eclipse.microprofile.system.test.jwt.JwtBuilder; -import org.eclipse.microprofile.system.test.jwt.JwtConfig; import org.junit.jupiter.api.extension.ExtensionConfigurationException; import org.junit.platform.commons.support.AnnotationSupport; import org.junit.platform.commons.support.HierarchyTraversalMode; +import org.microshed.testing.ApplicationEnvironment; +import org.microshed.testing.SharedContainerConfig; +import org.microshed.testing.SharedContainerConfiguration; +import org.microshed.testing.jwt.JwtBuilder; +import org.microshed.testing.jwt.JwtConfig; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; -import org.testcontainers.containers.microprofile.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; public class TestcontainersConfiguration implements ApplicationEnvironment { diff --git a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/spi/ServerAdapter.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java similarity index 98% rename from modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/spi/ServerAdapter.java rename to modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java index 355e61dc..ac9e10eb 100644 --- a/modules/testcontainers/src/main/java/org/testcontainers/containers/microprofile/spi/ServerAdapter.java +++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.testcontainers.containers.microprofile.spi; +package org.microshed.testing.testcontainers.spi; import java.io.File; import java.util.Map; diff --git a/modules/testcontainers/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment b/modules/testcontainers/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment new file mode 100644 index 00000000..5542657f --- /dev/null +++ b/modules/testcontainers/src/main/resources/META-INF/services/org.microshed.testing.ApplicationEnvironment @@ -0,0 +1,2 @@ +org.microshed.testing.testcontainers.config.TestcontainersConfiguration +org.microshed.testing.testcontainers.config.HollowTestcontainersConfiguration \ No newline at end of file diff --git a/sample-apps/everything-app/build.gradle b/sample-apps/everything-app/build.gradle index 6cdc4aae..fd48a095 100644 --- a/sample-apps/everything-app/build.gradle +++ b/sample-apps/everything-app/build.gradle @@ -2,13 +2,11 @@ plugins { id 'war' } -description = "MicroProfile and JavaEE Testing framework :: Sample application" - dependencies { providedCompile 'javax:javaee-api:8.0' providedCompile 'org.eclipse.microprofile:microprofile:2.1' compile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.10.1' - testCompile project(':system-test-testcontainers') + testCompile project(':microshed-testing-testcontainers') testCompile 'org.testcontainers:mockserver:1.11.2' testCompile 'org.mock-server:mockserver-client-java:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/ExternalRestServiceClient.java b/sample-apps/everything-app/src/main/java/org/example/app/ExternalRestServiceClient.java similarity index 96% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/ExternalRestServiceClient.java rename to sample-apps/everything-app/src/main/java/org/example/app/ExternalRestServiceClient.java index de9f5df0..58d3a9d5 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/ExternalRestServiceClient.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/ExternalRestServiceClient.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.enterprise.context.ApplicationScoped; import javax.ws.rs.GET; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/MongoProducer.java b/sample-apps/everything-app/src/main/java/org/example/app/MongoProducer.java similarity index 97% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/MongoProducer.java rename to sample-apps/everything-app/src/main/java/org/example/app/MongoProducer.java index b2afee57..91b45af4 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/MongoProducer.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/MongoProducer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Disposes; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java b/sample-apps/everything-app/src/main/java/org/example/app/Person.java similarity index 97% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java rename to sample-apps/everything-app/src/main/java/org/example/app/Person.java index 0866c6c2..e96749a1 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/Person.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Objects; import java.util.Random; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java b/sample-apps/everything-app/src/main/java/org/example/app/PersonService.java similarity index 98% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java rename to sample-apps/everything-app/src/main/java/org/example/app/PersonService.java index aa2dd84c..50c98f6a 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/PersonService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Collection; import java.util.HashMap; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithMongo.java b/sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithMongo.java similarity index 98% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithMongo.java rename to sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithMongo.java index fcdc45ae..91caa8b3 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithMongo.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithMongo.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static com.mongodb.client.model.Filters.eq; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithPassthrough.java b/sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithPassthrough.java similarity index 96% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithPassthrough.java rename to sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithPassthrough.java index 16921f9a..b960937e 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithPassthrough.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/PersonServiceWithPassthrough.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java b/sample-apps/everything-app/src/main/java/org/example/app/TestApp.java similarity index 94% rename from sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java rename to sample-apps/everything-app/src/main/java/org/example/app/TestApp.java index 81cc0539..99584efc 100644 --- a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java +++ b/sample-apps/everything-app/src/main/java/org/example/app/TestApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java b/sample-apps/everything-app/src/test/java/org/example/app/AppContainerConfig.java similarity index 90% rename from sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java rename to sample-apps/everything-app/src/test/java/org/example/app/AppContainerConfig.java index 2cb629e7..a9f1971c 100644 --- a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java +++ b/sample-apps/everything-app/src/test/java/org/example/app/AppContainerConfig.java @@ -16,12 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; -import org.eclipse.microprofile.system.test.SharedContainerConfiguration; +import org.example.app.ExternalRestServiceClient; +import org.microshed.testing.SharedContainerConfiguration; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.MockServerContainer; -import org.testcontainers.containers.microprofile.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; public class AppContainerConfig implements SharedContainerConfiguration { diff --git a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicJAXRSServiceTest.java b/sample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceTest.java similarity index 95% rename from sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicJAXRSServiceTest.java rename to sample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceTest.java index 1dc2cbdc..be60c583 100644 --- a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicJAXRSServiceTest.java +++ b/sample-apps/everything-app/src/test/java/org/example/app/BasicJAXRSServiceTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,11 +29,13 @@ import javax.ws.rs.BadRequestException; import javax.ws.rs.NotFoundException; -import org.eclipse.microprofile.system.test.SharedContainerConfig; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonService; import org.junit.jupiter.api.Test; +import org.microshed.testing.SharedContainerConfig; +import org.microshed.testing.jupiter.MicroShedTest; -@MicroProfileTest +@MicroShedTest @SharedContainerConfig(AppContainerConfig.class) public class BasicJAXRSServiceTest { diff --git a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/DependentServiceTest.java b/sample-apps/everything-app/src/test/java/org/example/app/DependentServiceTest.java similarity index 87% rename from sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/DependentServiceTest.java rename to sample-apps/everything-app/src/test/java/org/example/app/DependentServiceTest.java index 248074a9..9d0f7757 100644 --- a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/DependentServiceTest.java +++ b/sample-apps/everything-app/src/test/java/org/example/app/DependentServiceTest.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; -import static org.eclipse.microprofile.system.test.app.AppContainerConfig.mockServer; +import static org.example.app.AppContainerConfig.mockServer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; @@ -27,16 +27,18 @@ import javax.json.bind.Jsonb; import javax.json.bind.JsonbBuilder; -import org.eclipse.microprofile.system.test.SharedContainerConfig; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonServiceWithPassthrough; import org.junit.jupiter.api.Test; +import org.microshed.testing.SharedContainerConfig; +import org.microshed.testing.jupiter.MicroShedTest; import org.mockserver.client.MockServerClient; import com.google.common.net.MediaType; @SuppressWarnings("resource") -@MicroProfileTest +@MicroShedTest @SharedContainerConfig(AppContainerConfig.class) public class DependentServiceTest { diff --git a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/MongoAndLibertyTest.java b/sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyTest.java similarity index 90% rename from sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/MongoAndLibertyTest.java rename to sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyTest.java index ee56eb61..5210c453 100644 --- a/sample-apps/everything-app/src/test/java/org/eclipse/microprofile/system/test/app/MongoAndLibertyTest.java +++ b/sample-apps/everything-app/src/test/java/org/example/app/MongoAndLibertyTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,11 +25,13 @@ import javax.inject.Inject; -import org.eclipse.microprofile.system.test.SharedContainerConfig; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonServiceWithMongo; import org.junit.jupiter.api.Test; +import org.microshed.testing.SharedContainerConfig; +import org.microshed.testing.jupiter.MicroShedTest; -@MicroProfileTest +@MicroShedTest @SharedContainerConfig(AppContainerConfig.class) public class MongoAndLibertyTest { diff --git a/sample-apps/everything-app/src/test/resources/log4j.properties b/sample-apps/everything-app/src/test/resources/log4j.properties index 5de6a402..c4ad1810 100644 --- a/sample-apps/everything-app/src/test/resources/log4j.properties +++ b/sample-apps/everything-app/src/test/resources/log4j.properties @@ -7,4 +7,4 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%r %p %c %x - %m%n -log4j.logger.org.eclipse.microprofile.system.test=DEBUG +log4j.logger.org.microshed.testing=DEBUG diff --git a/sample-apps/jaxrs-json/build.gradle b/sample-apps/jaxrs-json/build.gradle index 4b8dbf09..dd46743a 100644 --- a/sample-apps/jaxrs-json/build.gradle +++ b/sample-apps/jaxrs-json/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { providedCompile 'javax:javaee-api:8.0' providedCompile 'org.eclipse.microprofile:microprofile:2.1' - testCompile project(':system-test-testcontainers') + testCompile project(':microshed-testing-testcontainers') testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' } diff --git a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/Person.java b/sample-apps/jaxrs-json/src/main/java/org/example/app/Person.java similarity index 97% rename from sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/Person.java rename to sample-apps/jaxrs-json/src/main/java/org/example/app/Person.java index c4e7848b..c8012231 100644 --- a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/Person.java +++ b/sample-apps/jaxrs-json/src/main/java/org/example/app/Person.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Objects; import java.util.Random; diff --git a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java b/sample-apps/jaxrs-json/src/main/java/org/example/app/PersonService.java similarity index 98% rename from sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java rename to sample-apps/jaxrs-json/src/main/java/org/example/app/PersonService.java index 9dcdd5f6..bfe1e9e9 100644 --- a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java +++ b/sample-apps/jaxrs-json/src/main/java/org/example/app/PersonService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Collection; import java.util.HashMap; diff --git a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java b/sample-apps/jaxrs-json/src/main/java/org/example/app/PersonServiceApp.java similarity index 94% rename from sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java rename to sample-apps/jaxrs-json/src/main/java/org/example/app/PersonServiceApp.java index d1979149..80c628d8 100644 --- a/sample-apps/jaxrs-json/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java +++ b/sample-apps/jaxrs-json/src/main/java/org/example/app/PersonServiceApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/jaxrs-json/src/test/java/org/eclipse/microprofile/system/test/app/JaxrsJsonTest.java b/sample-apps/jaxrs-json/src/test/java/org/example/app/JaxrsJsonTest.java similarity index 93% rename from sample-apps/jaxrs-json/src/test/java/org/eclipse/microprofile/system/test/app/JaxrsJsonTest.java rename to sample-apps/jaxrs-json/src/test/java/org/example/app/JaxrsJsonTest.java index 2092c25f..fcac3f09 100644 --- a/sample-apps/jaxrs-json/src/test/java/org/eclipse/microprofile/system/test/app/JaxrsJsonTest.java +++ b/sample-apps/jaxrs-json/src/test/java/org/example/app/JaxrsJsonTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.jupiter.api.Assertions.*; @@ -27,14 +27,14 @@ import javax.ws.rs.NotFoundException; import javax.ws.rs.ProcessingException; -import org.eclipse.microprofile.system.test.app.Person; -import org.eclipse.microprofile.system.test.app.PersonService; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonService; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.microprofile.MicroProfileApplication; +import org.microshed.testing.jupiter.MicroShedTest; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; -@MicroProfileTest +@MicroShedTest public class JaxrsJsonTest { @Container diff --git a/sample-apps/jaxrs-mpjwt/build.gradle b/sample-apps/jaxrs-mpjwt/build.gradle index 4b8dbf09..dd46743a 100644 --- a/sample-apps/jaxrs-mpjwt/build.gradle +++ b/sample-apps/jaxrs-mpjwt/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { providedCompile 'javax:javaee-api:8.0' providedCompile 'org.eclipse.microprofile:microprofile:2.1' - testCompile project(':system-test-testcontainers') + testCompile project(':microshed-testing-testcontainers') testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' } diff --git a/sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredService.java b/sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredService.java similarity index 97% rename from sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredService.java rename to sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredService.java index f0ec113c..bfbdd6d8 100644 --- a/sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredService.java +++ b/sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; diff --git a/sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredServiceApp.java b/sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredServiceApp.java similarity index 94% rename from sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredServiceApp.java rename to sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredServiceApp.java index 6c489f89..16ba9264 100644 --- a/sample-apps/jaxrs-mpjwt/src/main/java/org/eclipse/microprofile/system/test/app/SecuredServiceApp.java +++ b/sample-apps/jaxrs-mpjwt/src/main/java/org/example/app/SecuredServiceApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/jaxrs-mpjwt/src/test/java/org/eclipse/microprofile/system/test/app/SecuredSvcTest.java b/sample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcTest.java similarity index 89% rename from sample-apps/jaxrs-mpjwt/src/test/java/org/eclipse/microprofile/system/test/app/SecuredSvcTest.java rename to sample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcTest.java index 1a6a4fec..a6f149d8 100644 --- a/sample-apps/jaxrs-mpjwt/src/test/java/org/eclipse/microprofile/system/test/app/SecuredSvcTest.java +++ b/sample-apps/jaxrs-mpjwt/src/test/java/org/example/app/SecuredSvcTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,13 +25,14 @@ import javax.ws.rs.ForbiddenException; import javax.ws.rs.NotAuthorizedException; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; -import org.eclipse.microprofile.system.test.jwt.JwtConfig; +import org.example.app.SecuredService; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.microprofile.MicroProfileApplication; +import org.microshed.testing.jupiter.MicroShedTest; +import org.microshed.testing.jwt.JwtConfig; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; -@MicroProfileTest +@MicroShedTest public class SecuredSvcTest { @Container diff --git a/sample-apps/jdbc-app/build.gradle b/sample-apps/jdbc-app/build.gradle index 1f986e1f..d8df7cd7 100644 --- a/sample-apps/jdbc-app/build.gradle +++ b/sample-apps/jdbc-app/build.gradle @@ -6,13 +6,11 @@ configurations { postgres } -description = "MicroProfile and JavaEE Testing framework :: Sample JDBC application" - dependencies { providedCompile 'javax:javaee-api:8.0' providedCompile 'org.eclipse.microprofile:microprofile:2.1' testCompile "org.testcontainers:postgresql:1.12.0" - testCompile project(':system-test-testcontainers') + testCompile project(':microshed-testing-testcontainers') testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' postgres "org.postgresql:postgresql:42.2.5" } diff --git a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java b/sample-apps/jdbc-app/src/main/java/org/example/app/Person.java similarity index 97% rename from sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java rename to sample-apps/jdbc-app/src/main/java/org/example/app/Person.java index b1af4607..89545790 100644 --- a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java +++ b/sample-apps/jdbc-app/src/main/java/org/example/app/Person.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Objects; import java.util.Random; diff --git a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithJDBC.java b/sample-apps/jdbc-app/src/main/java/org/example/app/PersonServiceWithJDBC.java similarity index 99% rename from sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithJDBC.java rename to sample-apps/jdbc-app/src/main/java/org/example/app/PersonServiceWithJDBC.java index 681ab60f..3895a2e6 100644 --- a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceWithJDBC.java +++ b/sample-apps/jdbc-app/src/main/java/org/example/app/PersonServiceWithJDBC.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java b/sample-apps/jdbc-app/src/main/java/org/example/app/TestApp.java similarity index 94% rename from sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java rename to sample-apps/jdbc-app/src/main/java/org/example/app/TestApp.java index 48c44a4b..49fd4642 100644 --- a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java +++ b/sample-apps/jdbc-app/src/main/java/org/example/app/TestApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java b/sample-apps/jdbc-app/src/test/java/org/example/app/AppContainerConfig.java similarity index 88% rename from sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java rename to sample-apps/jdbc-app/src/test/java/org/example/app/AppContainerConfig.java index ab311c35..94ddadb0 100644 --- a/sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/AppContainerConfig.java +++ b/sample-apps/jdbc-app/src/test/java/org/example/app/AppContainerConfig.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; -import org.eclipse.microprofile.system.test.SharedContainerConfiguration; +import org.microshed.testing.SharedContainerConfiguration; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.microprofile.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; public class AppContainerConfig implements SharedContainerConfiguration { diff --git a/sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/DatabaseTest.java b/sample-apps/jdbc-app/src/test/java/org/example/app/DatabaseTest.java similarity index 86% rename from sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/DatabaseTest.java rename to sample-apps/jdbc-app/src/test/java/org/example/app/DatabaseTest.java index de79e2e3..86f98da4 100644 --- a/sample-apps/jdbc-app/src/test/java/org/eclipse/microprofile/system/test/app/DatabaseTest.java +++ b/sample-apps/jdbc-app/src/test/java/org/example/app/DatabaseTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,13 +25,13 @@ import javax.inject.Inject; -import org.eclipse.microprofile.system.test.SharedContainerConfig; -import org.eclipse.microprofile.system.test.app.Person; -import org.eclipse.microprofile.system.test.app.PersonServiceWithJDBC; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonServiceWithJDBC; import org.junit.jupiter.api.Test; +import org.microshed.testing.SharedContainerConfig; +import org.microshed.testing.jupiter.MicroShedTest; -@MicroProfileTest +@MicroShedTest @SharedContainerConfig(AppContainerConfig.class) public class DatabaseTest { diff --git a/sample-apps/liberty-app/build.gradle b/sample-apps/liberty-app/build.gradle index 533acf65..7c994924 100644 --- a/sample-apps/liberty-app/build.gradle +++ b/sample-apps/liberty-app/build.gradle @@ -2,13 +2,11 @@ plugins { id 'war' } -description = "MicroProfile and JavaEE Testing framework :: Sample application" - dependencies { providedCompile 'javax:javaee-api:8.0' providedCompile 'org.eclipse.microprofile:microprofile:3.0' - testCompile project(':system-test-testcontainers') - testCompile project(':system-test-liberty') + testCompile project(':microshed-testing-testcontainers') + testCompile project(':microshed-testing-liberty') testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' } diff --git a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java b/sample-apps/liberty-app/src/main/java/org/example/app/Person.java similarity index 97% rename from sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java rename to sample-apps/liberty-app/src/main/java/org/example/app/Person.java index b1af4607..89545790 100644 --- a/sample-apps/jdbc-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java +++ b/sample-apps/liberty-app/src/main/java/org/example/app/Person.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Objects; import java.util.Random; diff --git a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java b/sample-apps/liberty-app/src/main/java/org/example/app/PersonService.java similarity index 98% rename from sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java rename to sample-apps/liberty-app/src/main/java/org/example/app/PersonService.java index aa2dd84c..50c98f6a 100644 --- a/sample-apps/liberty-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java +++ b/sample-apps/liberty-app/src/main/java/org/example/app/PersonService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Collection; import java.util.HashMap; diff --git a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java b/sample-apps/liberty-app/src/main/java/org/example/app/TestApp.java similarity index 94% rename from sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java rename to sample-apps/liberty-app/src/main/java/org/example/app/TestApp.java index 81cc0539..99584efc 100644 --- a/sample-apps/everything-app/src/main/java/org/eclipse/microprofile/system/test/app/TestApp.java +++ b/sample-apps/liberty-app/src/main/java/org/example/app/TestApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/liberty-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicLibertyAppTest.java b/sample-apps/liberty-app/src/test/java/org/example/app/BasicLibertyAppTest.java similarity index 95% rename from sample-apps/liberty-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicLibertyAppTest.java rename to sample-apps/liberty-app/src/test/java/org/example/app/BasicLibertyAppTest.java index 37a23d6f..0d85d0e9 100644 --- a/sample-apps/liberty-app/src/test/java/org/eclipse/microprofile/system/test/app/BasicLibertyAppTest.java +++ b/sample-apps/liberty-app/src/test/java/org/example/app/BasicLibertyAppTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,12 +29,14 @@ import javax.ws.rs.BadRequestException; import javax.ws.rs.NotFoundException; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonService; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.microprofile.MicroProfileApplication; +import org.microshed.testing.jupiter.MicroShedTest; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; -@MicroProfileTest +@MicroShedTest public class BasicLibertyAppTest { @Container diff --git a/sample-apps/maven-app/build.gradle b/sample-apps/maven-app/build.gradle index 568878b7..1ecb943e 100644 --- a/sample-apps/maven-app/build.gradle +++ b/sample-apps/maven-app/build.gradle @@ -29,7 +29,7 @@ task runMvnVerify(type:Exec) { } } -compileJava.dependsOn ':system-test-testcontainers:publishToMavenLocal' +compileJava.dependsOn ':microshed-testing-testcontainers:publishToMavenLocal' assemble.dependsOn runMvnCompile test.dependsOn runMvnVerify diff --git a/sample-apps/maven-app/pom.xml b/sample-apps/maven-app/pom.xml index beeeb6af..7ce05f50 100644 --- a/sample-apps/maven-app/pom.xml +++ b/sample-apps/maven-app/pom.xml @@ -3,8 +3,8 @@ 4.0.0 - io.openliberty - system-test-maven-app + org.microshed + microshed-testing-maven-app 1.0-SNAPSHOT war @@ -24,7 +24,7 @@ org.eclipse.microprofile microprofile - 2.2 + 3.0 pom provided @@ -36,8 +36,8 @@ - org.eclipse.microprofile.sandbox - system-test-testcontainers + org.microshed + microshed-testing-testcontainers 0.1-SNAPSHOT test diff --git a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java b/sample-apps/maven-app/src/main/java/org/example/app/Person.java similarity index 97% rename from sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java rename to sample-apps/maven-app/src/main/java/org/example/app/Person.java index c4e7848b..c8012231 100644 --- a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/Person.java +++ b/sample-apps/maven-app/src/main/java/org/example/app/Person.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Objects; import java.util.Random; diff --git a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java b/sample-apps/maven-app/src/main/java/org/example/app/PersonService.java similarity index 98% rename from sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java rename to sample-apps/maven-app/src/main/java/org/example/app/PersonService.java index 9dcdd5f6..bfe1e9e9 100644 --- a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonService.java +++ b/sample-apps/maven-app/src/main/java/org/example/app/PersonService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import java.util.Collection; import java.util.HashMap; diff --git a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java b/sample-apps/maven-app/src/main/java/org/example/app/PersonServiceApp.java similarity index 94% rename from sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java rename to sample-apps/maven-app/src/main/java/org/example/app/PersonServiceApp.java index 84d564a8..4c2a1ef8 100644 --- a/sample-apps/maven-app/src/main/java/org/eclipse/microprofile/system/test/app/PersonServiceApp.java +++ b/sample-apps/maven-app/src/main/java/org/example/app/PersonServiceApp.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app; +package org.example.app; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/sample-apps/maven-app/src/test/java/org/eclipse/microprofile/system/test/app/it/JaxrsJsonTest.java b/sample-apps/maven-app/src/test/java/org/example/app/it/JaxrsJsonTest.java similarity index 93% rename from sample-apps/maven-app/src/test/java/org/eclipse/microprofile/system/test/app/it/JaxrsJsonTest.java rename to sample-apps/maven-app/src/test/java/org/example/app/it/JaxrsJsonTest.java index ac78af0e..11410f48 100644 --- a/sample-apps/maven-app/src/test/java/org/eclipse/microprofile/system/test/app/it/JaxrsJsonTest.java +++ b/sample-apps/maven-app/src/test/java/org/example/app/it/JaxrsJsonTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.eclipse.microprofile.system.test.app.it; +package org.example.app.it; import static org.junit.jupiter.api.Assertions.*; @@ -27,14 +27,14 @@ import javax.ws.rs.NotFoundException; import javax.ws.rs.ProcessingException; -import org.eclipse.microprofile.system.test.app.Person; -import org.eclipse.microprofile.system.test.app.PersonService; -import org.eclipse.microprofile.system.test.jupiter.MicroProfileTest; +import org.example.app.Person; +import org.example.app.PersonService; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.microprofile.MicroProfileApplication; +import org.microshed.testing.jupiter.MicroShedTest; +import org.microshed.testing.testcontainers.MicroProfileApplication; import org.testcontainers.junit.jupiter.Container; -@MicroProfileTest +@MicroShedTest public class JaxrsJsonTest { @Container diff --git a/settings.gradle b/settings.gradle index 217e3d39..0a37edb9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,16 +1,14 @@ -rootProject.name = 'system-test' +rootProject.name = 'microshed-testing' -include "system-test-core" -project(':system-test-core').projectDir = "$rootDir/core" as File +include rootProject.name + '-core' +project(':' + rootProject.name + '-core').projectDir = "$rootDir/core" as File -// Include all module projects as system-test- file('modules').eachDir { dir -> - include 'system-test-' + dir.name - project(':system-test-' + dir.name).projectDir = dir + include rootProject.name + '-' + dir.name + project(':' + rootProject.name + '-' + dir.name).projectDir = dir } -// Include all test app projects as system-test- file('sample-apps').eachDir { dir -> - include 'system-test-' + dir.name - project(':system-test-' + dir.name).projectDir = dir + include rootProject.name + '-' + dir.name + project(':' + rootProject.name + '-' + dir.name).projectDir = dir }