From cf42d13b77fdf87522dfd647e0bd84b5aa3688e3 Mon Sep 17 00:00:00 2001 From: Tomas Langer Date: Fri, 15 Sep 2023 13:36:33 +0200 Subject: [PATCH 1/2] Move MP testing support to `testing` module Align MP tests modules groupIds with guidelines Resolve review comments --- .../main/archetype/mp/common/common-mp.xml | 6 +-- .../FileServiceTest.java.multipart.mustache | 8 ++-- .../java/__pkg__/FtResourceTest.java.mustache | 2 +- .../test/java/__pkg__/TestCORS.java.mustache | 2 +- .../GreetResourceConfigFileTest.java.mustache | 4 +- ...esourceInstancePrincipalTest.java.mustache | 4 +- .../GreetResourceMockedTest.java.mustache | 4 +- .../src/main/archetype/mp/oci/oci-mp.xml | 4 +- bom/pom.xml | 8 ++-- docs/mp/guides/testing-junit5.adoc | 18 ++++---- docs/mp/testing-ng.adoc | 18 ++++---- docs/mp/testing.adoc | 16 ++++---- examples/integrations/micrometer/mp/pom.xml | 4 +- .../micrometer/mp/TestEndpoint.java | 2 +- examples/integrations/micronaut/data/pom.xml | 4 +- .../micronaut/data/MicronautExampleTest.java | 2 +- .../microstream/greetings-mp/pom.xml | 4 +- .../mp/MicrostreamExampleGreetingsMpTest.java | 2 +- examples/integrations/oci/vault-cdi/pom.xml | 4 +- examples/jbatch/pom.xml | 4 +- .../examples/jbatch/TestJBatchEndpoint.java | 19 +++++---- examples/metrics/filtering/mp/pom.xml | 4 +- .../metrics/filtering/mp/MainTest.java | 2 +- examples/microprofile/bean-validation/pom.xml | 4 +- .../validation/TestValidationEndpoint.java | 2 +- .../microprofile/hello-world-implicit/pom.xml | 4 +- .../implicit/ImplicitHelloWorldTest.java | 2 +- .../microprofile/http-status-count-mp/pom.xml | 4 +- .../examples/mp/httpstatuscount/MainTest.java | 2 +- .../mp/httpstatuscount/StatusTest.java | 4 +- examples/microprofile/multipart/pom.xml | 4 +- .../multipart/FileServiceTest.java | 10 ++--- examples/microprofile/multiport/pom.xml | 4 +- .../microprofile/multiport/MainTest.java | 6 +-- .../microprofile/telemetry/secondary/pom.xml | 4 +- examples/microprofile/websocket/pom.xml | 4 +- .../example/websocket/MessageBoardTest.java | 2 +- .../helidon-quickstart-mp/build.gradle | 4 +- .../quickstarts/helidon-quickstart-mp/pom.xml | 4 +- .../examples/quickstart/mp/MainTest.java | 2 +- .../helidon-standalone-quickstart-mp/pom.xml | 4 +- .../examples/quickstart/mp/MainTest.java | 2 +- examples/todo-app/backend/pom.xml | 4 +- .../examples/todos/backend/BackendTests.java | 4 +- integrations/micrometer/cdi/pom.xml | 4 +- .../micrometer/cdi/HelloWorldTest.java | 8 ++-- .../micrometer/cdi/MeteredBeanTest.java | 7 ++-- integrations/micronaut/cdi/pom.xml | 4 +- .../cdi/MicronautCdiExtensionTest.java | 4 +- integrations/micronaut/data/pom.xml | 4 +- .../data/MicronautDataCdiExtensionTest.java | 15 ++++--- integrations/microstream/cdi/pom.xml | 4 +- .../cdi/CacheManagerExtentionTest.java | 6 +-- .../cdi/MicrostreamExtensionTest.java | 4 +- integrations/oci/metrics/cdi/pom.xml | 4 +- .../cdi/OciMetricsCdiExtensionTest.java | 11 +++-- integrations/oci/sdk/cdi/pom.xml | 4 +- .../integrations/oci/sdk/cdi/TestSpike.java | 35 +++++----------- integrations/oci/tls-certificates/pom.xml | 4 +- microprofile/config/pom.xml | 4 +- .../config/MpConfigConvertTest.java | 5 ++- .../config/MpConfigInjectionTest.java | 6 +-- .../microprofile/config/MutableMpTest.java | 8 ++-- microprofile/cors/pom.xml | 4 +- .../microprofile/cors/AdapterTest.java | 2 +- .../cors/BaseCrossOriginTest.java | 4 +- .../microprofile/cors/CorsDisabledTest.java | 6 +-- .../microprofile/cors/CrossOriginTest.java | 4 +- .../microprofile/cors/ErrorResponseTest.java | 6 +-- .../cors/TestWithAdjustedCorsType.java | 6 +-- microprofile/fault-tolerance/pom.xml | 4 +- .../faulttolerance/AsynchronousTest.java | 2 +- .../faulttolerance/BulkheadTest.java | 2 +- .../faulttolerance/CircuitBreakerTest.java | 4 +- .../faulttolerance/ConfigClassTest.java | 4 +- .../faulttolerance/ConfigGlobalTest.java | 4 +- .../faulttolerance/ConfigMethodTest.java | 4 +- .../faulttolerance/FallbackTest.java | 2 +- .../faulttolerance/FaultToleranceTest.java | 2 +- .../faulttolerance/RetryTest.java | 3 +- .../faulttolerance/TimeoutTest.java | 2 +- microprofile/graphql/server/pom.xml | 4 +- microprofile/health/pom.xml | 4 +- .../health/HealthMpServiceIT.java | 6 +-- microprofile/jwt-auth/pom.xml | 4 +- .../microprofile/jwt/auth/JwtAuthTest.java | 4 +- microprofile/lra/jax-rs/pom.xml | 4 +- .../lra/CoordinatorHeaderPropagationTest.java | 10 ++--- .../lra/LoadBalancedCoordinatorTest.java | 12 +++--- .../microprofile/lra/ParticipantTest.java | 10 ++--- microprofile/messaging/core/pom.xml | 4 +- .../microprofile/messaging/EmitterTest.java | 11 +++-- .../messaging/FlowSupportTest.java | 15 ++++--- .../messaging/MockConnectorTest.java | 15 ++++--- .../messaging/MultiSupportTest.java | 15 ++++--- .../messaging/UncaughtExceptionTest.java | 4 +- .../connector/Processor2ConnectorTest.java | 13 +++--- microprofile/messaging/health/pom.xml | 4 +- .../messaging/health/MessagingHealthTest.java | 12 +++--- microprofile/messaging/metrics/pom.xml | 4 +- microprofile/metrics/pom.xml | 4 +- .../metrics/CountedConstructorTest.java | 8 ++-- .../metrics/HelloWorldAsyncResponseTest.java | 4 +- ...WorldAsyncResponseWithRestRequestTest.java | 4 +- ...ldRestEndpointSimpleTimerDisabledTest.java | 7 ++-- .../microprofile/metrics/HelloWorldTest.java | 4 +- .../metrics/MetricProducerMethodBeanTest.java | 3 +- .../microprofile/metrics/MetricsBaseTest.java | 6 +-- .../metrics/MetricsMpServiceTest.java | 4 +- .../microprofile/metrics/MpFeatureTest.java | 2 +- .../metrics/ReusabilityInterceptorTest.java | 2 +- .../TestBasicPerformanceIndicators.java | 4 +- .../metrics/TestConfigProcessing.java | 2 +- .../metrics/TestDisabledMetrics.java | 10 ++--- .../metrics/TestMetricsOnOwnSocket.java | 4 +- .../microprofile/metrics/TestObservers.java | 4 +- .../metrics/TestRemovedInterceptorMetric.java | 4 +- .../microprofile/metrics/TestStereotypes.java | 3 +- .../metrics/TestVetoedResource.java | 11 ++--- microprofile/openapi/pom.xml | 4 +- .../microprofile/openapi/BasicServerTest.java | 4 +- .../openapi/TestFilterAndModelReader.java | 4 +- microprofile/pom.xml | 1 + microprofile/scheduling/pom.xml | 4 +- .../scheduling/SchedulingTest.java | 16 ++++---- microprofile/security/pom.xml | 4 +- .../microprofile/security/BindingTest.java | 10 ++--- .../security/DisabledSecurityTest.java | 8 ++-- .../security/ExtractQueryParamsTest.java | 8 ++-- .../security/HttpAuthProviderTest.java | 6 +-- .../microprofile/security/InjectionTest.java | 6 +-- .../security/PreMatchingBindingTest.java | 10 ++--- microprofile/server/pom.xml | 4 +- .../server/AsyncResourceTest.java | 6 +-- .../server/JerseyPropertiesTest.java | 9 ++-- .../server/ProducedRouteTest.java | 10 ++--- .../microprofile/server/RedirectionTest.java | 8 ++-- microprofile/service-common/pom.xml | 4 +- .../servicecommon/TestConfigTiming.java | 6 +-- microprofile/telemetry/pom.xml | 4 +- .../telemetry/AgentDetectorTest.java | 6 +-- .../{tests => testing}/junit5/pom.xml | 11 +++-- .../microprofile/testing}/junit5/AddBean.java | 2 +- .../testing}/junit5/AddBeans.java | 8 ++-- .../testing/junit5}/AddConfig.java | 4 +- .../testing}/junit5/AddConfigs.java | 8 ++-- .../testing}/junit5/AddExtension.java | 2 +- .../testing}/junit5/AddExtensions.java | 8 ++-- .../testing}/junit5/AfterStop.java | 2 +- .../testing}/junit5/Configuration.java | 4 +- .../testing}/junit5/DisableDiscovery.java | 8 ++-- .../junit5/HelidonJunitExtension.java | 2 +- .../testing}/junit5/HelidonTest.java | 11 ++--- .../microprofile/testing}/junit5/Socket.java | 4 +- .../testing}/junit5/package-info.java | 6 +-- .../junit5/src/main/java/module-info.java | 4 +- microprofile/testing/pom.xml | 39 ++++++++++++++++++ .../{tests => testing}/testng/pom.xml | 23 +++++------ .../microprofile/testing}/testng/AddBean.java | 4 +- .../testing}/testng/AddBeans.java | 4 +- .../testing/testng}/AddConfig.java | 4 +- .../testing}/testng/AddConfigs.java | 4 +- .../testing}/testng/AddExtension.java | 4 +- .../testing}/testng/AddExtensions.java | 4 +- .../testing}/testng/Configuration.java | 6 +-- .../testing}/testng/DisableDiscovery.java | 4 +- .../testing}/testng/HelidonTest.java | 4 +- .../testng/HelidonTestNgListener.java} | 7 ++-- .../testing}/testng/package-info.java | 4 +- .../testng/src/main/java/module-info.java | 8 ++-- microprofile/tests/arquillian/pom.xml | 3 +- microprofile/tests/pom.xml | 8 ++-- microprofile/tests/server/pom.xml | 7 ++-- .../WebServerLifecycleAnnotationTest.java | 6 +-- microprofile/tests/tck/pom.xml | 10 +++-- .../tests/tck/tck-annotations/pom.xml | 5 ++- microprofile/tests/tck/tck-cdi/pom.xml | 5 ++- microprofile/tests/tck/tck-config/pom.xml | 5 ++- .../tests/tck/tck-core-profile/pom.xml | 7 ++-- .../tck-core-profile-test/pom.xml | 7 ++-- .../tests/tck/tck-fault-tolerance/pom.xml | 5 ++- microprofile/tests/tck/tck-graphql/pom.xml | 5 ++- microprofile/tests/tck/tck-health/pom.xml | 5 ++- microprofile/tests/tck/tck-inject/pom.xml | 7 ++-- .../tck/tck-inject/tck-inject-test/pom.xml | 7 ++-- microprofile/tests/tck/tck-jsonb/pom.xml | 7 ++-- .../tck/tck-jsonb/tck-jsonb-test/pom.xml | 7 ++-- microprofile/tests/tck/tck-jsonp/pom.xml | 7 ++-- .../tck/tck-jsonp/tck-jsonp-test/pom.xml | 7 ++-- microprofile/tests/tck/tck-jwt-auth/pom.xml | 5 ++- microprofile/tests/tck/tck-lra/pom.xml | 5 ++- microprofile/tests/tck/tck-messaging/pom.xml | 5 ++- microprofile/tests/tck/tck-metrics/pom.xml | 5 ++- microprofile/tests/tck/tck-openapi/pom.xml | 5 ++- .../tests/tck/tck-opentracing/pom.xml | 5 ++- .../tests/tck/tck-reactive-operators/pom.xml | 5 ++- .../tests/tck/tck-rest-client/pom.xml | 5 ++- .../{tck-restfull => tck-restful}/README.md | 0 .../artifact-install.sh | 0 .../tck/{tck-restfull => tck-restful}/pom.xml | 17 ++++---- .../tck-restful-test}/pom.xml | 9 ++-- .../restful}/tck/UrlLoaderExtension.java | 2 +- .../restful}/tck/UrlResourceProvider.java | 2 +- ...boss.arquillian.core.spi.LoadableExtension | 2 +- .../src/test/resources/arquillian.xml | 0 microprofile/tests/tck/tck-telemetry/pom.xml | 7 ++-- .../{junit5-tests => testing/junit5}/pom.xml | 11 ++--- .../tests/testing}/junit5/AbstractTest.java | 5 ++- .../tests/testing}/junit5/TestAddBean.java | 9 ++-- .../tests/testing}/junit5/TestChild1.java | 4 +- .../tests/testing}/junit5/TestChild2.java | 4 +- .../testing}/junit5/TestConfigSources.java | 5 ++- .../TestConfigurationCustomProfile.java | 7 +++- .../TestConfigurationDefaultProfile.java | 7 +++- .../junit5/TestConstructorInjection.java | 6 ++- .../testing}/junit5/TestCustomConfig.java | 9 ++-- .../testing}/junit5/TestCustomExtension.java | 5 ++- .../tests/testing}/junit5/TestDefaults.java | 4 +- .../testing}/junit5/TestNamedWebTarget.java | 14 +++++-- .../testing}/junit5/TestNoDiscovery.java | 5 ++- .../tests/testing}/junit5/TestPerMethod.java | 8 +++- .../tests/testing}/junit5/TestWebTarget.java | 6 ++- .../junit5/TestWebTargetPerMethod.java | 6 ++- .../resources/testConfigSources.properties | 2 +- .../src/test/resources/testConfigSources.yaml | 2 +- microprofile/tests/testing/pom.xml | 41 +++++++++++++++++++ .../{testng-tests => testing/testng}/pom.xml | 11 ++--- .../tests/testing}/testng/AbstractTest.java | 7 +++- .../tests/testing}/testng/TestAddBean.java | 11 +++-- .../tests/testing}/testng/TestChild1.java | 6 ++- .../tests/testing}/testng/TestChild2.java | 6 ++- .../testing}/testng/TestConfigSources.java | 7 +++- .../TestConfigurationCustomProfile.java | 7 +++- .../TestConfigurationDefaultProfile.java | 7 +++- .../testing}/testng/TestCustomConfig.java | 11 +++-- .../testing}/testng/TestCustomExtension.java | 7 +++- .../tests/testing}/testng/TestDefaults.java | 6 ++- .../testing}/testng/TestNoDiscovery.java | 8 +++- .../tests/testing}/testng/TestPerMethod.java | 19 +++++---- .../resources/testConfigSources.properties | 2 +- .../src/test/resources/testConfigSources.yaml | 2 +- .../testng}/test-suite.xml | 2 +- microprofile/websocket/pom.xml | 4 +- .../tyrus/ApplicationScopeTest.java | 5 ++- .../tyrus/ExtensionEndpointTest.java | 5 ++- .../microprofile/tyrus/WebSocketBaseTest.java | 5 ++- .../tyrus/WebSocketEndpointAppTest.java | 5 ++- .../tyrus/WebSocketExtensionEndpointTest.java | 3 +- .../tyrus/WebSocketRestEndpointTest.java | 3 +- pom.xml | 6 +-- security/providers/http-auth/pom.xml | 4 +- tests/apps/bookstore/bookstore-mp/pom.xml | 4 +- .../apps/bookstore/mp/BookResourceTest.java | 3 +- .../apps/bookstore/mp/VetoedResourceTest.java | 2 +- tests/functional/context-propagation/pom.xml | 4 +- .../functional/context/hello/HelloTest.java | 4 +- tests/functional/jax-rs-multiple-apps/pom.xml | 4 +- .../functional/multipleapps/MainTest.java | 5 +-- tests/functional/mp-compression/pom.xml | 4 +- .../mpcompression/MpCompressionTest.java | 2 +- tests/functional/multiport/pom.xml | 4 +- .../tests/functional/multiport/MainTest.java | 2 +- .../param-converter-provider/pom.xml | 4 +- .../paramconverterprovider/MainTest.java | 5 ++- tests/functional/request-scope-cdi/pom.xml | 4 +- .../requestscopecdi/SecretTest.java | 2 +- .../request-scope-injection/pom.xml | 4 +- .../context/injection/CheckInjectionTest.java | 3 +- tests/functional/request-scope/pom.xml | 4 +- .../functional/requestscope/TenantTest.java | 2 +- tests/integration/jms/pom.xml | 4 +- .../messaging/connectors/jms/AckMpTest.java | 16 ++++---- .../jms/JmsInjectedFactoryTest.java | 10 ++--- .../connectors/jms/JmsJndiMpTest.java | 10 ++--- .../messaging/connectors/jms/JmsMpTest.java | 17 ++++---- tests/integration/mp-bean-validation/pom.xml | 4 +- .../validation/TestValidationEndpoint.java | 4 +- tests/integration/mp-gh-2421/pom.xml | 4 +- tests/integration/mp-gh-2461/pom.xml | 4 +- .../tests/integration/gh2461/Gh2461Test.java | 6 +-- tests/integration/mp-gh-3246/pom.xml | 4 +- .../tests/integration/gh3246/Gh3246Test.java | 4 +- tests/integration/mp-gh-3974/pom.xml | 4 +- .../tests/integration/gh3974/Gh3974Test.java | 7 ++-- tests/integration/mp-gh-4123/pom.xml | 4 +- .../tests/integration/gh4123/Gh4123Test.java | 4 +- tests/integration/mp-gh-4654/pom.xml | 4 +- tests/integration/mp-gh-5328/pom.xml | 4 +- .../tests/integration/gh5328/Gh5328Test.java | 4 +- tests/integration/mp-graphql/pom.xml | 4 +- .../graphql/server/AbstractGraphQlCdiIT.java | 8 ++-- .../server/AllDefaultsExceptionIT.java | 2 +- .../server/BLListAndWLExceptionIT.java | 4 +- .../graphql/server/BLOfIOExceptionIT.java | 4 +- .../graphql/server/DataFetcherUtilsIT.java | 2 +- .../server/DataFetchingEnvironmentIT.java | 4 +- .../graphql/server/DateTimeIT.java | 4 +- .../graphql/server/DateTimeScalarIT.java | 2 +- .../server/DefaultCheckedExceptionIT.java | 2 +- .../graphql/server/DefaultValuesIT.java | 2 +- .../graphql/server/DescriptionIT.java | 2 +- .../server/DifferentMessageExceptionIT.java | 4 +- .../graphql/server/GraphQLEndpointIT.java | 8 ++-- .../graphql/server/IngorableIT.java | 2 +- .../graphql/server/InputTypeIT.java | 2 +- .../server/InterfaceOnlyAnnotatedIT.java | 2 +- .../server/InterfaceTypeOnlyAnnotatedIT.java | 2 +- .../microprofile/graphql/server/Level0IT.java | 2 +- .../microprofile/graphql/server/MapIT.java | 2 +- .../graphql/server/MultiLevelArraysIT.java | 2 +- .../microprofile/graphql/server/NullIT.java | 4 +- .../graphql/server/NumberFormatIT.java | 2 +- .../server/PartialResultsExceptionIT.java | 2 +- .../graphql/server/PojoNamingIT.java | 2 +- .../graphql/server/PropertyNameIT.java | 2 +- .../graphql/server/SimpleMutationsIT.java | 2 +- .../server/SimpleQueriesWithArgsIT.java | 2 +- .../microprofile/graphql/server/SourceIT.java | 2 +- .../server/WLOfCheckedExceptionIT.java | 4 +- tests/integration/oidc/pom.xml | 4 +- .../integration/oidc/CommonLoginBase.java | 4 +- .../integration/oidc/QueryBasedLoginIT.java | 2 +- .../oidc/TenantIdentificationIT.java | 6 +-- tests/integration/restclient/pom.xml | 4 +- .../integration/restclient/MainTest.java | 4 +- tests/integration/security/gh2772/pom.xml | 4 +- .../security/gh2772/OptionalTest.java | 7 ++-- .../security/security-response-mapper/pom.xml | 4 +- .../mapper/RestrictedResourceTest.java | 8 ++-- 329 files changed, 1015 insertions(+), 843 deletions(-) rename microprofile/{tests => testing}/junit5/pom.xml (85%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AddBean.java (97%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AddBeans.java (86%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests/testng => testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5}/AddConfig.java (91%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AddConfigs.java (86%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AddExtension.java (96%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AddExtensions.java (85%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/AfterStop.java (95%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/Configuration.java (95%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/DisableDiscovery.java (88%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/HelidonJunitExtension.java (99%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/HelidonTest.java (85%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/Socket.java (90%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests => testing/junit5/src/main/java/io/helidon/microprofile/testing}/junit5/package-info.java (78%) rename microprofile/{tests => testing}/junit5/src/main/java/module-info.java (90%) create mode 100644 microprofile/testing/pom.xml rename microprofile/{tests => testing}/testng/pom.xml (76%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/AddBean.java (94%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/AddBeans.java (91%) rename microprofile/{tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5 => testing/testng/src/main/java/io/helidon/microprofile/testing/testng}/AddConfig.java (91%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/AddConfigs.java (91%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/AddExtension.java (91%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/AddExtensions.java (91%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/Configuration.java (89%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/DisableDiscovery.java (94%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/HelidonTest.java (94%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTestNGListener.java => testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java} (99%) rename microprofile/{tests/testng/src/main/java/io/helidon/microprofile/tests => testing/testng/src/main/java/io/helidon/microprofile/testing}/testng/package-info.java (85%) rename microprofile/{tests => testing}/testng/src/main/java/module-info.java (79%) rename microprofile/tests/tck/{tck-restfull => tck-restful}/README.md (100%) rename microprofile/tests/tck/{tck-restfull => tck-restful}/artifact-install.sh (100%) rename microprofile/tests/tck/{tck-restfull => tck-restful}/pom.xml (79%) rename microprofile/tests/tck/{tck-restfull/tck-restfull-test => tck-restful/tck-restful-test}/pom.xml (96%) rename microprofile/tests/tck/{tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull => tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful}/tck/UrlLoaderExtension.java (96%) rename microprofile/tests/tck/{tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull => tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful}/tck/UrlResourceProvider.java (96%) rename microprofile/tests/tck/{tck-restfull/tck-restfull-test => tck-restful/tck-restful-test}/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (91%) rename microprofile/tests/tck/{tck-restfull/tck-restfull-test => tck-restful/tck-restful-test}/src/test/resources/arquillian.xml (100%) rename microprofile/tests/{junit5-tests => testing/junit5}/pom.xml (83%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/AbstractTest.java (86%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestAddBean.java (81%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestChild1.java (90%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestChild2.java (90%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestConfigSources.java (88%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestConfigurationCustomProfile.java (82%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestConfigurationDefaultProfile.java (81%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestConstructorInjection.java (85%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestCustomConfig.java (82%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestCustomExtension.java (89%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestDefaults.java (94%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestNamedWebTarget.java (82%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestNoDiscovery.java (89%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestPerMethod.java (90%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestWebTarget.java (87%) rename microprofile/tests/{junit5-tests/src/test/java/io/helidon/microprofile/tests => testing/junit5/src/test/java/io/helidon/microprofile/tests/testing}/junit5/TestWebTargetPerMethod.java (87%) rename microprofile/tests/{junit5-tests => testing/junit5}/src/test/resources/testConfigSources.properties (90%) rename microprofile/tests/{junit5-tests => testing/junit5}/src/test/resources/testConfigSources.yaml (91%) create mode 100644 microprofile/tests/testing/pom.xml rename microprofile/tests/{testng-tests => testing/testng}/pom.xml (83%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/AbstractTest.java (81%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestAddBean.java (78%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestChild1.java (86%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestChild2.java (86%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestConfigSources.java (84%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestConfigurationCustomProfile.java (82%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestConfigurationDefaultProfile.java (81%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestCustomConfig.java (80%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestCustomExtension.java (85%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestDefaults.java (92%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestNoDiscovery.java (83%) rename microprofile/tests/{testng-tests/src/test/java/io/helidon/microprofile/tests => testing/testng/src/test/java/io/helidon/microprofile/tests/testing}/testng/TestPerMethod.java (89%) rename microprofile/tests/{testng-tests => testing/testng}/src/test/resources/testConfigSources.properties (90%) rename microprofile/tests/{testng-tests => testing/testng}/src/test/resources/testConfigSources.yaml (91%) rename microprofile/tests/{testng-tests => testing/testng}/test-suite.xml (92%) diff --git a/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml b/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml index 5f718c8422f..8114be39fb6 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml +++ b/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml @@ -42,8 +42,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test @@ -69,7 +69,7 @@ jakarta.ws.rs.core.Response - io.helidon.microprofile.tests.junit5.HelidonTest + io.helidon.microprofile.testing.junit5.HelidonTest org.junit.jupiter.api.AfterAll diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache index a916b68e7d1..6c1ab13de56 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache +++ b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache @@ -14,10 +14,10 @@ import {{.}}; {{/FileServiceTest-helidon-imports}} import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.json.JsonObject; import jakarta.json.JsonString; diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache index a3616fb41ad..285b4ffd222 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache @@ -1,6 +1,6 @@ package {{package}}; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; import org.junit.jupiter.api.Test; diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache index 174ac313536..bee7f6bec8e 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache @@ -3,7 +3,7 @@ package {{package}}; import io.helidon.http.HeaderNames; import io.helidon.config.Config; import io.helidon.cors.CrossOriginConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Invocation; diff --git a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache index b3504d51414..f5e59010303 100644 --- a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache @@ -5,8 +5,8 @@ import java.net.URI; import jakarta.inject.Inject; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import {{package}}.client.api.ApiException; import {{package}}.client.api.GreetApi; diff --git a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache index 9e1159be45e..fdc8d70a1a0 100644 --- a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache @@ -5,8 +5,8 @@ import java.net.URI; import jakarta.inject.Inject; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import {{package}}.client.api.ApiException; import {{package}}.client.api.GreetApi; diff --git a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache index e989aaced20..1b9f33ff1ce 100644 --- a/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache @@ -7,8 +7,8 @@ import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import com.oracle.bmc.Region; import com.oracle.bmc.loggingingestion.Logging; diff --git a/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml b/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml index 248abecc4ab..73a0c08f69b 100644 --- a/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml +++ b/archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml @@ -213,8 +213,8 @@ ocimetrics: test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/bom/pom.xml b/bom/pom.xml index da5f32b2f71..d3cc2abf099 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -964,13 +964,13 @@ - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 ${helidon.version} - io.helidon.microprofile.tests - helidon-microprofile-tests-testng + io.helidon.microprofile.testing + helidon-microprofile-testing-testng ${helidon.version} diff --git a/docs/mp/guides/testing-junit5.adoc b/docs/mp/guides/testing-junit5.adoc index 90e69caced6..5294daf77d7 100644 --- a/docs/mp/guides/testing-junit5.adoc +++ b/docs/mp/guides/testing-junit5.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2021, 2022 Oracle and/or its affiliates. + Copyright (c) 2021, 2023 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. @@ -40,8 +40,8 @@ To start using this feature, add the following dependencies to the testing modul ---- - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test @@ -64,7 +64,7 @@ First you'll need to create a test class with an empty test method, and annotate [source,java] .Test Class ---- -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import org.junit.jupiter.api.Test; @@ -217,11 +217,11 @@ If you want just the basic test features enabled, then you only have to add a fe import jakarta.inject.Inject; import io.helidon.microprofile.config.ConfigCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; diff --git a/docs/mp/testing-ng.adoc b/docs/mp/testing-ng.adoc index 5643b71abb3..d88e3dbd74c 100644 --- a/docs/mp/testing-ng.adoc +++ b/docs/mp/testing-ng.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2022 Oracle and/or its affiliates. + Copyright (c) 2022, 2023 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. @@ -40,20 +40,20 @@ include::{rootdir}/includes/dependencies.adoc[] [source,xml] ---- - io.helidon.microprofile.tests - helidon-microprofile-tests-testng + io.helidon.microprofile.testing + helidon-microprofile-testing-testng test ---- == Usage - default -A test can be annotated with `io.helidon.microprofile.tests.testng.HelidonTest` annotation to mark it as a +A test can be annotated with `io.helidon.microprofile.testing.testng.HelidonTest` annotation to mark it as a CDI test. This annotation will start the CDI container before any test method is invoked, and stop it after the last method is invoked. This annotation also enables injection into the test class itself. == Usage -A test can be annotated with `io.helidon.microprofile.tests.testng.HelidonTest` annotation to mark it as a +A test can be annotated with `io.helidon.microprofile.testing.testng.HelidonTest` annotation to mark it as a CDI test. This annotation will start the CDI container before any test method is invoked, and stop it after the last method is invoked. This annotation also enables injection into the test class itself. @@ -97,16 +97,16 @@ In addition to this simplification, the following annotations are supported: |=== |Annotation | Usage -|`@io.helidon.microprofile.tests.testng.AddBean` +|`@io.helidon.microprofile.testing.testng.AddBean` |Used to add one or more beans to the container (if not part of a bean archive, or when discovery is disabled) -|`@io.helidon.microprofile.tests.testng.AddExtension` +|`@io.helidon.microprofile.testing.testng.AddExtension` |Used to add one or more CDI extensions to the container (if not added through service loader, or when discovery is disabled) -|`@io.helidon.microprofile.tests.testng.AddConfig` +|`@io.helidon.microprofile.testing.testng.AddConfig` |Used to add one or more configuration properties to MicroProfile config without the need of creating a `microprofile-config.properties` file -|`@io.helidon.microprofile.tests.testng.DisableDiscovery` +|`@io.helidon.microprofile.testing.testng.DisableDiscovery` |Used to disable automated discovery of beans and extensions |=== diff --git a/docs/mp/testing.adoc b/docs/mp/testing.adoc index c540f2f1049..c207e4aa268 100644 --- a/docs/mp/testing.adoc +++ b/docs/mp/testing.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2020, 2022 Oracle and/or its affiliates. + Copyright (c) 2020, 2023 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. @@ -41,14 +41,14 @@ include::{rootdir}/includes/dependencies.adoc[] [source,xml] ---- - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test ---- == Usage -A test can be annotated with `io.helidon.microprofile.tests.junit5.HelidonTest` annotation to mark it as a +A test can be annotated with `io.helidon.microprofile.testing.junit5.HelidonTest` annotation to mark it as a CDI test. This annotation will start the CDI container before any test method is invoked, and stop it after the last method is invoked. This annotation also enables injection into the test class itself. @@ -102,16 +102,16 @@ In addition to this simplification, the following annotations are supported: |=== |Annotation | Usage -|`@io.helidon.microprofile.tests.junit5.AddBean` +|`@io.helidon.microprofile.testing.junit5.AddBean` |Used to add one or more beans to the container (if not part of a bean archive, or when discovery is disabled) -|`@io.helidon.microprofile.tests.junit5.AddExtension` +|`@io.helidon.microprofile.testing.junit5.AddExtension` |Used to add one or more CDI extensions to the container (if not added through service loader, or when discovery is disabled) -|`@io.helidon.microprofile.tests.junit5.AddConfig` +|`@io.helidon.microprofile.testing.junit5.AddConfig` |Used to add one or more configuration properties to MicroProfile config without the need of creating a `microprofile-config.properties` file -|Used `@io.helidon.microprofile.tests.junit5.DisableDiscovery` +|Used `@io.helidon.microprofile.testing.junit5.DisableDiscovery` |to disable automated discovery of beans and extensions |=== diff --git a/examples/integrations/micrometer/mp/pom.xml b/examples/integrations/micrometer/mp/pom.xml index 5cb00ba4dbd..4b9424fe79a 100644 --- a/examples/integrations/micrometer/mp/pom.xml +++ b/examples/integrations/micrometer/mp/pom.xml @@ -65,8 +65,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/integrations/micrometer/mp/src/test/java/io/helidon/examples/integrations/micrometer/mp/TestEndpoint.java b/examples/integrations/micrometer/mp/src/test/java/io/helidon/examples/integrations/micrometer/mp/TestEndpoint.java index 180137d659c..284e0d88d89 100644 --- a/examples/integrations/micrometer/mp/src/test/java/io/helidon/examples/integrations/micrometer/mp/TestEndpoint.java +++ b/examples/integrations/micrometer/mp/src/test/java/io/helidon/examples/integrations/micrometer/mp/TestEndpoint.java @@ -15,7 +15,7 @@ */ package io.helidon.examples.integrations.micrometer.mp; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; diff --git a/examples/integrations/micronaut/data/pom.xml b/examples/integrations/micronaut/data/pom.xml index 3c3dca008bd..3a01739b12b 100644 --- a/examples/integrations/micronaut/data/pom.xml +++ b/examples/integrations/micronaut/data/pom.xml @@ -97,8 +97,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/integrations/micronaut/data/src/test/java/io/helidon/examples/integrations/micronaut/data/MicronautExampleTest.java b/examples/integrations/micronaut/data/src/test/java/io/helidon/examples/integrations/micronaut/data/MicronautExampleTest.java index 0578788dc0a..a20730e23e4 100644 --- a/examples/integrations/micronaut/data/src/test/java/io/helidon/examples/integrations/micronaut/data/MicronautExampleTest.java +++ b/examples/integrations/micronaut/data/src/test/java/io/helidon/examples/integrations/micronaut/data/MicronautExampleTest.java @@ -17,7 +17,7 @@ package io.helidon.examples.integrations.micronaut.data; import io.helidon.examples.integrations.micronaut.data.model.Pet; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonArray; diff --git a/examples/integrations/microstream/greetings-mp/pom.xml b/examples/integrations/microstream/greetings-mp/pom.xml index ca72b8b7368..20938e8d431 100644 --- a/examples/integrations/microstream/greetings-mp/pom.xml +++ b/examples/integrations/microstream/greetings-mp/pom.xml @@ -52,8 +52,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/integrations/microstream/greetings-mp/src/test/java/io/helidon/examples/integrations/microstream/greetings/mp/MicrostreamExampleGreetingsMpTest.java b/examples/integrations/microstream/greetings-mp/src/test/java/io/helidon/examples/integrations/microstream/greetings/mp/MicrostreamExampleGreetingsMpTest.java index 622dfabcae6..fc613a1eaa5 100644 --- a/examples/integrations/microstream/greetings-mp/src/test/java/io/helidon/examples/integrations/microstream/greetings/mp/MicrostreamExampleGreetingsMpTest.java +++ b/examples/integrations/microstream/greetings-mp/src/test/java/io/helidon/examples/integrations/microstream/greetings/mp/MicrostreamExampleGreetingsMpTest.java @@ -18,7 +18,7 @@ import java.nio.file.Path; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/examples/integrations/oci/vault-cdi/pom.xml b/examples/integrations/oci/vault-cdi/pom.xml index 43823bd348c..d6edb81908c 100644 --- a/examples/integrations/oci/vault-cdi/pom.xml +++ b/examples/integrations/oci/vault-cdi/pom.xml @@ -69,8 +69,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/jbatch/pom.xml b/examples/jbatch/pom.xml index 82e3552d17b..79a06b8cefb 100644 --- a/examples/jbatch/pom.xml +++ b/examples/jbatch/pom.xml @@ -92,8 +92,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/jbatch/src/test/java/io/helidon/examples/jbatch/TestJBatchEndpoint.java b/examples/jbatch/src/test/java/io/helidon/examples/jbatch/TestJBatchEndpoint.java index 5e5bdd608cd..dfbf82390f7 100644 --- a/examples/jbatch/src/test/java/io/helidon/examples/jbatch/TestJBatchEndpoint.java +++ b/examples/jbatch/src/test/java/io/helidon/examples/jbatch/TestJBatchEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,19 +14,22 @@ * limitations under the License. */ package io.helidon.examples.jbatch; -import io.helidon.microprofile.tests.junit5.HelidonTest; -import jakarta.json.Json; -import jakarta.json.JsonBuilderFactory; -import org.junit.jupiter.api.Test; + +import java.util.Collections; + +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonBuilderFactory; import jakarta.json.JsonObject; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.MediaType; +import org.junit.jupiter.api.Test; -import java.util.Collections; - -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @HelidonTest diff --git a/examples/metrics/filtering/mp/pom.xml b/examples/metrics/filtering/mp/pom.xml index 0f75c24fb8e..0a3000c98bf 100644 --- a/examples/metrics/filtering/mp/pom.xml +++ b/examples/metrics/filtering/mp/pom.xml @@ -55,8 +55,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/metrics/filtering/mp/src/test/java/io/helidon/examples/metrics/filtering/mp/MainTest.java b/examples/metrics/filtering/mp/src/test/java/io/helidon/examples/metrics/filtering/mp/MainTest.java index b183bb405b5..12fb0ad03b9 100644 --- a/examples/metrics/filtering/mp/src/test/java/io/helidon/examples/metrics/filtering/mp/MainTest.java +++ b/examples/metrics/filtering/mp/src/test/java/io/helidon/examples/metrics/filtering/mp/MainTest.java @@ -17,7 +17,7 @@ import java.time.Duration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; diff --git a/examples/microprofile/bean-validation/pom.xml b/examples/microprofile/bean-validation/pom.xml index 64df2b9cc92..66ef3dc247d 100644 --- a/examples/microprofile/bean-validation/pom.xml +++ b/examples/microprofile/bean-validation/pom.xml @@ -49,8 +49,8 @@ - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java b/examples/microprofile/bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java index a435cf95a59..237437f34c1 100644 --- a/examples/microprofile/bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java +++ b/examples/microprofile/bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java @@ -15,7 +15,7 @@ */ package io.helidon.tests.integration.bean.validation; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/examples/microprofile/hello-world-implicit/pom.xml b/examples/microprofile/hello-world-implicit/pom.xml index 0d53fd7d9ea..38dd8d492db 100644 --- a/examples/microprofile/hello-world-implicit/pom.xml +++ b/examples/microprofile/hello-world-implicit/pom.xml @@ -47,8 +47,8 @@ true - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/hello-world-implicit/src/test/java/io/helidon/microprofile/example/helloworld/implicit/ImplicitHelloWorldTest.java b/examples/microprofile/hello-world-implicit/src/test/java/io/helidon/microprofile/example/helloworld/implicit/ImplicitHelloWorldTest.java index ba76a98cd17..b47a5eb3c9a 100644 --- a/examples/microprofile/hello-world-implicit/src/test/java/io/helidon/microprofile/example/helloworld/implicit/ImplicitHelloWorldTest.java +++ b/examples/microprofile/hello-world-implicit/src/test/java/io/helidon/microprofile/example/helloworld/implicit/ImplicitHelloWorldTest.java @@ -16,7 +16,7 @@ package io.helidon.microprofile.example.helloworld.implicit; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonObject; diff --git a/examples/microprofile/http-status-count-mp/pom.xml b/examples/microprofile/http-status-count-mp/pom.xml index 6edd55fe149..e26e4ac3909 100644 --- a/examples/microprofile/http-status-count-mp/pom.xml +++ b/examples/microprofile/http-status-count-mp/pom.xml @@ -79,8 +79,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/MainTest.java b/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/MainTest.java index bfdeb06c76b..c50d7d1c925 100644 --- a/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/MainTest.java +++ b/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/MainTest.java @@ -15,7 +15,7 @@ */ package io.helidon.examples.mp.httpstatuscount; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; diff --git a/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/StatusTest.java b/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/StatusTest.java index 4b9c723f2ba..220d87d3906 100644 --- a/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/StatusTest.java +++ b/examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/StatusTest.java @@ -16,8 +16,8 @@ package io.helidon.examples.mp.httpstatuscount; import io.helidon.http.Status; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/examples/microprofile/multipart/pom.xml b/examples/microprofile/multipart/pom.xml index d355516bfe6..ae05fba7021 100644 --- a/examples/microprofile/multipart/pom.xml +++ b/examples/microprofile/multipart/pom.xml @@ -59,8 +59,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/multipart/src/test/java/io/helidon/examples/microprofile/multipart/FileServiceTest.java b/examples/microprofile/multipart/src/test/java/io/helidon/examples/microprofile/multipart/FileServiceTest.java index afbf3687435..1de34916997 100644 --- a/examples/microprofile/multipart/src/test/java/io/helidon/examples/microprofile/multipart/FileServiceTest.java +++ b/examples/microprofile/multipart/src/test/java/io/helidon/examples/microprofile/multipart/FileServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -25,10 +25,10 @@ import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.json.JsonObject; import jakarta.json.JsonString; diff --git a/examples/microprofile/multiport/pom.xml b/examples/microprofile/multiport/pom.xml index e9cfb8f0cbd..a8b7602b96d 100644 --- a/examples/microprofile/multiport/pom.xml +++ b/examples/microprofile/multiport/pom.xml @@ -71,8 +71,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/multiport/src/test/java/io/helidon/examples/microprofile/multiport/MainTest.java b/examples/microprofile/multiport/src/test/java/io/helidon/examples/microprofile/multiport/MainTest.java index 6e15145e295..594ca7d6c54 100644 --- a/examples/microprofile/multiport/src/test/java/io/helidon/examples/microprofile/multiport/MainTest.java +++ b/examples/microprofile/multiport/src/test/java/io/helidon/examples/microprofile/multiport/MainTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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,8 +20,8 @@ import java.util.stream.Stream; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Client; diff --git a/examples/microprofile/telemetry/secondary/pom.xml b/examples/microprofile/telemetry/secondary/pom.xml index 240cb07cbb6..6657da9808f 100644 --- a/examples/microprofile/telemetry/secondary/pom.xml +++ b/examples/microprofile/telemetry/secondary/pom.xml @@ -61,8 +61,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/websocket/pom.xml b/examples/microprofile/websocket/pom.xml index 22a72c39045..7df3b8a2d80 100644 --- a/examples/microprofile/websocket/pom.xml +++ b/examples/microprofile/websocket/pom.xml @@ -51,8 +51,8 @@ true - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/microprofile/websocket/src/test/java/io/helidon/microprofile/example/websocket/MessageBoardTest.java b/examples/microprofile/websocket/src/test/java/io/helidon/microprofile/example/websocket/MessageBoardTest.java index 7c29fc4d89c..afb8d3f8fd3 100644 --- a/examples/microprofile/websocket/src/test/java/io/helidon/microprofile/example/websocket/MessageBoardTest.java +++ b/examples/microprofile/websocket/src/test/java/io/helidon/microprofile/example/websocket/MessageBoardTest.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.websocket.ClientEndpointConfig; diff --git a/examples/quickstarts/helidon-quickstart-mp/build.gradle b/examples/quickstarts/helidon-quickstart-mp/build.gradle index 08c0901709d..7e114013c3a 100644 --- a/examples/quickstarts/helidon-quickstart-mp/build.gradle +++ b/examples/quickstarts/helidon-quickstart-mp/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022 Oracle and/or its affiliates. + * Copyright (c) 2018, 2023 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. @@ -51,7 +51,7 @@ dependencies { runtimeOnly 'org.jboss:jandex' runtimeOnly 'jakarta.activation:jakarta.activation-api' - testImplementation 'io.helidon.microprofile.tests:helidon-microprofile-tests-junit5' + testImplementation 'io.helidon.microprofile.testing:helidon-microprofile-testing-junit5' testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/examples/quickstarts/helidon-quickstart-mp/pom.xml b/examples/quickstarts/helidon-quickstart-mp/pom.xml index f69a0c45a5f..7138557694a 100644 --- a/examples/quickstarts/helidon-quickstart-mp/pom.xml +++ b/examples/quickstarts/helidon-quickstart-mp/pom.xml @@ -63,8 +63,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/quickstarts/helidon-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java b/examples/quickstarts/helidon-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java index 19d6292e621..3a63a072d7c 100644 --- a/examples/quickstarts/helidon-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java +++ b/examples/quickstarts/helidon-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java @@ -16,7 +16,7 @@ package io.helidon.examples.quickstart.mp; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml index 0659a5b4f38..5f4dba66aa2 100644 --- a/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml +++ b/examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml @@ -89,8 +89,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java b/examples/quickstarts/helidon-standalone-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java index 19d6292e621..3a63a072d7c 100644 --- a/examples/quickstarts/helidon-standalone-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java +++ b/examples/quickstarts/helidon-standalone-quickstart-mp/src/test/java/io/helidon/examples/quickstart/mp/MainTest.java @@ -16,7 +16,7 @@ package io.helidon.examples.quickstart.mp; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; diff --git a/examples/todo-app/backend/pom.xml b/examples/todo-app/backend/pom.xml index 25d8bffc5c5..0bf25bb8967 100644 --- a/examples/todo-app/backend/pom.xml +++ b/examples/todo-app/backend/pom.xml @@ -105,8 +105,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/examples/todo-app/backend/src/test/java/io/helidon/examples/todos/backend/BackendTests.java b/examples/todo-app/backend/src/test/java/io/helidon/examples/todos/backend/BackendTests.java index fbec45b7e8f..be195cac487 100644 --- a/examples/todo-app/backend/src/test/java/io/helidon/examples/todos/backend/BackendTests.java +++ b/examples/todo-app/backend/src/test/java/io/helidon/examples/todos/backend/BackendTests.java @@ -23,8 +23,8 @@ import io.helidon.config.mp.MpConfigSources; import io.helidon.config.yaml.mp.YamlMpConfigSource; import io.helidon.http.HeaderNames; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; diff --git a/integrations/micrometer/cdi/pom.xml b/integrations/micrometer/cdi/pom.xml index 305098fe648..82d8dd111a7 100644 --- a/integrations/micrometer/cdi/pom.xml +++ b/integrations/micrometer/cdi/pom.xml @@ -99,8 +99,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/HelloWorldTest.java b/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/HelloWorldTest.java index e829cf0aeb0..20090adbea3 100644 --- a/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/HelloWorldTest.java +++ b/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/HelloWorldTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022 Oracle and/or its affiliates. + * Copyright (c) 2018, 2023 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. @@ -19,8 +19,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.IntStream; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; @@ -32,10 +32,8 @@ import org.junit.jupiter.api.Test; import static io.helidon.common.testing.junit5.MatcherWithRetry.assertThatWithRetry; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; /** diff --git a/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/MeteredBeanTest.java b/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/MeteredBeanTest.java index 1c510a5c540..8fb1f82248a 100644 --- a/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/MeteredBeanTest.java +++ b/integrations/micrometer/cdi/src/test/java/io/helidon/integrations/micrometer/cdi/MeteredBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -17,15 +17,14 @@ import java.util.stream.IntStream; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.micrometer.core.instrument.MeterRegistry; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import static io.helidon.common.testing.junit5.MatcherWithRetry.assertThatWithRetry; - import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/integrations/micronaut/cdi/pom.xml b/integrations/micronaut/cdi/pom.xml index 020ed32662a..a2586f5a3f9 100644 --- a/integrations/micronaut/cdi/pom.xml +++ b/integrations/micronaut/cdi/pom.xml @@ -70,8 +70,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtensionTest.java b/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtensionTest.java index 7950930a127..bdd63e97672 100644 --- a/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtensionTest.java +++ b/integrations/micronaut/cdi/src/test/java/io/helidon/integrations/micronaut/cdi/MicronautCdiExtensionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -16,7 +16,7 @@ package io.helidon.integrations.micronaut.cdi; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integrations/micronaut/data/pom.xml b/integrations/micronaut/data/pom.xml index d87221b1466..bfda0608d94 100644 --- a/integrations/micronaut/data/pom.xml +++ b/integrations/micronaut/data/pom.xml @@ -85,8 +85,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java index 918330ed44f..cd1ab934495 100644 --- a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java +++ b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -19,22 +19,21 @@ import java.sql.Connection; import java.util.Optional; +import javax.validation.ConstraintViolationException; +import javax.validation.constraints.Pattern; + import io.helidon.integrations.micronaut.cdi.data.app.DbOwnerRepository; import io.helidon.integrations.micronaut.cdi.data.app.DbPetRepository; import io.helidon.integrations.micronaut.cdi.data.app.Owner; import io.helidon.integrations.micronaut.cdi.data.app.Pet; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; - -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.Pattern; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.transaction.Transactional; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static io.helidon.common.testing.junit5.OptionalMatcher.optionalPresent; diff --git a/integrations/microstream/cdi/pom.xml b/integrations/microstream/cdi/pom.xml index 3ceea0c9c98..33364696817 100644 --- a/integrations/microstream/cdi/pom.xml +++ b/integrations/microstream/cdi/pom.xml @@ -59,8 +59,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/CacheManagerExtentionTest.java b/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/CacheManagerExtentionTest.java index 2add43d9bdd..e4746aa726f 100644 --- a/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/CacheManagerExtentionTest.java +++ b/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/CacheManagerExtentionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -22,8 +22,8 @@ import javax.cache.Cache; import io.helidon.integrations.microstream.cache.ConfigException; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/MicrostreamExtensionTest.java b/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/MicrostreamExtensionTest.java index 0d4defbebc8..997d9b18e4a 100644 --- a/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/MicrostreamExtensionTest.java +++ b/integrations/microstream/cdi/src/test/java/io/helidon/integrations/microstream/cdi/MicrostreamExtensionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -18,7 +18,7 @@ import java.nio.file.Path; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import one.microstream.storage.embedded.types.EmbeddedStorageManager; diff --git a/integrations/oci/metrics/cdi/pom.xml b/integrations/oci/metrics/cdi/pom.xml index 332f13c7b70..f59e0395c7f 100644 --- a/integrations/oci/metrics/cdi/pom.xml +++ b/integrations/oci/metrics/cdi/pom.xml @@ -48,8 +48,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/oci/metrics/cdi/src/test/java/io/helidon/integrations/oci/metrics/cdi/OciMetricsCdiExtensionTest.java b/integrations/oci/metrics/cdi/src/test/java/io/helidon/integrations/oci/metrics/cdi/OciMetricsCdiExtensionTest.java index af3abb26d26..b3516a62484 100644 --- a/integrations/oci/metrics/cdi/src/test/java/io/helidon/integrations/oci/metrics/cdi/OciMetricsCdiExtensionTest.java +++ b/integrations/oci/metrics/cdi/src/test/java/io/helidon/integrations/oci/metrics/cdi/OciMetricsCdiExtensionTest.java @@ -27,11 +27,11 @@ import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import com.oracle.bmc.Region; import com.oracle.bmc.monitoring.Monitoring; @@ -65,7 +65,6 @@ import com.oracle.bmc.monitoring.responses.RetrieveDimensionStatesResponse; import com.oracle.bmc.monitoring.responses.SummarizeMetricsDataResponse; import com.oracle.bmc.monitoring.responses.UpdateAlarmResponse; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/integrations/oci/sdk/cdi/pom.xml b/integrations/oci/sdk/cdi/pom.xml index 7ab71fa16db..1765d3c667b 100644 --- a/integrations/oci/sdk/cdi/pom.xml +++ b/integrations/oci/sdk/cdi/pom.xml @@ -149,8 +149,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java b/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java index 3b93ed8bd2b..d3d3d6074ba 100644 --- a/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java +++ b/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java @@ -19,29 +19,17 @@ import java.io.IOException; import java.net.InetAddress; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Instance; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import io.helidon.microprofile.config.ConfigCdiExtension; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import com.oracle.bmc.ConfigFileReader; -// Arbitrary -// -// If the tests work for this, they will work for all. (Feel free -// to substitute other OCI service imports.) import com.oracle.bmc.ailanguage.AIServiceLanguage; import com.oracle.bmc.ailanguage.AIServiceLanguageAsync; import com.oracle.bmc.ailanguage.AIServiceLanguageAsyncClient; import com.oracle.bmc.ailanguage.AIServiceLanguageClient; -// End Arbitrary -// -// Special -// -// Streaming is a strange case where they didn't really do builders -// the same way as for every other service in the portfolio for no -// particular reason (some builders are top-level classes, not nested -// classes). We test this single outlier explicitly here. import com.oracle.bmc.streaming.Stream; import com.oracle.bmc.streaming.StreamAdmin; import com.oracle.bmc.streaming.StreamAdminClient; @@ -50,17 +38,14 @@ import com.oracle.bmc.streaming.StreamAsyncClientBuilder; import com.oracle.bmc.streaming.StreamClient; import com.oracle.bmc.streaming.StreamClientBuilder; -// End Special -import io.helidon.microprofile.config.ConfigCdiExtension; - -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/integrations/oci/tls-certificates/pom.xml b/integrations/oci/tls-certificates/pom.xml index 5c6652e9bae..df407086ce0 100644 --- a/integrations/oci/tls-certificates/pom.xml +++ b/integrations/oci/tls-certificates/pom.xml @@ -131,8 +131,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/config/pom.xml b/microprofile/config/pom.xml index 697a2692675..ac030952e53 100644 --- a/microprofile/config/pom.xml +++ b/microprofile/config/pom.xml @@ -95,8 +95,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigConvertTest.java b/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigConvertTest.java index 99c6ff41ddd..f9cdad15fd0 100644 --- a/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigConvertTest.java +++ b/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigConvertTest.java @@ -16,8 +16,9 @@ package io.helidon.microprofile.config; import io.helidon.config.mp.MpConfig; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.Test; diff --git a/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigInjectionTest.java b/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigInjectionTest.java index 9c0f5175cc0..bdfbb5e703b 100644 --- a/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigInjectionTest.java +++ b/microprofile/config/src/test/java/io/helidon/microprofile/config/MpConfigInjectionTest.java @@ -24,9 +24,9 @@ import io.helidon.microprofile.config.Converters.Of; import io.helidon.microprofile.config.Converters.Parse; import io.helidon.microprofile.config.Converters.ValueOf; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; diff --git a/microprofile/config/src/test/java/io/helidon/microprofile/config/MutableMpTest.java b/microprofile/config/src/test/java/io/helidon/microprofile/config/MutableMpTest.java index ac07ed40c56..e8a96768e2b 100644 --- a/microprofile/config/src/test/java/io/helidon/microprofile/config/MutableMpTest.java +++ b/microprofile/config/src/test/java/io/helidon/microprofile/config/MutableMpTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -21,9 +21,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.se.SeContainer; diff --git a/microprofile/cors/pom.xml b/microprofile/cors/pom.xml index 47a5fd4da12..bc26b22e957 100644 --- a/microprofile/cors/pom.xml +++ b/microprofile/cors/pom.xml @@ -86,8 +86,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/AdapterTest.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/AdapterTest.java index e1893b95db2..1a385fb97ca 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/AdapterTest.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/AdapterTest.java @@ -21,7 +21,7 @@ import java.util.Set; import io.helidon.http.Status; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.RequestScoped; diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/BaseCrossOriginTest.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/BaseCrossOriginTest.java index da0914401ae..f5c8a48bbfa 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/BaseCrossOriginTest.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/BaseCrossOriginTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -15,7 +15,7 @@ */ package io.helidon.microprofile.cors; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CorsDisabledTest.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CorsDisabledTest.java index 0fc36372080..78b8055325c 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CorsDisabledTest.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CorsDisabledTest.java @@ -17,9 +17,9 @@ package io.helidon.microprofile.cors; import io.helidon.http.HeaderNames; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Entity; diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CrossOriginTest.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CrossOriginTest.java index 5b48e5f484f..0bd50e3a838 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CrossOriginTest.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/CrossOriginTest.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.cors; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/ErrorResponseTest.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/ErrorResponseTest.java index b2e7f96223d..d4cf5a2af07 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/ErrorResponseTest.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/ErrorResponseTest.java @@ -17,9 +17,9 @@ package io.helidon.microprofile.cors; import io.helidon.http.HeaderNames; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/TestWithAdjustedCorsType.java b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/TestWithAdjustedCorsType.java index 645051a001c..3c4074bb5a5 100644 --- a/microprofile/cors/src/test/java/io/helidon/microprofile/cors/TestWithAdjustedCorsType.java +++ b/microprofile/cors/src/test/java/io/helidon/microprofile/cors/TestWithAdjustedCorsType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -18,8 +18,8 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Target; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; diff --git a/microprofile/fault-tolerance/pom.xml b/microprofile/fault-tolerance/pom.xml index c6c8bf21be5..ea2d6a55125 100644 --- a/microprofile/fault-tolerance/pom.xml +++ b/microprofile/fault-tolerance/pom.xml @@ -119,8 +119,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousTest.java index 2a2c194abfc..c64f082ed8a 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.Future; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadTest.java index 27930cd85f3..7148074061e 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.BulkheadException; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerTest.java index 2434176504e..15ee808b6c0 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.BulkheadException; @@ -31,8 +31,8 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigClassTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigClassTest.java index 416d16a6b35..9bfe34055fb 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigClassTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigClassTest.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.faulttolerance; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigGlobalTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigGlobalTest.java index 93c21833e2c..70fc678d4d5 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigGlobalTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigGlobalTest.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.faulttolerance; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigMethodTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigMethodTest.java index 175217ce22d..96e313b3663 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigMethodTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/ConfigMethodTest.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.faulttolerance; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FallbackTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FallbackTest.java index f1b0feb177f..896a6ce1894 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FallbackTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FallbackTest.java @@ -16,7 +16,7 @@ package io.helidon.microprofile.faulttolerance; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java index 0b44e5fb245..e95ff6ce1a2 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java @@ -28,7 +28,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.literal.NamedLiteral; import jakarta.enterprise.inject.spi.CDI; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java index c7c85532566..731a016c3b5 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java @@ -21,7 +21,8 @@ import java.util.concurrent.CompletionStage; import java.util.stream.Stream; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java index 37edd550ebe..43594dbd15a 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; diff --git a/microprofile/graphql/server/pom.xml b/microprofile/graphql/server/pom.xml index e2a1848151e..9439c906689 100644 --- a/microprofile/graphql/server/pom.xml +++ b/microprofile/graphql/server/pom.xml @@ -76,8 +76,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/health/pom.xml b/microprofile/health/pom.xml index db783071b93..c8ae82d5a8f 100644 --- a/microprofile/health/pom.xml +++ b/microprofile/health/pom.xml @@ -76,8 +76,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/health/src/test/java/io/helidon/microprofile/health/HealthMpServiceIT.java b/microprofile/health/src/test/java/io/helidon/microprofile/health/HealthMpServiceIT.java index b6886fdb249..97f79ebbad6 100644 --- a/microprofile/health/src/test/java/io/helidon/microprofile/health/HealthMpServiceIT.java +++ b/microprofile/health/src/test/java/io/helidon/microprofile/health/HealthMpServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 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,8 +20,8 @@ import java.util.Arrays; import java.util.List; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/microprofile/jwt-auth/pom.xml b/microprofile/jwt-auth/pom.xml index 57ae169c937..8cafcfa0284 100644 --- a/microprofile/jwt-auth/pom.xml +++ b/microprofile/jwt-auth/pom.xml @@ -93,8 +93,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/jwt-auth/src/test/java/io/helidon/microprofile/jwt/auth/JwtAuthTest.java b/microprofile/jwt-auth/src/test/java/io/helidon/microprofile/jwt/auth/JwtAuthTest.java index 5fa566e5b6e..0dacd829cbb 100644 --- a/microprofile/jwt-auth/src/test/java/io/helidon/microprofile/jwt/auth/JwtAuthTest.java +++ b/microprofile/jwt-auth/src/test/java/io/helidon/microprofile/jwt/auth/JwtAuthTest.java @@ -21,8 +21,8 @@ import java.util.Set; import io.helidon.config.Config; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.EndpointConfig; import io.helidon.security.OutboundSecurityResponse; import io.helidon.security.Principal; diff --git a/microprofile/lra/jax-rs/pom.xml b/microprofile/lra/jax-rs/pom.xml index 5b278c013ee..76cc9f69a37 100644 --- a/microprofile/lra/jax-rs/pom.xml +++ b/microprofile/lra/jax-rs/pom.xml @@ -78,8 +78,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/CoordinatorHeaderPropagationTest.java b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/CoordinatorHeaderPropagationTest.java index 2f2e54ad99f..4fb552274d1 100644 --- a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/CoordinatorHeaderPropagationTest.java +++ b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/CoordinatorHeaderPropagationTest.java @@ -41,11 +41,11 @@ import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.RoutingPath; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.webclient.http1.Http1Client; import io.helidon.webclient.http1.Http1ClientResponse; import io.helidon.webserver.http.HttpService; diff --git a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/LoadBalancedCoordinatorTest.java b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/LoadBalancedCoordinatorTest.java index 3b461f67b4f..a9a2e6d37ff 100644 --- a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/LoadBalancedCoordinatorTest.java +++ b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/LoadBalancedCoordinatorTest.java @@ -48,14 +48,14 @@ import io.helidon.microprofile.lra.resources.Work; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; - +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.webclient.http1.Http1Client; import io.helidon.webclient.http1.Http1ClientResponse; + import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import jakarta.ws.rs.NotFoundException; diff --git a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/ParticipantTest.java b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/ParticipantTest.java index 9eaf4349332..d823d7db837 100644 --- a/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/ParticipantTest.java +++ b/microprofile/lra/jax-rs/src/test/java/io/helidon/microprofile/lra/ParticipantTest.java @@ -32,11 +32,11 @@ import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.RoutingPath; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.webserver.http.HttpService; import jakarta.annotation.Priority; diff --git a/microprofile/messaging/core/pom.xml b/microprofile/messaging/core/pom.xml index 19c06b9ba7f..290a38bd490 100644 --- a/microprofile/messaging/core/pom.xml +++ b/microprofile/messaging/core/pom.xml @@ -79,8 +79,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/EmitterTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/EmitterTest.java index af3f21e29db..ad20246a520 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/EmitterTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/EmitterTest.java @@ -24,10 +24,11 @@ import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -35,11 +36,9 @@ import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider; import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import static org.hamcrest.CoreMatchers.is; - -import jakarta.inject.Inject; @HelidonTest @DisableDiscovery diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/FlowSupportTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/FlowSupportTest.java index 527c513fd42..e82d2b503bc 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/FlowSupportTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/FlowSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -22,12 +22,13 @@ import io.helidon.common.reactive.Multi; import io.helidon.messaging.connectors.mock.MockConnector; import io.helidon.messaging.connectors.mock.TestConnector; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; @@ -40,8 +41,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import jakarta.inject.Inject; - @HelidonTest @DisableDiscovery @AddBean(MockConnector.class) diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MockConnectorTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MockConnectorTest.java index 0b93f519624..83ece48a143 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MockConnectorTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MockConnectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -22,12 +22,13 @@ import io.helidon.common.reactive.Multi; import io.helidon.messaging.connectors.mock.MockConnector; import io.helidon.messaging.connectors.mock.TestConnector; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Outgoing; @@ -40,8 +41,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import jakarta.inject.Inject; - @HelidonTest @DisableDiscovery @AddBean(MockConnector.class) diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MultiSupportTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MultiSupportTest.java index ebecfa771c8..769f51e13d0 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MultiSupportTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/MultiSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -21,12 +21,13 @@ import io.helidon.common.reactive.Multi; import io.helidon.messaging.connectors.mock.MockConnector; import io.helidon.messaging.connectors.mock.TestConnector; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; @@ -39,8 +40,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import jakarta.inject.Inject; - @HelidonTest @DisableDiscovery @AddBean(MockConnector.class) diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/UncaughtExceptionTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/UncaughtExceptionTest.java index c8db389a343..12183f83462 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/UncaughtExceptionTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/UncaughtExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -24,7 +24,7 @@ import java.util.logging.Logger; import io.helidon.common.reactive.Single; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/Processor2ConnectorTest.java b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/Processor2ConnectorTest.java index fa916c0323c..1a5088ab782 100644 --- a/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/Processor2ConnectorTest.java +++ b/microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/Processor2ConnectorTest.java @@ -27,16 +27,15 @@ import java.util.logging.Level; import java.util.stream.Collectors; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Any; -import jakarta.inject.Inject; - import io.helidon.common.reactive.BufferedEmittingPublisher; import io.helidon.common.reactive.Multi; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/microprofile/messaging/health/pom.xml b/microprofile/messaging/health/pom.xml index 0b6b2646f69..00bc00135ca 100644 --- a/microprofile/messaging/health/pom.xml +++ b/microprofile/messaging/health/pom.xml @@ -56,8 +56,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java index 9f0218c7841..352786e6fbc 100644 --- a/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java +++ b/microprofile/messaging/health/src/test/java/io/helidon/microprofile/messaging/health/MessagingHealthTest.java @@ -24,12 +24,12 @@ import io.helidon.microprofile.messaging.MessagingCdiExtension; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.AddExtensions; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AddExtensions; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.se.SeContainer; import jakarta.enterprise.inject.spi.CDI; diff --git a/microprofile/messaging/metrics/pom.xml b/microprofile/messaging/metrics/pom.xml index 006b0ac0966..23e9fc4e0a0 100644 --- a/microprofile/messaging/metrics/pom.xml +++ b/microprofile/messaging/metrics/pom.xml @@ -56,8 +56,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/metrics/pom.xml b/microprofile/metrics/pom.xml index e3967ad82e3..bb7bbe9ac4e 100644 --- a/microprofile/metrics/pom.xml +++ b/microprofile/metrics/pom.xml @@ -94,8 +94,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/CountedConstructorTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/CountedConstructorTest.java index d93e478ea30..8b63eab816d 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/CountedConstructorTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/CountedConstructorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -16,10 +16,10 @@ package io.helidon.microprofile.metrics; import java.util.Map; -import java.util.stream.IntStream; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; import org.junit.jupiter.api.Test; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseTest.java index 11896175e57..29caee018ab 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseTest.java @@ -21,8 +21,8 @@ import java.util.concurrent.Future; import java.util.stream.LongStream; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.webserver.http.ServerResponse; import jakarta.inject.Inject; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseWithRestRequestTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseWithRestRequestTest.java index 30046fd7005..265591a053d 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseWithRestRequestTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldAsyncResponseWithRestRequestTest.java @@ -24,8 +24,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonNumber; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldRestEndpointSimpleTimerDisabledTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldRestEndpointSimpleTimerDisabledTest.java index 1b20d94f59a..316960b14f6 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldRestEndpointSimpleTimerDisabledTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldRestEndpointSimpleTimerDisabledTest.java @@ -16,18 +16,17 @@ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.eclipse.microprofile.metrics.annotation.RegistryScope; import org.eclipse.microprofile.metrics.annotation.RegistryType; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; /** * Makes sure that no synthetic Timer metrics are created for JAX-RS endpoints when diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldTest.java index 1ae257af606..6a85ebce2d5 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/HelloWorldTest.java @@ -24,8 +24,8 @@ import java.util.regex.Pattern; import java.util.stream.IntStream; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricProducerMethodBeanTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricProducerMethodBeanTest.java index cefd4ba62fc..c403ffd019b 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricProducerMethodBeanTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricProducerMethodBeanTest.java @@ -15,9 +15,8 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; -import io.micrometer.core.instrument.Meter; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Gauge; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsBaseTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsBaseTest.java index f1d4c3b7a9e..2795050d9fb 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsBaseTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsBaseTest.java @@ -16,17 +16,13 @@ package io.helidon.microprofile.metrics; -import io.helidon.metrics.api.Metrics; -import io.helidon.metrics.api.MetricsFactory; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Metric; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; /** * Class MetricsBaseTest. diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsMpServiceTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsMpServiceTest.java index 8f44ce1ccf4..7a744e8729a 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsMpServiceTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsMpServiceTest.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MpFeatureTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MpFeatureTest.java index 2fddf8a723b..1ff09b28801 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MpFeatureTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MpFeatureTest.java @@ -18,7 +18,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/ReusabilityInterceptorTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/ReusabilityInterceptorTest.java index 6f9659d2338..b09efb8e476 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/ReusabilityInterceptorTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/ReusabilityInterceptorTest.java @@ -15,7 +15,7 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestBasicPerformanceIndicators.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestBasicPerformanceIndicators.java index 5d7d7d51920..06ef1cc457e 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestBasicPerformanceIndicators.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestBasicPerformanceIndicators.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.metrics; import io.helidon.http.Status; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonObject; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestConfigProcessing.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestConfigProcessing.java index b845ddad47f..c910da8390d 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestConfigProcessing.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestConfigProcessing.java @@ -16,7 +16,7 @@ package io.helidon.microprofile.metrics; import io.helidon.config.Config; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Test; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestDisabledMetrics.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestDisabledMetrics.java index f2df23834a6..35100d90d95 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestDisabledMetrics.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestDisabledMetrics.java @@ -17,19 +17,15 @@ import java.time.Duration; -import io.helidon.inject.api.Helidon; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; -import io.micrometer.core.instrument.noop.NoopMeter; import org.eclipse.microprofile.metrics.Metric; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; @HelidonTest @AddConfig(key = "metrics.enabled", value = "false") diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestMetricsOnOwnSocket.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestMetricsOnOwnSocket.java index 820e6cc77c6..6eceb6b83a3 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestMetricsOnOwnSocket.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestMetricsOnOwnSocket.java @@ -17,8 +17,8 @@ import io.helidon.http.Status; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonNumber; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestObservers.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestObservers.java index b0eb8a036f0..33571b6eefe 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestObservers.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestObservers.java @@ -15,8 +15,8 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.BeanManager; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestRemovedInterceptorMetric.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestRemovedInterceptorMetric.java index efb62597b45..dd385191e0d 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestRemovedInterceptorMetric.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestRemovedInterceptorMetric.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -15,7 +15,7 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestStereotypes.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestStereotypes.java index cc23bf5a69e..5ea84157ab5 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestStereotypes.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestStereotypes.java @@ -15,7 +15,7 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; @@ -23,7 +23,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Timer; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestVetoedResource.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestVetoedResource.java index 68b449c53a8..94a6027f2aa 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestVetoedResource.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/TestVetoedResource.java @@ -15,9 +15,12 @@ */ package io.helidon.microprofile.metrics; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import java.lang.reflect.Method; + +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import org.eclipse.microprofile.metrics.MetricID; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -25,8 +28,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import java.lang.reflect.Method; - @HelidonTest @Disabled // Need to revisit clearing out the repo of REST.request metrics between tests @AddExtension(VetoCdiExtension.class) diff --git a/microprofile/openapi/pom.xml b/microprofile/openapi/pom.xml index e2001045c23..b0a10db0c9b 100644 --- a/microprofile/openapi/pom.xml +++ b/microprofile/openapi/pom.xml @@ -127,8 +127,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java index 86345802f00..274ff47fef5 100644 --- a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java +++ b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java @@ -18,8 +18,8 @@ import java.util.Map; import io.helidon.http.Status; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.openapi.OpenApiFeature; import jakarta.inject.Inject; diff --git a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestFilterAndModelReader.java b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestFilterAndModelReader.java index 67176974608..c1e228c5cc5 100644 --- a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestFilterAndModelReader.java +++ b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestFilterAndModelReader.java @@ -16,8 +16,8 @@ package io.helidon.microprofile.openapi; import io.helidon.microprofile.openapi.test.MyModelReader; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonException; diff --git a/microprofile/pom.xml b/microprofile/pom.xml index f1eefb0c698..da642b53272 100644 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@ -58,5 +58,6 @@ bean-validation service-common telemetry + testing diff --git a/microprofile/scheduling/pom.xml b/microprofile/scheduling/pom.xml index 87797a8d579..7b9c824b75e 100644 --- a/microprofile/scheduling/pom.xml +++ b/microprofile/scheduling/pom.xml @@ -75,8 +75,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/SchedulingTest.java b/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/SchedulingTest.java index d688853c41c..16673f81c1f 100644 --- a/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/SchedulingTest.java +++ b/microprofile/scheduling/src/test/java/io/helidon/microprofile/scheduling/SchedulingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -23,13 +23,13 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.AddExtensions; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AddExtensions; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.scheduling.CronInvocation; import io.helidon.scheduling.FixedRateInvocation; diff --git a/microprofile/security/pom.xml b/microprofile/security/pom.xml index 4fbeed04ebc..b343a057f00 100644 --- a/microprofile/security/pom.xml +++ b/microprofile/security/pom.xml @@ -85,8 +85,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/BindingTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/BindingTest.java index f6713b55f77..43122ba630f 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/BindingTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/BindingTest.java @@ -18,11 +18,11 @@ import java.lang.reflect.Proxy; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.SecurityContext; import jakarta.inject.Inject; diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/DisabledSecurityTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/DisabledSecurityTest.java index e34b6449bab..a64959cda81 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/DisabledSecurityTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/DisabledSecurityTest.java @@ -16,10 +16,10 @@ package io.helidon.microprofile.security; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.Principal; import io.helidon.security.SecurityContext; import io.helidon.security.Subject; diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/ExtractQueryParamsTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/ExtractQueryParamsTest.java index f9bc9cea209..40514319da0 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/ExtractQueryParamsTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/ExtractQueryParamsTest.java @@ -16,10 +16,10 @@ package io.helidon.microprofile.security; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/HttpAuthProviderTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/HttpAuthProviderTest.java index e2a326cfce6..defc1ab6d1d 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/HttpAuthProviderTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/HttpAuthProviderTest.java @@ -18,9 +18,9 @@ import java.util.Set; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.providers.httpauth.HttpBasicAuthProvider; import io.helidon.security.providers.httpauth.HttpDigestAuthProvider; diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/InjectionTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/InjectionTest.java index a18bff7f02c..ad01929533a 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/InjectionTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/InjectionTest.java @@ -15,9 +15,9 @@ */ package io.helidon.microprofile.security; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.Security; import jakarta.inject.Inject; diff --git a/microprofile/security/src/test/java/io/helidon/microprofile/security/PreMatchingBindingTest.java b/microprofile/security/src/test/java/io/helidon/microprofile/security/PreMatchingBindingTest.java index f0bc502aa31..d8e7bb04861 100644 --- a/microprofile/security/src/test/java/io/helidon/microprofile/security/PreMatchingBindingTest.java +++ b/microprofile/security/src/test/java/io/helidon/microprofile/security/PreMatchingBindingTest.java @@ -16,11 +16,11 @@ package io.helidon.microprofile.security; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.Configuration; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.Principal; import io.helidon.security.SecurityContext; import io.helidon.security.Subject; diff --git a/microprofile/server/pom.xml b/microprofile/server/pom.xml index b656a948a31..46cded2a791 100644 --- a/microprofile/server/pom.xml +++ b/microprofile/server/pom.xml @@ -153,8 +153,8 @@ - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/server/src/test/java/io/helidon/microprofile/server/AsyncResourceTest.java b/microprofile/server/src/test/java/io/helidon/microprofile/server/AsyncResourceTest.java index 13470f087f3..b4278346bfa 100644 --- a/microprofile/server/src/test/java/io/helidon/microprofile/server/AsyncResourceTest.java +++ b/microprofile/server/src/test/java/io/helidon/microprofile/server/AsyncResourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -19,8 +19,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; diff --git a/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java b/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java index cbcca4a1edc..4e590b47f80 100644 --- a/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java +++ b/microprofile/server/src/test/java/io/helidon/microprofile/server/JerseyPropertiesTest.java @@ -16,14 +16,13 @@ package io.helidon.microprofile.server; import io.helidon.microprofile.config.ConfigCdiExtension; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider; import org.glassfish.jersey.server.ResourceConfig; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.glassfish.jersey.client.ClientProperties.IGNORE_EXCEPTION_RESPONSE; diff --git a/microprofile/server/src/test/java/io/helidon/microprofile/server/ProducedRouteTest.java b/microprofile/server/src/test/java/io/helidon/microprofile/server/ProducedRouteTest.java index dcc493986ce..d2d734711c5 100644 --- a/microprofile/server/src/test/java/io/helidon/microprofile/server/ProducedRouteTest.java +++ b/microprofile/server/src/test/java/io/helidon/microprofile/server/ProducedRouteTest.java @@ -22,11 +22,11 @@ import io.helidon.http.HeaderName; import io.helidon.http.HeaderNames; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.webserver.http.HttpService; import jakarta.enterprise.context.ApplicationScoped; diff --git a/microprofile/server/src/test/java/io/helidon/microprofile/server/RedirectionTest.java b/microprofile/server/src/test/java/io/helidon/microprofile/server/RedirectionTest.java index dcdcf3a18f3..1355514fdb4 100644 --- a/microprofile/server/src/test/java/io/helidon/microprofile/server/RedirectionTest.java +++ b/microprofile/server/src/test/java/io/helidon/microprofile/server/RedirectionTest.java @@ -18,10 +18,10 @@ import java.net.URI; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.CDI; import jakarta.ws.rs.GET; diff --git a/microprofile/service-common/pom.xml b/microprofile/service-common/pom.xml index 048e3aff106..71b8d9c7442 100644 --- a/microprofile/service-common/pom.xml +++ b/microprofile/service-common/pom.xml @@ -66,8 +66,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/service-common/src/test/java/io/helidon/microprofile/servicecommon/TestConfigTiming.java b/microprofile/service-common/src/test/java/io/helidon/microprofile/servicecommon/TestConfigTiming.java index 3e26a0dcee4..7a42416cb23 100644 --- a/microprofile/service-common/src/test/java/io/helidon/microprofile/servicecommon/TestConfigTiming.java +++ b/microprofile/service-common/src/test/java/io/helidon/microprofile/servicecommon/TestConfigTiming.java @@ -15,9 +15,9 @@ */ package io.helidon.microprofile.servicecommon; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/microprofile/telemetry/pom.xml b/microprofile/telemetry/pom.xml index 72066486759..9eedb5295aa 100644 --- a/microprofile/telemetry/pom.xml +++ b/microprofile/telemetry/pom.xml @@ -99,8 +99,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java index fbc42a757e7..94526ce5b4f 100644 --- a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java +++ b/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java @@ -18,9 +18,9 @@ import io.helidon.config.Config; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.tracing.providers.opentelemetry.HelidonOpenTelemetry; import jakarta.enterprise.inject.spi.CDI; diff --git a/microprofile/tests/junit5/pom.xml b/microprofile/testing/junit5/pom.xml similarity index 85% rename from microprofile/tests/junit5/pom.xml rename to microprofile/testing/junit5/pom.xml index 7688523ce7c..36fdb1089dc 100644 --- a/microprofile/tests/junit5/pom.xml +++ b/microprofile/testing/junit5/pom.xml @@ -20,15 +20,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile - helidon-microprofile-project + io.helidon.microprofile.testing + helidon-microprofile-testing-project 4.0.0-SNAPSHOT - ../../pom.xml + ../pom.xml - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 - Helidon Microprofile Tests JUnit5 + helidon-microprofile-testing-junit5 + Helidon Microprofile Testing JUnit5 Integration with Junit5 to support tests with CDI injection diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBean.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBean.java similarity index 97% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBean.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBean.java index 43ded94ec01..fa6ebbee729 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBean.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBeans.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBeans.java similarity index 86% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBeans.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBeans.java index a7e3b515b97..77b9f845dbd 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddBeans.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddBeans.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -21,8 +21,8 @@ import java.lang.annotation.Target; /** - * A repeatable container for {@link io.helidon.microprofile.tests.junit5.AddBean}. - * No need to use this annotation, just repeat {@link io.helidon.microprofile.tests.junit5.AddBean} annotation + * A repeatable container for {@link io.helidon.microprofile.testing.junit5.AddBean}. + * No need to use this annotation, just repeat {@link io.helidon.microprofile.testing.junit5.AddBean} annotation * on test class. */ @Retention(RetentionPolicy.RUNTIME) diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfig.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfig.java similarity index 91% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfig.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfig.java index da70444334d..a1c5c4da63a 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfig.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfigs.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfigs.java similarity index 86% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfigs.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfigs.java index ce3e7dfdabe..82553a8dd0f 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfigs.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddConfigs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -21,8 +21,8 @@ import java.lang.annotation.Target; /** - * A repeatable container for {@link io.helidon.microprofile.tests.junit5.AddConfig}. - * No need to use this annotation, just repeat {@link io.helidon.microprofile.tests.junit5.AddConfig} annotation + * A repeatable container for {@link io.helidon.microprofile.testing.junit5.AddConfig}. + * No need to use this annotation, just repeat {@link io.helidon.microprofile.testing.junit5.AddConfig} annotation * on test class. */ @Retention(RetentionPolicy.RUNTIME) diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtension.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtension.java similarity index 96% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtension.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtension.java index ca813567d6c..c81db4b784b 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtension.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtension.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtensions.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtensions.java similarity index 85% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtensions.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtensions.java index ff0012f68ea..565f7f0d2f6 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddExtensions.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AddExtensions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -21,8 +21,8 @@ import java.lang.annotation.Target; /** - * A repeatable container for {@link io.helidon.microprofile.tests.junit5.AddExtension}. - * No need to use this annotation, just repeat {@link io.helidon.microprofile.tests.junit5.AddExtension} annotation + * A repeatable container for {@link io.helidon.microprofile.testing.junit5.AddExtension}. + * No need to use this annotation, just repeat {@link io.helidon.microprofile.testing.junit5.AddExtension} annotation * on test class. */ @Retention(RetentionPolicy.RUNTIME) diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AfterStop.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AfterStop.java similarity index 95% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AfterStop.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AfterStop.java index 5e5ad29be7f..ae3225d462a 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AfterStop.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/AfterStop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Configuration.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Configuration.java similarity index 95% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Configuration.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Configuration.java index f45eaa1e127..f75de831b10 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Configuration.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Configuration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -33,7 +33,7 @@ * If set to {@code true}, the existing (or default) MicroProfile configuration would be used. In this case it is * important to set property {@code mp.initializer.allow=true} in order CDI container to start, when used with * {@link HelidonTest}. - * By default uses a configuration constructed using all {@link io.helidon.microprofile.tests.junit5.AddConfig} + * By default uses a configuration constructed using all {@link io.helidon.microprofile.testing.junit5.AddConfig} * annotations and {@link #configSources()}. * When set to false and a {@link org.junit.jupiter.api.BeforeAll} method registers a custom configuration * with {@link org.eclipse.microprofile.config.spi.ConfigProviderResolver}, the result is undefined, though diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/DisableDiscovery.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/DisableDiscovery.java similarity index 88% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/DisableDiscovery.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/DisableDiscovery.java index bbb6e3e2b62..08c6c2b7b94 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/DisableDiscovery.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/DisableDiscovery.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -30,8 +30,8 @@ * {@code META-INF/beans.xml}) and all beans and extensions are added automatically. *

* When discovery is disabled, CDI would only contain the CDI implementation itself and beans and extensions added - * through annotations {@link io.helidon.microprofile.tests.junit5.AddBean} and - * {@link io.helidon.microprofile.tests.junit5.AddExtension} + * through annotations {@link io.helidon.microprofile.testing.junit5.AddBean} and + * {@link io.helidon.microprofile.testing.junit5.AddExtension} * * If discovery is disabled on class level and desired on method level, * the value can be set to {@code false}. diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonJunitExtension.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonJunitExtension.java similarity index 99% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonJunitExtension.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonJunitExtension.java index b937202a6ad..6f80bd7d461 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonJunitExtension.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonJunitExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonTest.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonTest.java similarity index 85% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonTest.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonTest.java index 1278627bdcf..983494f66bd 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/HelidonTest.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/HelidonTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -27,12 +27,13 @@ * An annotation making this test class a CDI bean with support for injection. *

* There is no need to provide {@code beans.xml} (actually it is not recommended, as it would combine beans - * from all tests), instead use {@link io.helidon.microprofile.tests.junit5.AddBean}, - * {@link io.helidon.microprofile.tests.junit5.AddExtension}, and {@link io.helidon.microprofile.tests.junit5.AddConfig} + * from all tests), instead use {@link io.helidon.microprofile.testing.junit5.AddBean}, + * {@link io.helidon.microprofile.testing.junit5.AddExtension}, + * and {@link io.helidon.microprofile.testing.junit5.AddConfig} * annotations to control the shape of the container. *

* To disable automated bean and extension discovery, annotate the class with - * {@link io.helidon.microprofile.tests.junit5.DisableDiscovery}. + * {@link io.helidon.microprofile.testing.junit5.DisableDiscovery}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Socket.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Socket.java similarity index 90% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Socket.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Socket.java index 6e477a07fd3..9852617ae4d 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Socket.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/Socket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/package-info.java b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/package-info.java similarity index 78% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/package-info.java rename to microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/package-info.java index f062b6d32ae..d299e74a35e 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/package-info.java +++ b/microprofile/testing/junit5/src/main/java/io/helidon/microprofile/testing/junit5/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -17,6 +17,6 @@ /** * JUnit5 extension to run CDI tests. * - * @see io.helidon.microprofile.tests.junit5.HelidonTest + * @see io.helidon.microprofile.testing.junit5.HelidonTest */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.junit5; diff --git a/microprofile/tests/junit5/src/main/java/module-info.java b/microprofile/testing/junit5/src/main/java/module-info.java similarity index 90% rename from microprofile/tests/junit5/src/main/java/module-info.java rename to microprofile/testing/junit5/src/main/java/module-info.java index b7597df93e3..1e0a02603e0 100644 --- a/microprofile/tests/junit5/src/main/java/module-info.java +++ b/microprofile/testing/junit5/src/main/java/module-info.java @@ -17,7 +17,7 @@ /** * JUnit5 extension module to run CDI tests. */ -module io.helidon.microprofile.tests.junit5 { +module io.helidon.microprofile.testing.junit5 { requires io.helidon.microprofile.cdi; requires io.helidon.config.mp; @@ -27,6 +27,6 @@ requires transitive jakarta.cdi; requires transitive jakarta.ws.rs; - exports io.helidon.microprofile.tests.junit5; + exports io.helidon.microprofile.testing.junit5; } diff --git a/microprofile/testing/pom.xml b/microprofile/testing/pom.xml new file mode 100644 index 00000000000..4d5e9897d0f --- /dev/null +++ b/microprofile/testing/pom.xml @@ -0,0 +1,39 @@ + + + + + 4.0.0 + + io.helidon.microprofile + helidon-microprofile-project + 4.0.0-SNAPSHOT + ../pom.xml + + pom + io.helidon.microprofile.testing + helidon-microprofile-testing-project + Helidon Microprofile Testing Project + + + junit5 + testng + + diff --git a/microprofile/tests/testng/pom.xml b/microprofile/testing/testng/pom.xml similarity index 76% rename from microprofile/tests/testng/pom.xml rename to microprofile/testing/testng/pom.xml index f41a189ad5c..b7827f9d1a6 100644 --- a/microprofile/tests/testng/pom.xml +++ b/microprofile/testing/testng/pom.xml @@ -14,27 +14,25 @@ See the License for the specific language governing permissions and limitations under the License. --> + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - tests-project - io.helidon.microprofile.tests + io.helidon.microprofile.testing + helidon-microprofile-testing-project 4.0.0-SNAPSHOT + ../pom.xml - 4.0.0 - - helidon-microprofile-tests-testng - Helidon Microprofile Tests TestNG + + helidon-microprofile-testing-testng + Helidon Microprofile Testing TestNG Integration with TestNG to support tests with CDI injection - - false - - io.helidon.microprofile.cdi @@ -52,6 +50,7 @@ org.testng testng + provided diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBean.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBean.java similarity index 94% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBean.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBean.java index eacc0d9972b..220f1c893cb 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBean.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBeans.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBeans.java similarity index 91% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBeans.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBeans.java index e4cf5baad3e..0de9a00f299 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddBeans.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddBeans.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfig.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfig.java similarity index 91% rename from microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfig.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfig.java index 5c078366bb6..d1bf335bb5b 100644 --- a/microprofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/AddConfig.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfigs.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfigs.java similarity index 91% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfigs.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfigs.java index 28dea9a7fe7..4ff9a87c0ee 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddConfigs.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddConfigs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtension.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtension.java similarity index 91% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtension.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtension.java index e1cd762ad9a..85d246eb01b 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtension.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtensions.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtensions.java similarity index 91% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtensions.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtensions.java index 234ba4245a6..02f0eb74d14 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/AddExtensions.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/AddExtensions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/Configuration.java similarity index 89% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/Configuration.java index c2442bb749e..23a60e70247 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/Configuration.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/Configuration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -33,7 +33,7 @@ * If set to {@code true}, the existing (or default) MicroProfile configuration would be used. * By default uses a configuration constructed using all {@link AddConfig} * annotations and {@link #configSources()}. - * When set to false and a {@link org.junit.jupiter.api.BeforeAll} method registers a custom configuration + * When set to false and a {@link org.testng.annotations.BeforeClass} method registers a custom configuration * with {@link org.eclipse.microprofile.config.spi.ConfigProviderResolver}, the result is undefined, though * tests have shown that the registered config may be used (as BeforeAll ordering is undefined by * JUnit, it may be called after our extension) diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/DisableDiscovery.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/DisableDiscovery.java similarity index 94% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/DisableDiscovery.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/DisableDiscovery.java index 6ac68a16176..a4b66811f6e 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/DisableDiscovery.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/DisableDiscovery.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTest.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTest.java similarity index 94% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTest.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTest.java index e7c98ac9490..8f86fb6f7a7 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTest.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTestNGListener.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java similarity index 99% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTestNGListener.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java index 090a9007882..7843643781d 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/HelidonTestNGListener.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/HelidonTestNgListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -33,7 +33,6 @@ import io.helidon.config.mp.MpConfigSources; import io.helidon.config.yaml.mp.YamlMpConfigSource; - import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; @@ -67,7 +66,7 @@ /** * TestNG extension to support Helidon CDI container in tests. */ -public class HelidonTestNGListener implements IClassListener, ITestListener { +public class HelidonTestNgListener implements IClassListener, ITestListener { private static final Set> HELIDON_TEST_ANNOTATIONS = Set.of(AddBean.class, AddConfig.class, AddExtension.class, Configuration.class); diff --git a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/package-info.java b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/package-info.java similarity index 85% rename from microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/package-info.java rename to microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/package-info.java index 06133e2a417..f67b7063ddd 100644 --- a/microprofile/tests/testng/src/main/java/io/helidon/microprofile/tests/testng/package-info.java +++ b/microprofile/testing/testng/src/main/java/io/helidon/microprofile/testing/testng/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -18,4 +18,4 @@ * TestNG extension to run CDI tests. * */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.testing.testng; diff --git a/microprofile/tests/testng/src/main/java/module-info.java b/microprofile/testing/testng/src/main/java/module-info.java similarity index 79% rename from microprofile/tests/testng/src/main/java/module-info.java rename to microprofile/testing/testng/src/main/java/module-info.java index e180c14e9d0..271be2a6022 100644 --- a/microprofile/tests/testng/src/main/java/module-info.java +++ b/microprofile/testing/testng/src/main/java/module-info.java @@ -14,10 +14,12 @@ * limitations under the License. */ +import io.helidon.microprofile.testing.testng.HelidonTestNgListener; + /** * TestNG extension module to run CDI tests. */ -module io.helidon.microprofile.tests.testng { +module io.helidon.microprofile.testing.testng { requires io.helidon.config.mp; requires io.helidon.config.yaml.mp; @@ -28,8 +30,8 @@ requires microprofile.config.api; requires org.testng; - exports io.helidon.microprofile.tests.testng; + exports io.helidon.microprofile.testing.testng; - provides org.testng.ITestNGListener with io.helidon.microprofile.tests.testng.HelidonTestNGListener; + provides org.testng.ITestNGListener with HelidonTestNgListener; } \ No newline at end of file diff --git a/microprofile/tests/arquillian/pom.xml b/microprofile/tests/arquillian/pom.xml index 74d0746fe32..f0a81678231 100644 --- a/microprofile/tests/arquillian/pom.xml +++ b/microprofile/tests/arquillian/pom.xml @@ -23,8 +23,9 @@ 4.0.0 io.helidon.microprofile.tests - tests-project + helidon-microprofile-tests-project 4.0.0-SNAPSHOT + ../pom.xml helidon-arquillian Helidon Microprofile Arquillian Integration diff --git a/microprofile/tests/pom.xml b/microprofile/tests/pom.xml index 7393c37d5f5..ac8c828c8d3 100644 --- a/microprofile/tests/pom.xml +++ b/microprofile/tests/pom.xml @@ -25,10 +25,11 @@ io.helidon.microprofile helidon-microprofile-project 4.0.0-SNAPSHOT + ../pom.xml pom io.helidon.microprofile.tests - tests-project + helidon-microprofile-tests-project Helidon Microprofile Tests @@ -42,11 +43,8 @@ arquillian - junit5 - junit5-tests - testng - testng-tests server + testing diff --git a/microprofile/tests/server/pom.xml b/microprofile/tests/server/pom.xml index 2c222383c74..8e3f61e7e11 100644 --- a/microprofile/tests/server/pom.xml +++ b/microprofile/tests/server/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> io.helidon.microprofile.tests - tests-project + helidon-microprofile-tests-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 helidon-microprofile-tests-server @@ -56,8 +57,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/tests/server/src/test/java/io/helidon/microprofile/tests/server/WebServerLifecycleAnnotationTest.java b/microprofile/tests/server/src/test/java/io/helidon/microprofile/tests/server/WebServerLifecycleAnnotationTest.java index 7ecf77420c1..c49167b90bc 100644 --- a/microprofile/tests/server/src/test/java/io/helidon/microprofile/tests/server/WebServerLifecycleAnnotationTest.java +++ b/microprofile/tests/server/src/test/java/io/helidon/microprofile/tests/server/WebServerLifecycleAnnotationTest.java @@ -17,9 +17,9 @@ package io.helidon.microprofile.tests.server; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.AfterStop; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AfterStop; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; diff --git a/microprofile/tests/tck/pom.xml b/microprofile/tests/tck/pom.xml index 1bc2be3eefc..fa882fe3669 100644 --- a/microprofile/tests/tck/pom.xml +++ b/microprofile/tests/tck/pom.xml @@ -22,13 +22,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> io.helidon.microprofile.tests - tests-project + helidon-microprofile-tests-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 pom - tck-project - Helidon Microprofile Tests TCK + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project + Helidon Microprofile Tests TCK Project tck-config @@ -45,7 +47,7 @@ tck-telemetry tck-core-profile tck-cdi - tck-restfull + tck-restful tck-jsonb tck-jsonp tck-inject diff --git a/microprofile/tests/tck/tck-annotations/pom.xml b/microprofile/tests/tck/tck-annotations/pom.xml index 85025394093..f5b6b1f5542 100644 --- a/microprofile/tests/tck/tck-annotations/pom.xml +++ b/microprofile/tests/tck/tck-annotations/pom.xml @@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-annotations Helidon Microprofile Tests TCK Annotations diff --git a/microprofile/tests/tck/tck-cdi/pom.xml b/microprofile/tests/tck/tck-cdi/pom.xml index 55c52aa7b39..9b079fe2595 100644 --- a/microprofile/tests/tck/tck-cdi/pom.xml +++ b/microprofile/tests/tck/tck-cdi/pom.xml @@ -20,9 +20,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - tck-project - io.helidon.microprofile.tests + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-cdi Helidon Microprofile Tests TCK CDI diff --git a/microprofile/tests/tck/tck-config/pom.xml b/microprofile/tests/tck/tck-config/pom.xml index 0ee77da9954..69f9dc434ca 100644 --- a/microprofile/tests/tck/tck-config/pom.xml +++ b/microprofile/tests/tck/tck-config/pom.xml @@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-config Helidon Microprofile Tests TCK Config diff --git a/microprofile/tests/tck/tck-core-profile/pom.xml b/microprofile/tests/tck/tck-core-profile/pom.xml index 23eac49ea5c..661c2c669f2 100644 --- a/microprofile/tests/tck/tck-core-profile/pom.xml +++ b/microprofile/tests/tck/tck-core-profile/pom.xml @@ -22,12 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml pom - tck-core-profile + helidon-microprofile-tests-tck-core-profile Helidon Microprofile Tests TCK Core Profile diff --git a/microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml b/microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml index add5e9221e1..0c8fa9bce52 100644 --- a/microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml +++ b/microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml @@ -22,11 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-core-profile + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-core-profile 4.0.0-SNAPSHOT + ../pom.xml - tck-core-profile-test + helidon-microprofile-tests-tck-core-profile-test Helidon Microprofile Tests TCK Core Profile diff --git a/microprofile/tests/tck/tck-fault-tolerance/pom.xml b/microprofile/tests/tck/tck-fault-tolerance/pom.xml index 784a61f0d0a..b1bf989ac75 100644 --- a/microprofile/tests/tck/tck-fault-tolerance/pom.xml +++ b/microprofile/tests/tck/tck-fault-tolerance/pom.xml @@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-fault-tolerance Helidon Microprofile Tests TCK Fault Tolerance diff --git a/microprofile/tests/tck/tck-graphql/pom.xml b/microprofile/tests/tck/tck-graphql/pom.xml index 0bc3081d50a..d45c11016d5 100644 --- a/microprofile/tests/tck/tck-graphql/pom.xml +++ b/microprofile/tests/tck/tck-graphql/pom.xml @@ -20,9 +20,10 @@ 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-graphql Helidon Microprofile Tests TCK GraphQL diff --git a/microprofile/tests/tck/tck-health/pom.xml b/microprofile/tests/tck/tck-health/pom.xml index 6d0aff9f90b..67995ef2db0 100644 --- a/microprofile/tests/tck/tck-health/pom.xml +++ b/microprofile/tests/tck/tck-health/pom.xml @@ -21,9 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/microprofile/tests/tck/tck-inject/pom.xml b/microprofile/tests/tck/tck-inject/pom.xml index 9dbd10e3b5b..4506fae3467 100644 --- a/microprofile/tests/tck/tck-inject/pom.xml +++ b/microprofile/tests/tck/tck-inject/pom.xml @@ -22,12 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml pom - tck-inject + helidon-microprofile-tests-tck-inject Helidon Microprofile Tests TCK Inject diff --git a/microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml b/microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml index 1d17647a547..6aeb72424d1 100644 --- a/microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml +++ b/microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml @@ -22,11 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-inject + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-inject 4.0.0-SNAPSHOT + ../pom.xml - tck-inject-tests + helidon-microprofile-tests-tck-inject-test Helidon Microprofile Tests TCK Inject diff --git a/microprofile/tests/tck/tck-jsonb/pom.xml b/microprofile/tests/tck/tck-jsonb/pom.xml index 8f58e526209..c587534f71f 100644 --- a/microprofile/tests/tck/tck-jsonb/pom.xml +++ b/microprofile/tests/tck/tck-jsonb/pom.xml @@ -22,12 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml pom - tck-jsonb + helidon-microprofile-tests-tck-jsonb Helidon Microprofile Tests TCK JSONB diff --git a/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml b/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml index e5a76aa6cb8..efbd8b29c2b 100644 --- a/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml +++ b/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml @@ -22,11 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-jsonb + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-jsonb 4.0.0-SNAPSHOT + ../pom.xml - tck-jsonb-tests + helidon-microprofile-tests-tck-jsonb-test Helidon Microprofile Tests TCK JSONB diff --git a/microprofile/tests/tck/tck-jsonp/pom.xml b/microprofile/tests/tck/tck-jsonp/pom.xml index ab6a88f8b5a..ebafb5244e6 100644 --- a/microprofile/tests/tck/tck-jsonp/pom.xml +++ b/microprofile/tests/tck/tck-jsonp/pom.xml @@ -22,12 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml pom - tck-jsonp + helidon-microprofile-tests-tck-jsonp Helidon Microprofile Tests TCK JSONP diff --git a/microprofile/tests/tck/tck-jsonp/tck-jsonp-test/pom.xml b/microprofile/tests/tck/tck-jsonp/tck-jsonp-test/pom.xml index d587dc49ba3..29e435f249a 100644 --- a/microprofile/tests/tck/tck-jsonp/tck-jsonp-test/pom.xml +++ b/microprofile/tests/tck/tck-jsonp/tck-jsonp-test/pom.xml @@ -22,11 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-jsonp + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-jsonp 4.0.0-SNAPSHOT + ../pom.xml - tck-jsonp-test + helidon-microprofile-tests-tck-jsonp-test Helidon Microprofile Tests TCK JSONP diff --git a/microprofile/tests/tck/tck-jwt-auth/pom.xml b/microprofile/tests/tck/tck-jwt-auth/pom.xml index 3651c252990..5486bf496ab 100644 --- a/microprofile/tests/tck/tck-jwt-auth/pom.xml +++ b/microprofile/tests/tck/tck-jwt-auth/pom.xml @@ -19,9 +19,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - tck-project - io.helidon.microprofile.tests + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-jwt-auth Helidon Microprofile Tests TCK JWT-Auth diff --git a/microprofile/tests/tck/tck-lra/pom.xml b/microprofile/tests/tck/tck-lra/pom.xml index 52229e95f34..774d192dd47 100644 --- a/microprofile/tests/tck/tck-lra/pom.xml +++ b/microprofile/tests/tck/tck-lra/pom.xml @@ -19,9 +19,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-lra diff --git a/microprofile/tests/tck/tck-messaging/pom.xml b/microprofile/tests/tck/tck-messaging/pom.xml index 633dc732dbd..abf1bb89b59 100644 --- a/microprofile/tests/tck/tck-messaging/pom.xml +++ b/microprofile/tests/tck/tck-messaging/pom.xml @@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-messaging Helidon Microprofile Tests TCK Messaging diff --git a/microprofile/tests/tck/tck-metrics/pom.xml b/microprofile/tests/tck/tck-metrics/pom.xml index b5374163b1b..9aab0915aba 100644 --- a/microprofile/tests/tck/tck-metrics/pom.xml +++ b/microprofile/tests/tck/tck-metrics/pom.xml @@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-metrics Helidon Microprofile Tests TCK Metrics diff --git a/microprofile/tests/tck/tck-openapi/pom.xml b/microprofile/tests/tck/tck-openapi/pom.xml index f4fcea356df..ff53d41682a 100644 --- a/microprofile/tests/tck/tck-openapi/pom.xml +++ b/microprofile/tests/tck/tck-openapi/pom.xml @@ -21,9 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml index f11517dc44f..06839d26481 100644 --- a/microprofile/tests/tck/tck-opentracing/pom.xml +++ b/microprofile/tests/tck/tck-opentracing/pom.xml @@ -20,9 +20,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - tck-project - io.helidon.microprofile.tests + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-opentracing Helidon Microprofile Tests TCK Opentracing diff --git a/microprofile/tests/tck/tck-reactive-operators/pom.xml b/microprofile/tests/tck/tck-reactive-operators/pom.xml index f3a512cc2a9..363a2487671 100644 --- a/microprofile/tests/tck/tck-reactive-operators/pom.xml +++ b/microprofile/tests/tck/tck-reactive-operators/pom.xml @@ -21,9 +21,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml tck-reactive-operators Helidon Microprofile Tests TCK Reactive Streams Operators diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml index da20adb16a4..aaaef74364a 100644 --- a/microprofile/tests/tck/tck-rest-client/pom.xml +++ b/microprofile/tests/tck/tck-rest-client/pom.xml @@ -19,9 +19,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - tck-project - io.helidon.microprofile.tests + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/microprofile/tests/tck/tck-restfull/README.md b/microprofile/tests/tck/tck-restful/README.md similarity index 100% rename from microprofile/tests/tck/tck-restfull/README.md rename to microprofile/tests/tck/tck-restful/README.md diff --git a/microprofile/tests/tck/tck-restfull/artifact-install.sh b/microprofile/tests/tck/tck-restful/artifact-install.sh similarity index 100% rename from microprofile/tests/tck/tck-restfull/artifact-install.sh rename to microprofile/tests/tck/tck-restful/artifact-install.sh diff --git a/microprofile/tests/tck/tck-restfull/pom.xml b/microprofile/tests/tck/tck-restful/pom.xml similarity index 79% rename from microprofile/tests/tck/tck-restfull/pom.xml rename to microprofile/tests/tck/tck-restful/pom.xml index 28cb7a4578d..50a2e7f7a0b 100644 --- a/microprofile/tests/tck/tck-restfull/pom.xml +++ b/microprofile/tests/tck/tck-restful/pom.xml @@ -22,16 +22,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-project + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml pom - tck-restfull - Helidon Microprofile Tests TCK Restfull + tck-restful + Helidon Microprofile Tests TCK Restful - tck-restfull-test + tck-restful-test @@ -47,11 +48,11 @@ - - + + - + diff --git a/microprofile/tests/tck/tck-restfull/tck-restfull-test/pom.xml b/microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml similarity index 96% rename from microprofile/tests/tck/tck-restfull/tck-restfull-test/pom.xml rename to microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml index 9336062be29..525c4e03236 100644 --- a/microprofile/tests/tck/tck-restfull/tck-restfull-test/pom.xml +++ b/microprofile/tests/tck/tck-restful/tck-restful-test/pom.xml @@ -22,12 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tck-restfull + io.helidon.microprofile.tests.tck + tck-restful 4.0.0-SNAPSHOT + ../pom.xml - tck-resfull-test - Helidon Microprofile Tests TCK Restfull + helidon-microprofile-tests-tck-restful-test + Helidon Microprofile Tests TCK Restful diff --git a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlLoaderExtension.java b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlLoaderExtension.java similarity index 96% rename from microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlLoaderExtension.java rename to microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlLoaderExtension.java index f060ea6edb1..9843eaed552 100644 --- a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlLoaderExtension.java +++ b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlLoaderExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.helidon.microprofile.restfull.tck; +package io.helidon.microprofile.restful.tck; import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider; import org.jboss.arquillian.core.spi.LoadableExtension; diff --git a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlResourceProvider.java b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlResourceProvider.java similarity index 96% rename from microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlResourceProvider.java rename to microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlResourceProvider.java index 9972bdc80be..681504cd62c 100644 --- a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/java/io/helidon/microprofile/restfull/tck/UrlResourceProvider.java +++ b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/java/io/helidon/microprofile/restful/tck/UrlResourceProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.helidon.microprofile.restfull.tck; +package io.helidon.microprofile.restful.tck; import java.lang.annotation.Annotation; import java.net.MalformedURLException; diff --git a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension similarity index 91% rename from microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension rename to microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension index a9f56c581b4..7ee95774d58 100644 --- a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -14,5 +14,5 @@ # limitations under the License. # -io.helidon.microprofile.restfull.tck.UrlLoaderExtension +io.helidon.microprofile.restful.tck.UrlLoaderExtension diff --git a/microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/resources/arquillian.xml b/microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/arquillian.xml similarity index 100% rename from microprofile/tests/tck/tck-restfull/tck-restfull-test/src/test/resources/arquillian.xml rename to microprofile/tests/tck/tck-restful/tck-restful-test/src/test/resources/arquillian.xml diff --git a/microprofile/tests/tck/tck-telemetry/pom.xml b/microprofile/tests/tck/tck-telemetry/pom.xml index 81545d8252f..eecc7bde71f 100644 --- a/microprofile/tests/tck/tck-telemetry/pom.xml +++ b/microprofile/tests/tck/tck-telemetry/pom.xml @@ -17,11 +17,12 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - tck-project - io.helidon.microprofile.tests + io.helidon.microprofile.tests.tck + helidon-microprofile-tests-tck-project 4.0.0-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/microprofile/tests/junit5-tests/pom.xml b/microprofile/tests/testing/junit5/pom.xml similarity index 83% rename from microprofile/tests/junit5-tests/pom.xml rename to microprofile/tests/testing/junit5/pom.xml index 1d05bfbda77..a0b58c82f14 100644 --- a/microprofile/tests/junit5-tests/pom.xml +++ b/microprofile/tests/testing/junit5/pom.xml @@ -20,12 +20,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tests-project + io.helidon.microprofile.tests.testing + helidon-microprofile-tests-testing-project 4.0.0-SNAPSHOT + ../pom.xml - helidon-microprofile-tests-junit5-tests + helidon-microprofile-tests-testing-junit5 Helidon Microprofile Tests Junit5 unit tests @@ -40,8 +41,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/AbstractTest.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/AbstractTest.java similarity index 86% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/AbstractTest.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/AbstractTest.java index 0655c8aaa56..4185c9637b3 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/AbstractTest.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/AbstractTest.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestAddBean.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestAddBean.java similarity index 81% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestAddBean.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestAddBean.java index 04a6e4436b5..e9f52b74423 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestAddBean.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestAddBean.java @@ -14,14 +14,17 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; -import static io.helidon.microprofile.tests.junit5.TestDefaults.DEFAULT_VALUE; -import static io.helidon.microprofile.tests.junit5.TestDefaults.PROPERTY_NAME; +import static io.helidon.microprofile.tests.testing.junit5.TestDefaults.DEFAULT_VALUE; +import static io.helidon.microprofile.tests.testing.junit5.TestDefaults.PROPERTY_NAME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild1.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild1.java similarity index 90% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild1.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild1.java index 855d92d8d6d..a03f69df4fd 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild1.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild1.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild2.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild2.java similarity index 90% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild2.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild2.java index 60b6280cf2b..a69b298e92d 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestChild2.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestChild2.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigSources.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigSources.java similarity index 88% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigSources.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigSources.java index e5bd5b2c929..ce887e00ebd 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigSources.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigSources.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationCustomProfile.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationCustomProfile.java similarity index 82% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationCustomProfile.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationCustomProfile.java index 51cabe3c819..1a035b98e2a 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationCustomProfile.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationCustomProfile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationDefaultProfile.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationDefaultProfile.java similarity index 81% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationDefaultProfile.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationDefaultProfile.java index 26926008bbd..63e95c2963f 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConfigurationDefaultProfile.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConfigurationDefaultProfile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConstructorInjection.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConstructorInjection.java similarity index 85% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConstructorInjection.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConstructorInjection.java index 7bc6103b9b1..612c07a064f 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestConstructorInjection.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestConstructorInjection.java @@ -14,7 +14,11 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomConfig.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomConfig.java similarity index 82% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomConfig.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomConfig.java index 6d7cac25abf..636e6e13bcc 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomConfig.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomConfig.java @@ -14,15 +14,18 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; -import static io.helidon.microprofile.tests.junit5.TestCustomConfig.PROPERTY_VALUE; -import static io.helidon.microprofile.tests.junit5.TestDefaults.PROPERTY_NAME; +import static io.helidon.microprofile.tests.testing.junit5.TestCustomConfig.PROPERTY_VALUE; +import static io.helidon.microprofile.tests.testing.junit5.TestDefaults.PROPERTY_NAME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomExtension.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomExtension.java similarity index 89% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomExtension.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomExtension.java index 00015c416e2..1236569b873 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestCustomExtension.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestCustomExtension.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Initialized; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestDefaults.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestDefaults.java similarity index 94% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestDefaults.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestDefaults.java index 31fe3ae4116..5495d5aa1b3 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestDefaults.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestDefaults.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNamedWebTarget.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNamedWebTarget.java similarity index 82% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNamedWebTarget.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNamedWebTarget.java index dd6f51cc83a..075603de259 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNamedWebTarget.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNamedWebTarget.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,13 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; + +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.Socket; + import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -22,9 +28,9 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.*; @HelidonTest @AddBean(TestNamedWebTarget.ResourceClass.class) @@ -42,7 +48,7 @@ class TestNamedWebTarget { @Test void testTargetsAreDifferent(){ //Should be different - assertNotEquals(target.getUri(), namedTarget.getUri()); + assertThat(target.getUri(), not(namedTarget.getUri())); } @Test diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNoDiscovery.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNoDiscovery.java similarity index 89% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNoDiscovery.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNoDiscovery.java index 3817834ec82..f8d90eab0f5 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestNoDiscovery.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestNoDiscovery.java @@ -14,9 +14,12 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; import io.helidon.microprofile.config.ConfigCdiExtension; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestPerMethod.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestPerMethod.java similarity index 90% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestPerMethod.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestPerMethod.java index 955bbbd4b92..17dece476c0 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestPerMethod.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestPerMethod.java @@ -14,13 +14,19 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Initialized; import jakarta.enterprise.event.Observes; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTarget.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTarget.java similarity index 87% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTarget.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTarget.java index 35d17f9acce..7b8070ff0af 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTarget.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTarget.java @@ -14,10 +14,14 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTargetPerMethod.java b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTargetPerMethod.java similarity index 87% rename from microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTargetPerMethod.java rename to microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTargetPerMethod.java index 91606447d67..dc1e11baf73 100644 --- a/microprofile/tests/junit5-tests/src/test/java/io/helidon/microprofile/tests/junit5/TestWebTargetPerMethod.java +++ b/microprofile/tests/testing/junit5/src/test/java/io/helidon/microprofile/tests/testing/junit5/TestWebTargetPerMethod.java @@ -14,10 +14,14 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.junit5; +package io.helidon.microprofile.tests.testing.junit5; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.GET; diff --git a/microprofile/tests/junit5-tests/src/test/resources/testConfigSources.properties b/microprofile/tests/testing/junit5/src/test/resources/testConfigSources.properties similarity index 90% rename from microprofile/tests/junit5-tests/src/test/resources/testConfigSources.properties rename to microprofile/tests/testing/junit5/src/test/resources/testConfigSources.properties index f89ba1dd864..1d4b6fcea3a 100644 --- a/microprofile/tests/junit5-tests/src/test/resources/testConfigSources.properties +++ b/microprofile/tests/testing/junit5/src/test/resources/testConfigSources.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2020 Oracle and/or its affiliates. +# Copyright (c) 2020, 2023 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. diff --git a/microprofile/tests/junit5-tests/src/test/resources/testConfigSources.yaml b/microprofile/tests/testing/junit5/src/test/resources/testConfigSources.yaml similarity index 91% rename from microprofile/tests/junit5-tests/src/test/resources/testConfigSources.yaml rename to microprofile/tests/testing/junit5/src/test/resources/testConfigSources.yaml index 3470a68aa69..caca9652480 100644 --- a/microprofile/tests/junit5-tests/src/test/resources/testConfigSources.yaml +++ b/microprofile/tests/testing/junit5/src/test/resources/testConfigSources.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Oracle and/or its affiliates. +# Copyright (c) 2021, 2023 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. diff --git a/microprofile/tests/testing/pom.xml b/microprofile/tests/testing/pom.xml new file mode 100644 index 00000000000..69a11334fcf --- /dev/null +++ b/microprofile/tests/testing/pom.xml @@ -0,0 +1,41 @@ + + + + + + io.helidon.microprofile.tests + helidon-microprofile-tests-project + 4.0.0-SNAPSHOT + ../pom.xml + + 4.0.0-SNAPSHOT + 4.0.0 + pom + io.helidon.microprofile.tests.testing + helidon-microprofile-tests-testing-project + Helidon Microprofile Tests Testing Project + Tests to test MP testing modules + + + junit5 + testng + + diff --git a/microprofile/tests/testng-tests/pom.xml b/microprofile/tests/testing/testng/pom.xml similarity index 83% rename from microprofile/tests/testng-tests/pom.xml rename to microprofile/tests/testing/testng/pom.xml index 177fa1935ae..6ee5645e377 100644 --- a/microprofile/tests/testng-tests/pom.xml +++ b/microprofile/tests/testing/testng/pom.xml @@ -19,12 +19,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.helidon.microprofile.tests - tests-project + io.helidon.microprofile.tests.testing + helidon-microprofile-tests-testing-project 4.0.0-SNAPSHOT + ../pom.xml - helidon-microprofile-tests-testng-tests + helidon-microprofile-tests-testing-testng Helidon Microprofile Tests TestNG unit tests @@ -39,8 +40,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-testng + io.helidon.microprofile.testing + helidon-microprofile-testing-testng test diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/AbstractTest.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/AbstractTest.java similarity index 81% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/AbstractTest.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/AbstractTest.java index c3a7bc7e0e2..d3c90b1ab20 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/AbstractTest.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/AbstractTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddConfig; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestAddBean.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestAddBean.java similarity index 78% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestAddBean.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestAddBean.java index 39fe27daba4..9febd386196 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestAddBean.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestAddBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,14 +14,17 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddBean; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.testng.annotations.Test; -import static io.helidon.microprofile.tests.testng.TestDefaults.DEFAULT_VALUE; -import static io.helidon.microprofile.tests.testng.TestDefaults.PROPERTY_NAME; +import static io.helidon.microprofile.tests.testing.testng.TestDefaults.DEFAULT_VALUE; +import static io.helidon.microprofile.tests.testing.testng.TestDefaults.PROPERTY_NAME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild1.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild1.java similarity index 86% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild1.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild1.java index ef53e2ff7f1..c69ca82cc0e 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild1.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild2.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild2.java similarity index 86% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild2.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild2.java index f7dd00d1d3a..fa2d07761fd 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestChild2.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestChild2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigSources.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigSources.java similarity index 84% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigSources.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigSources.java index 9dfab13dfb7..5290a2c71fb 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigSources.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigSources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.Configuration; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationCustomProfile.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationCustomProfile.java similarity index 82% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationCustomProfile.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationCustomProfile.java index 2976780bb83..79c9b5f9e07 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationCustomProfile.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationCustomProfile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.Configuration; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationDefaultProfile.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationDefaultProfile.java similarity index 81% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationDefaultProfile.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationDefaultProfile.java index 34ce67b8164..d226d653276 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestConfigurationDefaultProfile.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestConfigurationDefaultProfile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.Configuration; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomConfig.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomConfig.java similarity index 80% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomConfig.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomConfig.java index f51040dd02d..b64b5b55bc7 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomConfig.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,15 +14,18 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddConfig; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.testng.annotations.Test; -import static io.helidon.microprofile.tests.testng.TestCustomConfig.PROPERTY_VALUE; -import static io.helidon.microprofile.tests.testng.TestDefaults.PROPERTY_NAME; +import static io.helidon.microprofile.tests.testing.testng.TestCustomConfig.PROPERTY_VALUE; +import static io.helidon.microprofile.tests.testing.testng.TestDefaults.PROPERTY_NAME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomExtension.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomExtension.java similarity index 85% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomExtension.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomExtension.java index cf266b1d557..59fa8a0b7ba 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestCustomExtension.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestCustomExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,10 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.AddExtension; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Initialized; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestDefaults.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestDefaults.java similarity index 92% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestDefaults.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestDefaults.java index da7af973718..a3d84cfe1b8 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestDefaults.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestNoDiscovery.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestNoDiscovery.java similarity index 83% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestNoDiscovery.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestNoDiscovery.java index e2c6e5babef..7475ca4c291 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestNoDiscovery.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestNoDiscovery.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,9 +14,13 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; import io.helidon.microprofile.config.ConfigCdiExtension; +import io.helidon.microprofile.testing.testng.AddBean; +import io.helidon.microprofile.testing.testng.DisableDiscovery; +import io.helidon.microprofile.testing.testng.HelidonTest; + import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; import org.testng.Assert; diff --git a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestPerMethod.java b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestPerMethod.java similarity index 89% rename from microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestPerMethod.java rename to microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestPerMethod.java index 456e3c07da6..cc19145b992 100644 --- a/microprofile/tests/testng-tests/src/test/java/io/helidon/microprofile/tests/testng/TestPerMethod.java +++ b/microprofile/tests/testing/testng/src/test/java/io/helidon/microprofile/tests/testing/testng/TestPerMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -14,7 +14,17 @@ * limitations under the License. */ -package io.helidon.microprofile.tests.testng; +package io.helidon.microprofile.tests.testing.testng; + +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import io.helidon.microprofile.testing.testng.AddBean; +import io.helidon.microprofile.testing.testng.AddConfig; +import io.helidon.microprofile.testing.testng.AddExtension; +import io.helidon.microprofile.testing.testng.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Initialized; @@ -28,11 +38,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/tests/testng-tests/src/test/resources/testConfigSources.properties b/microprofile/tests/testing/testng/src/test/resources/testConfigSources.properties similarity index 90% rename from microprofile/tests/testng-tests/src/test/resources/testConfigSources.properties rename to microprofile/tests/testing/testng/src/test/resources/testConfigSources.properties index 5fa7e8dd4d0..04c68e82aad 100644 --- a/microprofile/tests/testng-tests/src/test/resources/testConfigSources.properties +++ b/microprofile/tests/testing/testng/src/test/resources/testConfigSources.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Oracle and/or its affiliates. +# Copyright (c) 2022, 2023 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. diff --git a/microprofile/tests/testng-tests/src/test/resources/testConfigSources.yaml b/microprofile/tests/testing/testng/src/test/resources/testConfigSources.yaml similarity index 91% rename from microprofile/tests/testng-tests/src/test/resources/testConfigSources.yaml rename to microprofile/tests/testing/testng/src/test/resources/testConfigSources.yaml index ecc4edfd84e..158792a3471 100644 --- a/microprofile/tests/testng-tests/src/test/resources/testConfigSources.yaml +++ b/microprofile/tests/testing/testng/src/test/resources/testConfigSources.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Oracle and/or its affiliates. +# Copyright (c) 2022, 2023 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. diff --git a/microprofile/tests/testng-tests/test-suite.xml b/microprofile/tests/testing/testng/test-suite.xml similarity index 92% rename from microprofile/tests/testng-tests/test-suite.xml rename to microprofile/tests/testing/testng/test-suite.xml index 4f79299d0f1..a42203a85eb 100644 --- a/microprofile/tests/testng-tests/test-suite.xml +++ b/microprofile/tests/testing/testng/test-suite.xml @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/microprofile/websocket/pom.xml b/microprofile/websocket/pom.xml index 108a2a7adb3..7770f7c7e96 100644 --- a/microprofile/websocket/pom.xml +++ b/microprofile/websocket/pom.xml @@ -102,8 +102,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ApplicationScopeTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ApplicationScopeTest.java index 238609e7a2c..8178440ff49 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ApplicationScopeTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ApplicationScopeTest.java @@ -25,8 +25,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ExtensionEndpointTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ExtensionEndpointTest.java index e29d15d821b..59fe241ac9d 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ExtensionEndpointTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/ExtensionEndpointTest.java @@ -20,8 +20,9 @@ import java.util.Collections; import java.util.List; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.websocket.Extension; import jakarta.websocket.OnMessage; import jakarta.websocket.Session; diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketBaseTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketBaseTest.java index 8c6f9f6ee04..acea54acfa0 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketBaseTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketBaseTest.java @@ -20,8 +20,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.microprofile.tests.junit5.HelidonTest; -import io.helidon.microprofile.tests.junit5.Socket; +import io.helidon.microprofile.testing.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.Socket; + import jakarta.inject.Inject; import jakarta.websocket.CloseReason; import jakarta.websocket.Endpoint; diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketEndpointAppTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketEndpointAppTest.java index a06e5756bbe..29e368c45c6 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketEndpointAppTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketEndpointAppTest.java @@ -22,8 +22,9 @@ import io.helidon.microprofile.server.RoutingName; import io.helidon.microprofile.server.RoutingPath; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.Configuration; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.Configuration; + import jakarta.enterprise.context.Dependent; import jakarta.websocket.Endpoint; import jakarta.websocket.server.ServerApplicationConfig; diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketExtensionEndpointTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketExtensionEndpointTest.java index c8a6d4e3968..4be089ee81a 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketExtensionEndpointTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketExtensionEndpointTest.java @@ -21,7 +21,8 @@ import java.util.List; import java.util.logging.Logger; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; + import jakarta.websocket.Extension; import jakarta.websocket.OnMessage; import jakarta.websocket.Session; diff --git a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketRestEndpointTest.java b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketRestEndpointTest.java index 6f9c345ad8c..dabc5772b78 100644 --- a/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketRestEndpointTest.java +++ b/microprofile/websocket/src/test/java/io/helidon/microprofile/tyrus/WebSocketRestEndpointTest.java @@ -16,7 +16,8 @@ package io.helidon.microprofile.tyrus; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/pom.xml b/pom.xml index 6f1f233ad57..a7df0c12e5e 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.4.14 10.0.1 4.0.10 - 3.1.3 + 3.1.3 2.2.1.Final 1.15.3 @@ -80,7 +80,7 @@ 3.0.1 3.1.12 3.1.2 - 7.5 + 7.8.0 2.12.5 7.0.1 3.1.6 @@ -970,7 +970,7 @@ jakarta.ws.rs jakarta-restful-ws-tck - ${version.lib.microprofile-restfull-tck} + ${version.lib.microprofile-restful-tck} com.github.akarnokd diff --git a/security/providers/http-auth/pom.xml b/security/providers/http-auth/pom.xml index 92ba736e536..3f91dd9b1dc 100644 --- a/security/providers/http-auth/pom.xml +++ b/security/providers/http-auth/pom.xml @@ -92,8 +92,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/apps/bookstore/bookstore-mp/pom.xml b/tests/apps/bookstore/bookstore-mp/pom.xml index 68a163004e2..e656fd7bd3e 100644 --- a/tests/apps/bookstore/bookstore-mp/pom.xml +++ b/tests/apps/bookstore/bookstore-mp/pom.xml @@ -80,8 +80,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/BookResourceTest.java b/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/BookResourceTest.java index 3e8f58be212..e8cb262a5f7 100644 --- a/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/BookResourceTest.java +++ b/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/BookResourceTest.java @@ -21,7 +21,7 @@ import java.io.InputStreamReader; import java.util.stream.Collectors; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.tests.apps.bookstore.common.Book; import jakarta.inject.Inject; @@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsArrayWithSize.arrayWithSize; diff --git a/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/VetoedResourceTest.java b/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/VetoedResourceTest.java index 87d0e3d63a6..172d353c1ef 100644 --- a/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/VetoedResourceTest.java +++ b/tests/apps/bookstore/bookstore-mp/src/test/java/io/helidon/tests/apps/bookstore/mp/VetoedResourceTest.java @@ -16,7 +16,7 @@ package io.helidon.tests.apps.bookstore.mp; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/functional/context-propagation/pom.xml b/tests/functional/context-propagation/pom.xml index 9861f450cdf..cc4bd76508c 100644 --- a/tests/functional/context-propagation/pom.xml +++ b/tests/functional/context-propagation/pom.xml @@ -46,8 +46,8 @@ helidon-microprofile-metrics - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java b/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java index c04f643f146..8097c49d23c 100644 --- a/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java +++ b/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 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. @@ -16,7 +16,7 @@ package io.helidon.tests.functional.context.hello; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/functional/jax-rs-multiple-apps/pom.xml b/tests/functional/jax-rs-multiple-apps/pom.xml index 14dc2676eb0..d0b7d6cde54 100644 --- a/tests/functional/jax-rs-multiple-apps/pom.xml +++ b/tests/functional/jax-rs-multiple-apps/pom.xml @@ -55,8 +55,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/jax-rs-multiple-apps/src/test/java/io/helidon/tests/functional/multipleapps/MainTest.java b/tests/functional/jax-rs-multiple-apps/src/test/java/io/helidon/tests/functional/multipleapps/MainTest.java index dc8f19a64ab..30befa6362f 100644 --- a/tests/functional/jax-rs-multiple-apps/src/test/java/io/helidon/tests/functional/multipleapps/MainTest.java +++ b/tests/functional/jax-rs-multiple-apps/src/test/java/io/helidon/tests/functional/multipleapps/MainTest.java @@ -16,19 +16,18 @@ package io.helidon.tests.functional.multipleapps; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonObject; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasKey; @HelidonTest diff --git a/tests/functional/mp-compression/pom.xml b/tests/functional/mp-compression/pom.xml index 1efb1a5a921..a9430ab9fef 100644 --- a/tests/functional/mp-compression/pom.xml +++ b/tests/functional/mp-compression/pom.xml @@ -48,8 +48,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java b/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java index 6898104c02b..286f46c1628 100644 --- a/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java +++ b/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java @@ -16,7 +16,7 @@ package io.helidon.tests.functional.mpcompression; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/functional/multiport/pom.xml b/tests/functional/multiport/pom.xml index 64d4ba086e8..34ff29af838 100644 --- a/tests/functional/multiport/pom.xml +++ b/tests/functional/multiport/pom.xml @@ -70,8 +70,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/multiport/src/test/java/io/helidon/tests/functional/multiport/MainTest.java b/tests/functional/multiport/src/test/java/io/helidon/tests/functional/multiport/MainTest.java index a4cf31c9b69..3a2dd5b3df2 100644 --- a/tests/functional/multiport/src/test/java/io/helidon/tests/functional/multiport/MainTest.java +++ b/tests/functional/multiport/src/test/java/io/helidon/tests/functional/multiport/MainTest.java @@ -19,7 +19,7 @@ import java.util.stream.Stream; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.Client; diff --git a/tests/functional/param-converter-provider/pom.xml b/tests/functional/param-converter-provider/pom.xml index f6554461600..e2a3fe46678 100644 --- a/tests/functional/param-converter-provider/pom.xml +++ b/tests/functional/param-converter-provider/pom.xml @@ -55,8 +55,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/param-converter-provider/src/test/java/io/helidon/tests/functional/paramconverterprovider/MainTest.java b/tests/functional/param-converter-provider/src/test/java/io/helidon/tests/functional/paramconverterprovider/MainTest.java index e53ac423d8f..d6f5b45ba4c 100644 --- a/tests/functional/param-converter-provider/src/test/java/io/helidon/tests/functional/paramconverterprovider/MainTest.java +++ b/tests/functional/param-converter-provider/src/test/java/io/helidon/tests/functional/paramconverterprovider/MainTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -16,7 +16,8 @@ package io.helidon.tests.functional.paramconverterprovider; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/functional/request-scope-cdi/pom.xml b/tests/functional/request-scope-cdi/pom.xml index 346531d3abd..0e6262fb002 100644 --- a/tests/functional/request-scope-cdi/pom.xml +++ b/tests/functional/request-scope-cdi/pom.xml @@ -55,8 +55,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java b/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java index ad7aa6b0fac..17afb762ea9 100644 --- a/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java +++ b/tests/functional/request-scope-cdi/src/test/java/io/helidon/tests/functional/requestscopecdi/SecretTest.java @@ -17,7 +17,7 @@ package io.helidon.tests.functional.requestscopecdi; import io.helidon.common.media.type.MediaTypes; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.json.JsonObject; diff --git a/tests/functional/request-scope-injection/pom.xml b/tests/functional/request-scope-injection/pom.xml index 5ea95e17fda..2173e21f6a8 100644 --- a/tests/functional/request-scope-injection/pom.xml +++ b/tests/functional/request-scope-injection/pom.xml @@ -38,8 +38,8 @@ helidon-config-yaml - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java index d29e95766ee..ec6a8cbb819 100644 --- a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +++ b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java @@ -16,7 +16,8 @@ package io.helidon.tests.functional.context.injection; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; import org.junit.jupiter.api.Test; diff --git a/tests/functional/request-scope/pom.xml b/tests/functional/request-scope/pom.xml index 40cf4d4391a..5f5fce59be2 100644 --- a/tests/functional/request-scope/pom.xml +++ b/tests/functional/request-scope/pom.xml @@ -55,8 +55,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/functional/request-scope/src/test/java/io/helidon/tests/functional/requestscope/TenantTest.java b/tests/functional/request-scope/src/test/java/io/helidon/tests/functional/requestscope/TenantTest.java index 799b3b2b784..52c9b1cb03f 100644 --- a/tests/functional/request-scope/src/test/java/io/helidon/tests/functional/requestscope/TenantTest.java +++ b/tests/functional/request-scope/src/test/java/io/helidon/tests/functional/requestscope/TenantTest.java @@ -19,8 +19,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; -import io.helidon.microprofile.tests.junit5.HelidonTest; import io.helidon.faulttolerance.Async; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/integration/jms/pom.xml b/tests/integration/jms/pom.xml index 1ab9f05e63c..cf342271e61 100644 --- a/tests/integration/jms/pom.xml +++ b/tests/integration/jms/pom.xml @@ -64,8 +64,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java index 56c78cd28c4..fb8b9464839 100644 --- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java +++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java @@ -24,14 +24,14 @@ import io.helidon.messaging.connectors.mock.TestConnector; import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.messaging.MessagingCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddConfigs; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.AddExtensions; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddConfigs; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AddExtensions; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.se.SeContainer; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsInjectedFactoryTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsInjectedFactoryTest.java index 86e25e137e2..76e0700506e 100644 --- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsInjectedFactoryTest.java +++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsInjectedFactoryTest.java @@ -24,11 +24,11 @@ import io.helidon.messaging.connectors.mock.TestConnector; import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.messaging.MessagingCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsJndiMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsJndiMpTest.java index 078a91ac7a8..9fb0a3fcf5a 100644 --- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsJndiMpTest.java +++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsJndiMpTest.java @@ -23,11 +23,11 @@ import io.helidon.messaging.connectors.mock.TestConnector; import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.messaging.MessagingCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java index a43e26e8229..1913df24f55 100644 --- a/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java +++ b/tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/JmsMpTest.java @@ -29,19 +29,18 @@ import io.helidon.microprofile.config.ConfigCdiExtension; import io.helidon.microprofile.messaging.MessagingCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddBeans; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.AddConfigs; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.AddExtensions; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBeans; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddConfigs; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.AddExtensions; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.inject.spi.CDI; import jakarta.jms.JMSException; import jakarta.jms.TextMessage; - import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-bean-validation/pom.xml b/tests/integration/mp-bean-validation/pom.xml index fd478413a3e..195583e500f 100644 --- a/tests/integration/mp-bean-validation/pom.xml +++ b/tests/integration/mp-bean-validation/pom.xml @@ -57,8 +57,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java b/tests/integration/mp-bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java index f8f12cb9d06..237437f34c1 100644 --- a/tests/integration/mp-bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java +++ b/tests/integration/mp-bean-validation/src/test/java/io/helidon/tests/integration/bean/validation/TestValidationEndpoint.java @@ -15,12 +15,12 @@ */ package io.helidon.tests.integration.bean.validation; -import io.helidon.microprofile.tests.junit5.HelidonTest; -import org.junit.jupiter.api.Test; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/integration/mp-gh-2421/pom.xml b/tests/integration/mp-gh-2421/pom.xml index 8b223b1f6b1..0d2c40adcd8 100644 --- a/tests/integration/mp-gh-2421/pom.xml +++ b/tests/integration/mp-gh-2421/pom.xml @@ -47,8 +47,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-2461/pom.xml b/tests/integration/mp-gh-2461/pom.xml index 18447c6cac6..4a9e0ed6a7a 100644 --- a/tests/integration/mp-gh-2461/pom.xml +++ b/tests/integration/mp-gh-2461/pom.xml @@ -54,8 +54,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-2461/src/test/java/io/helidon/tests/integration/gh2461/Gh2461Test.java b/tests/integration/mp-gh-2461/src/test/java/io/helidon/tests/integration/gh2461/Gh2461Test.java index 3d7d42d9e94..e91e5b92d4d 100644 --- a/tests/integration/mp-gh-2461/src/test/java/io/helidon/tests/integration/gh2461/Gh2461Test.java +++ b/tests/integration/mp-gh-2461/src/test/java/io/helidon/tests/integration/gh2461/Gh2461Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -26,8 +26,8 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; diff --git a/tests/integration/mp-gh-3246/pom.xml b/tests/integration/mp-gh-3246/pom.xml index e306df54d42..50f69d835b7 100644 --- a/tests/integration/mp-gh-3246/pom.xml +++ b/tests/integration/mp-gh-3246/pom.xml @@ -54,8 +54,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-3246/src/test/java/io/helidon/tests/integration/gh3246/Gh3246Test.java b/tests/integration/mp-gh-3246/src/test/java/io/helidon/tests/integration/gh3246/Gh3246Test.java index c1211b4d558..282fb89fbdc 100644 --- a/tests/integration/mp-gh-3246/src/test/java/io/helidon/tests/integration/gh3246/Gh3246Test.java +++ b/tests/integration/mp-gh-3246/src/test/java/io/helidon/tests/integration/gh3246/Gh3246Test.java @@ -20,8 +20,8 @@ import io.helidon.common.configurable.Resource; import io.helidon.http.HeaderNames; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.jwt.Jwt; import io.helidon.security.jwt.SignedJwt; import io.helidon.security.jwt.jwk.JwkKeys; diff --git a/tests/integration/mp-gh-3974/pom.xml b/tests/integration/mp-gh-3974/pom.xml index 9e39f7df3db..686172f66e5 100644 --- a/tests/integration/mp-gh-3974/pom.xml +++ b/tests/integration/mp-gh-3974/pom.xml @@ -46,8 +46,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-3974/src/test/java/io/helidon/tests/integration/gh3974/Gh3974Test.java b/tests/integration/mp-gh-3974/src/test/java/io/helidon/tests/integration/gh3974/Gh3974Test.java index 11b58d78711..b527758e4e5 100644 --- a/tests/integration/mp-gh-3974/src/test/java/io/helidon/tests/integration/gh3974/Gh3974Test.java +++ b/tests/integration/mp-gh-3974/src/test/java/io/helidon/tests/integration/gh3974/Gh3974Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -16,8 +16,8 @@ package io.helidon.tests.integration.gh3974; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; @@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @HelidonTest diff --git a/tests/integration/mp-gh-4123/pom.xml b/tests/integration/mp-gh-4123/pom.xml index 6d797360f4d..4dc7f352fd8 100644 --- a/tests/integration/mp-gh-4123/pom.xml +++ b/tests/integration/mp-gh-4123/pom.xml @@ -46,8 +46,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-4123/src/test/java/io/helidon/tests/integration/gh4123/Gh4123Test.java b/tests/integration/mp-gh-4123/src/test/java/io/helidon/tests/integration/gh4123/Gh4123Test.java index 5e94f9c00fa..1fe400e6dd1 100644 --- a/tests/integration/mp-gh-4123/src/test/java/io/helidon/tests/integration/gh4123/Gh4123Test.java +++ b/tests/integration/mp-gh-4123/src/test/java/io/helidon/tests/integration/gh4123/Gh4123Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -16,7 +16,7 @@ package io.helidon.tests.integration.gh4123; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-gh-4654/pom.xml b/tests/integration/mp-gh-4654/pom.xml index 3ecafbb8a97..23b06a5cce7 100644 --- a/tests/integration/mp-gh-4654/pom.xml +++ b/tests/integration/mp-gh-4654/pom.xml @@ -51,8 +51,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-5328/pom.xml b/tests/integration/mp-gh-5328/pom.xml index 17adc1cbd68..add6651c1f0 100644 --- a/tests/integration/mp-gh-5328/pom.xml +++ b/tests/integration/mp-gh-5328/pom.xml @@ -52,8 +52,8 @@ helidon-webclient-tracing - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-gh-5328/src/test/java/io/helidon/tests/integration/gh5328/Gh5328Test.java b/tests/integration/mp-gh-5328/src/test/java/io/helidon/tests/integration/gh5328/Gh5328Test.java index 90e776b49d8..9413db51864 100644 --- a/tests/integration/mp-gh-5328/src/test/java/io/helidon/tests/integration/gh5328/Gh5328Test.java +++ b/tests/integration/mp-gh-5328/src/test/java/io/helidon/tests/integration/gh5328/Gh5328Test.java @@ -16,8 +16,8 @@ package io.helidon.tests.integration.gh5328; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/pom.xml b/tests/integration/mp-graphql/pom.xml index 8e282637e11..8bb649bce1e 100644 --- a/tests/integration/mp-graphql/pom.xml +++ b/tests/integration/mp-graphql/pom.xml @@ -89,8 +89,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AbstractGraphQlCdiIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AbstractGraphQlCdiIT.java index 3b0019cd8cd..4c40dcb4b12 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AbstractGraphQlCdiIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AbstractGraphQlCdiIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -16,9 +16,9 @@ package io.helidon.microprofile.graphql.server; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; /** * Common functionality for integration tests. diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AllDefaultsExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AllDefaultsExceptionIT.java index 45bc74344f9..005c4749aea 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AllDefaultsExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/AllDefaultsExceptionIT.java @@ -21,7 +21,7 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLListAndWLExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLListAndWLExceptionIT.java index 0def04279a8..fb0a655d081 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLListAndWLExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLListAndWLExceptionIT.java @@ -21,8 +21,8 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.ConfigKey; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLOfIOExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLOfIOExceptionIT.java index ced4ea5228f..41e6935ad6e 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLOfIOExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/BLOfIOExceptionIT.java @@ -20,8 +20,8 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.ConfigKey; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetcherUtilsIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetcherUtilsIT.java index bed2f238c8d..6c24776697d 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetcherUtilsIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetcherUtilsIT.java @@ -32,7 +32,7 @@ import io.helidon.microprofile.graphql.server.test.types.ContactRelationship; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; import io.helidon.microprofile.graphql.server.test.types.SimpleContactWithNumberFormats; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetchingEnvironmentIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetchingEnvironmentIT.java index c25a787e752..69b5a6f36c8 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetchingEnvironmentIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DataFetchingEnvironmentIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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,7 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.queries.DataFetchingEnvironmentQueriesAndMutations; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeIT.java index b7e75aa7c63..574d8c26bf9 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -27,7 +27,7 @@ import io.helidon.microprofile.graphql.server.test.queries.SimpleQueriesAndMutations; import io.helidon.microprofile.graphql.server.test.types.DateTimePojo; import io.helidon.microprofile.graphql.server.test.types.SimpleDateTime; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeScalarIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeScalarIT.java index bc9fddc259a..b60d2d02129 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeScalarIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DateTimeScalarIT.java @@ -25,7 +25,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.queries.DateTimeScalarQueries; import io.helidon.microprofile.graphql.server.test.types.SimpleDateTimePojo; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultCheckedExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultCheckedExceptionIT.java index 8332f7cec15..f765da6850f 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultCheckedExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultCheckedExceptionIT.java @@ -20,7 +20,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultValuesIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultValuesIT.java index 14986013cdf..1467eaff5b5 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultValuesIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DefaultValuesIT.java @@ -24,7 +24,7 @@ import io.helidon.microprofile.graphql.server.test.queries.DefaultValueQueries; import io.helidon.microprofile.graphql.server.test.queries.OddNamedQueriesAndMutations; import io.helidon.microprofile.graphql.server.test.types.DefaultValuePOJO; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DescriptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DescriptionIT.java index 22dfdee3a27..1a7de26c2e8 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DescriptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DescriptionIT.java @@ -21,7 +21,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.queries.DescriptionQueries; import io.helidon.microprofile.graphql.server.test.types.DescriptionType; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DifferentMessageExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DifferentMessageExceptionIT.java index 36f3ea52eca..2e8cc65cd60 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DifferentMessageExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/DifferentMessageExceptionIT.java @@ -21,8 +21,8 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/GraphQLEndpointIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/GraphQLEndpointIT.java index b21981d54f3..33539ac6d3c 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/GraphQLEndpointIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/GraphQLEndpointIT.java @@ -24,10 +24,10 @@ import io.helidon.microprofile.graphql.server.test.types.Person; import io.helidon.microprofile.server.JaxRsCdiExtension; import io.helidon.microprofile.server.ServerCdiExtension; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddExtension; -import io.helidon.microprofile.tests.junit5.DisableDiscovery; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddExtension; +import io.helidon.microprofile.testing.junit5.DisableDiscovery; +import io.helidon.microprofile.testing.junit5.HelidonTest; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/IngorableIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/IngorableIT.java index cc952e5b7b8..7d0b26b3629 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/IngorableIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/IngorableIT.java @@ -22,7 +22,7 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.queries.QueriesWithIgnorable; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InputTypeIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InputTypeIT.java index 3613d61640f..5168d5636e5 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InputTypeIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InputTypeIT.java @@ -23,7 +23,7 @@ import io.helidon.microprofile.graphql.server.test.types.SimpleContactInputTypeWithAddress; import io.helidon.microprofile.graphql.server.test.types.SimpleContactInputTypeWithName; import io.helidon.microprofile.graphql.server.test.types.SimpleContactInputTypeWithNameValue; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceOnlyAnnotatedIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceOnlyAnnotatedIT.java index 21565f6c71e..eb013a2852f 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceOnlyAnnotatedIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceOnlyAnnotatedIT.java @@ -24,7 +24,7 @@ import io.helidon.microprofile.graphql.server.test.types.Car; import io.helidon.microprofile.graphql.server.test.types.Motorbike; import io.helidon.microprofile.graphql.server.test.types.Vehicle; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceTypeOnlyAnnotatedIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceTypeOnlyAnnotatedIT.java index 4e586f799bd..2fea0d4f236 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceTypeOnlyAnnotatedIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/InterfaceTypeOnlyAnnotatedIT.java @@ -26,7 +26,7 @@ import io.helidon.microprofile.graphql.server.test.types.Motorbike; import io.helidon.microprofile.graphql.server.test.types.Vehicle; import io.helidon.microprofile.graphql.server.test.types.VehicleIncident; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/Level0IT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/Level0IT.java index 5216da803d3..091d35c3fee 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/Level0IT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/Level0IT.java @@ -21,7 +21,7 @@ import io.helidon.microprofile.graphql.server.test.queries.NoopQueriesAndMutations; import io.helidon.microprofile.graphql.server.test.types.Level0; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MapIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MapIT.java index 829b9d63639..07b56da71d8 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MapIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MapIT.java @@ -24,7 +24,7 @@ import io.helidon.microprofile.graphql.server.test.queries.MapQueries; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; import io.helidon.microprofile.graphql.server.test.types.TypeWithMap; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MultiLevelArraysIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MultiLevelArraysIT.java index a8197080237..25d8f624850 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MultiLevelArraysIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/MultiLevelArraysIT.java @@ -30,7 +30,7 @@ import io.helidon.microprofile.graphql.server.test.queries.ArrayAndListQueries; import io.helidon.microprofile.graphql.server.test.types.MultiLevelListsAndArrays; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NullIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NullIT.java index 5fe6bf490bd..bffc149f887 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NullIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NullIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 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. @@ -23,7 +23,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.queries.QueriesAndMutationsWithNulls; import io.helidon.microprofile.graphql.server.test.types.NullPOJO; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NumberFormatIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NumberFormatIT.java index 75905932c0a..c49009d7b52 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NumberFormatIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/NumberFormatIT.java @@ -27,7 +27,7 @@ import io.helidon.microprofile.graphql.server.test.queries.NumberFormatQueriesAndMutations; import io.helidon.microprofile.graphql.server.test.queries.SimpleQueriesWithArgs; import io.helidon.microprofile.graphql.server.test.types.SimpleContactWithNumberFormats; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PartialResultsExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PartialResultsExceptionIT.java index ce042a44218..bfbf8246264 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PartialResultsExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PartialResultsExceptionIT.java @@ -24,7 +24,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PojoNamingIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PojoNamingIT.java index a4c22334715..e83d10a339b 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PojoNamingIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PojoNamingIT.java @@ -22,7 +22,7 @@ import io.helidon.microprofile.graphql.server.test.queries.NoopQueriesAndMutations; import io.helidon.microprofile.graphql.server.test.types.Person; import io.helidon.microprofile.graphql.server.test.types.PersonWithName; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PropertyNameIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PropertyNameIT.java index 94c8dab6698..9e3110f5ff2 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PropertyNameIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/PropertyNameIT.java @@ -23,7 +23,7 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.queries.PropertyNameQueries; import io.helidon.microprofile.graphql.server.test.types.TypeWithNameAndJsonbProperty; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleMutationsIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleMutationsIT.java index e510f292011..0337795fa72 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleMutationsIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleMutationsIT.java @@ -22,7 +22,7 @@ import io.helidon.graphql.server.InvocationHandler; import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.mutations.SimpleMutations; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleQueriesWithArgsIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleQueriesWithArgsIT.java index aa4bab3710e..8fd80cd825e 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleQueriesWithArgsIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SimpleQueriesWithArgsIT.java @@ -33,7 +33,7 @@ import io.helidon.microprofile.graphql.server.test.types.AbstractVehicle; import io.helidon.microprofile.graphql.server.test.types.Car; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SourceIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SourceIT.java index f4aa9c84bd9..4603cb46063 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SourceIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/SourceIT.java @@ -24,7 +24,7 @@ import io.helidon.microprofile.graphql.server.test.enums.EnumTestWithEnumName; import io.helidon.microprofile.graphql.server.test.queries.SimpleQueriesWithSource; import io.helidon.microprofile.graphql.server.test.types.SimpleContact; -import io.helidon.microprofile.tests.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddBean; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/WLOfCheckedExceptionIT.java b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/WLOfCheckedExceptionIT.java index 964a7f82cb4..0eaa34f0edc 100644 --- a/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/WLOfCheckedExceptionIT.java +++ b/tests/integration/mp-graphql/src/test/java/io/helidon/microprofile/graphql/server/WLOfCheckedExceptionIT.java @@ -20,8 +20,8 @@ import io.helidon.microprofile.graphql.server.test.db.TestDB; import io.helidon.microprofile.graphql.server.test.exception.ExceptionQueries; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.ConfigKey; diff --git a/tests/integration/oidc/pom.xml b/tests/integration/oidc/pom.xml index 35dc565a353..16ef0458f8e 100644 --- a/tests/integration/oidc/pom.xml +++ b/tests/integration/oidc/pom.xml @@ -58,8 +58,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java index b4cf4c9f29e..f987d27dc94 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java @@ -19,8 +19,8 @@ import io.helidon.config.Config; import io.helidon.jersey.connector.HelidonConnectorProvider; import io.helidon.jersey.connector.HelidonProperties; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; import dasniko.testcontainers.keycloak.KeycloakContainer; import jakarta.ws.rs.client.Client; diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java index d0fe52bd51d..e3cab7e4db3 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java @@ -16,7 +16,7 @@ package io.helidon.tests.integration.oidc; -import io.helidon.microprofile.tests.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.AddConfig; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java index 3e010a8bcfa..a161474f393 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.AddConfig; -import io.helidon.microprofile.tests.junit5.HelidonTest; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.AddConfig; +import io.helidon.microprofile.testing.junit5.HelidonTest; import io.helidon.security.providers.oidc.common.OidcConfig; import jakarta.ws.rs.client.WebTarget; diff --git a/tests/integration/restclient/pom.xml b/tests/integration/restclient/pom.xml index 945d4532a3b..0fb50f0efae 100644 --- a/tests/integration/restclient/pom.xml +++ b/tests/integration/restclient/pom.xml @@ -54,8 +54,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/restclient/src/test/java/io/helidon/tests/integration/restclient/MainTest.java b/tests/integration/restclient/src/test/java/io/helidon/tests/integration/restclient/MainTest.java index 54496135614..ba097dae617 100644 --- a/tests/integration/restclient/src/test/java/io/helidon/tests/integration/restclient/MainTest.java +++ b/tests/integration/restclient/src/test/java/io/helidon/tests/integration/restclient/MainTest.java @@ -16,11 +16,11 @@ package io.helidon.tests.integration.restclient; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.inject.Inject; import jakarta.json.JsonObject; import jakarta.ws.rs.client.WebTarget; - -import io.helidon.microprofile.tests.junit5.HelidonTest; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/tests/integration/security/gh2772/pom.xml b/tests/integration/security/gh2772/pom.xml index 21c7ab1f125..dc716898b46 100644 --- a/tests/integration/security/gh2772/pom.xml +++ b/tests/integration/security/gh2772/pom.xml @@ -38,8 +38,8 @@ helidon-microprofile - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/security/gh2772/src/test/java/io/helidon/tests/integration/security/gh2772/OptionalTest.java b/tests/integration/security/gh2772/src/test/java/io/helidon/tests/integration/security/gh2772/OptionalTest.java index 3c55029b31b..2fe9b86d561 100644 --- a/tests/integration/security/gh2772/src/test/java/io/helidon/tests/integration/security/gh2772/OptionalTest.java +++ b/tests/integration/security/gh2772/src/test/java/io/helidon/tests/integration/security/gh2772/OptionalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2023 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. @@ -18,12 +18,11 @@ import java.util.Base64; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; - -import io.helidon.microprofile.tests.junit5.HelidonTest; - import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/tests/integration/security/security-response-mapper/pom.xml b/tests/integration/security/security-response-mapper/pom.xml index cf7e19d1d48..224eb63cdc1 100644 --- a/tests/integration/security/security-response-mapper/pom.xml +++ b/tests/integration/security/security-response-mapper/pom.xml @@ -54,8 +54,8 @@ test - io.helidon.microprofile.tests - helidon-microprofile-tests-junit5 + io.helidon.microprofile.testing + helidon-microprofile-testing-junit5 test diff --git a/tests/integration/security/security-response-mapper/src/test/java/io/helidon/tests/integration/security/mapper/RestrictedResourceTest.java b/tests/integration/security/security-response-mapper/src/test/java/io/helidon/tests/integration/security/mapper/RestrictedResourceTest.java index 89e68f42c62..04cb79f8cae 100644 --- a/tests/integration/security/security-response-mapper/src/test/java/io/helidon/tests/integration/security/mapper/RestrictedResourceTest.java +++ b/tests/integration/security/security-response-mapper/src/test/java/io/helidon/tests/integration/security/mapper/RestrictedResourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 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. @@ -16,12 +16,12 @@ package io.helidon.tests.integration.security.mapper; +import io.helidon.microprofile.testing.junit5.AddBean; +import io.helidon.microprofile.testing.junit5.HelidonTest; + import jakarta.inject.Inject; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; - -import io.helidon.microprofile.tests.junit5.AddBean; -import io.helidon.microprofile.tests.junit5.HelidonTest; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; From 1619c53bd26acc13be526a9b6c8b7f36cf79d4a0 Mon Sep 17 00:00:00 2001 From: Tomas Langer Date: Fri, 15 Sep 2023 13:49:21 +0200 Subject: [PATCH 2/2] Fix testng dependency, as it is now provided --- microprofile/tests/testing/testng/pom.xml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/microprofile/tests/testing/testng/pom.xml b/microprofile/tests/testing/testng/pom.xml index 6ee5645e377..b3c2a094cc8 100644 --- a/microprofile/tests/testing/testng/pom.xml +++ b/microprofile/tests/testing/testng/pom.xml @@ -34,6 +34,11 @@ + + org.testng + testng + test + io.helidon.microprofile.server helidon-microprofile-server @@ -44,14 +49,6 @@ helidon-microprofile-testing-testng test - - io.helidon.jersey - helidon-jersey-client - - - io.helidon.config - helidon-config-yaml-mp - org.hamcrest hamcrest-core