From 01bee6969efe374d4489d35189c65f34106cea87 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Thu, 4 Nov 2021 16:00:42 +1100 Subject: [PATCH] Use the new unit test API It's slightly nicer, and we really want new tests to use it rather than just copying existing tests that use the old API. --- .../DefaultProfileInjectingMainTestCase.java | 4 +- .../ExceptionHandlingCommandModeTestCase.java | 4 +- .../ExceptionThrowingCommandModeTestCase.java | 4 +- .../quarkus/commandmode/ExitCodeTestCase.java | 4 +- .../commandmode/InvalidNamedMainTestCase.java | 4 +- .../JavaMainFullyQualifiedTestCase.java | 4 +- .../quarkus/commandmode/JavaMainTestCase.java | 4 +- .../commandmode/NamedMainTestCase.java | 4 +- ...verriddenProfileInjectingMainTestCase.java | 4 +- .../SimpleCommandModeBothMainsTestCase.java | 4 +- .../SimpleCommandModeTestCase.java | 4 +- .../StaticInitConfigMappingInvalidTest.java | 4 +- .../config/StaticInitConfigMappingTest.java | 4 +- .../GeneratedResourceBuildItemTest.java | 4 +- .../UberJarIgnoredResourceBuildItemTest.java | 4 +- .../UberJarMergedResourceBuildItemTest.java | 4 +- .../io/quarkus/extest/ConfiguredBeanTest.java | 4 +- .../quarkus/extest/RuntimeDefaultsTest.java | 4 +- .../quarkus/extest/StaticInitSourcesTest.java | 4 +- .../io/quarkus/extest/UnknownConfigTest.java | 4 +- .../forkjoin/ForkJoinProdModeTestCase.java | 4 +- .../logging/AdditionalHandlersTest.java | 4 +- .../logging/AsyncConsoleHandlerTest.java | 4 +- .../quarkus/logging/AsyncFileHandlerTest.java | 4 +- .../logging/AsyncSyslogHandlerTest.java | 4 +- ...ndlerInvalidDueToMultipleHandlersTest.java | 4 +- .../CategoryConfiguredHandlerTest.java | 4 +- .../quarkus/logging/ConsoleHandlerTest.java | 4 +- .../io/quarkus/logging/FileHandlerTest.java | 4 +- .../logging/PeriodicRotatingLoggingTest.java | 4 +- ...icSizeRotatingLoggingRotateOnBootTest.java | 4 +- .../PeriodicSizeRotatingLoggingTest.java | 4 +- .../logging/SizeRotatingLoggingTest.java | 4 +- .../io/quarkus/logging/SyslogHandlerTest.java | 4 +- .../DevModeTest.java | 2 +- .../create-extension-templates/UnitTest.java | 2 +- .../asciidoc/building-my-first-extension.adoc | 2 +- .../src/main/asciidoc/writing-extensions.adoc | 2 +- .../DataSourceHealthCheckExclusionTest.java | 4 +- ...ourceHealthCheckWithExtraProducerTest.java | 4 +- .../test/DevServicesH2DatasourceTestCase.java | 4 +- .../FlushOnCloseDataSourceConfigTest.java | 4 +- .../MultipleDataSourcesConfigDevModeTest.java | 4 +- .../test/MultipleDataSourcesConfigTest.java | 4 +- ...aSourcesErroneousButWorkingConfigTest.java | 4 +- ...tipleDevServicesDataSourcesConfigTest.java | 4 +- .../agroal/test/PoolInterceptorsTest.java | 4 +- ...amodbAsyncClientBrokenProxyConfigTest.java | 4 +- .../DynamodbAsyncClientFullConfigTest.java | 4 +- ...bAsyncClientTlsKeyFileStoreConfigTest.java | 4 +- ...syncClientTlsTrustFileStoreConfigTest.java | 4 +- ...AsyncClientTlsTrustTrustAllConfigTest.java | 4 +- .../DynamodbBrokenEndpointConfigTest.java | 4 +- ...tDefaultCredentialsProviderConfigTest.java | 4 +- ...tProfileCredentialsProviderConfigTest.java | 4 +- ...odbProcessCredentialsBrokenConfigTest.java | 4 +- ...modbStaticCredentialsBrokenConfigTest.java | 4 +- ...amodbSyncApacheClientBrokenConfigTest.java | 4 +- ...SyncApacheClientBrokenProxyConfigTest.java | 4 +- ...ynamodbSyncApacheClientFullConfigTest.java | 4 +- ...dbSyncClientTlsKeyFileStoreConfigTest.java | 4 +- ...SyncClientTlsTrustFileStoreConfigTest.java | 4 +- ...bSyncClientTlsTrustTrustAllConfigTest.java | 4 +- ...namodbSyncUrlConnClientFullConfigTest.java | 4 +- .../IamSyncClientFullConfigTest.java | 4 +- .../KmsSyncClientFullConfigTest.java | 4 +- .../S3SyncClientFullConfigTest.java | 4 +- .../SesSyncClientFullConfigTest.java | 4 +- .../SnsSyncClientFullConfigTest.java | 4 +- .../SqsSyncClientFullConfigTest.java | 4 +- .../SsmSyncClientFullConfigTest.java | 4 +- .../java/SingleLetterDefaultPackageTest.java | 4 +- .../io/quarkus/arc/test/SimpleBeanTest.java | 4 +- .../SelectedAlternativesFqcnTest.java | 4 +- ...SelectedAlternativesPackageStartsTest.java | 4 +- .../SelectedAlternativesPackageTest.java | 4 +- .../SelectedAlternativesSimpleNameTest.java | 4 +- .../SharedLiteralWithPrivateDefaultTest.java | 4 +- .../CommandLineArgumentsTestCase.java | 4 +- .../autoinject/AutoFieldInjectionTest.java | 4 +- .../AutoProducerMethodDisabledTest.java | 4 +- .../autoproduces/AutoProducerMethodTest.java | 4 +- .../test/config/ConfigArrayConverterTest.java | 4 +- .../config/ConfigImplicitConverterTest.java | 4 +- .../arc/test/config/ConfigMappingTest.java | 4 +- .../arc/test/config/ConfigOptionalsTest.java | 4 +- .../arc/test/config/ConfigPropertiesTest.java | 4 +- ...ConfigPropertyInjectionValidationTest.java | 4 +- ...yInjectionWithoutInjectAnnotationTest.java | 4 +- .../ConfigPropertyMapInjectionTest.java | 4 +- .../IndexedPropertiesInjectionTest.java | 4 +- .../arc/test/config/NullConverterTest.java | 4 +- .../test/config/RemovedConfigMappingTest.java | 4 +- .../config/RemovedConfigPropertiesTest.java | 4 +- .../config/RemovedConfigPropertyTest.java | 4 +- .../config/UnremovedConfigMappingTest.java | 4 +- ...eldsAndSuperclassConfigPropertiesTest.java | 4 +- ...thAllPublicFieldsConfigPropertiesTest.java | 4 +- ...owedMissingSetterConfigPropertiesTest.java | 4 +- .../ClassWithMissingConfigPropertiesTest.java | 4 +- ...WithMissingNestedConfigPropertiesTest.java | 4 +- ...owedMissingSetterConfigPropertiesTest.java | 4 +- ...assWithoutGettersConfigPropertiesTest.java | 4 +- ...nfigConfigDefaultConfigPropertiesTest.java | 4 +- ...ceExtendingOthersConfigPropertiesTest.java | 4 +- ...GetterWithMissingConfigPropertiesTest.java | 4 +- ...erfaceWithMissingConfigPropertiesTest.java | 4 +- ...ceWithNestedInterfaceConfigPrefixTest.java | 4 +- .../InterfaceWithOtherConfigPrefixTest.java | 4 +- .../arc/test/configproperties/MapTest.java | 4 +- .../MultipleClassConfigPrefixTest.java | 4 +- .../MultipleInterfaceConfigPrefixTest.java | 4 +- ...lassAndSuperclassConfigPropertiesTest.java | 4 +- .../NestedClassConfigPropertiesTest.java | 4 +- .../TypicalClassConfigPrefixTest.java | 4 +- .../TypicalClassConfigPropertiesTest.java | 4 +- ...assWithSuperclassConfigPropertiesTest.java | 4 +- .../TypicalInterfaceConfigPrefixTest.java | 4 +- .../TypicalInterfaceConfigPropertiesTest.java | 4 +- .../UnspecifiedPrefixConfigProperties.java | 4 +- .../VerbatimConfigPropertiesTest.java | 4 +- ...VerbatimInterfaceConfigPropertiesTest.java | 4 +- .../configroot/ConfigRootInjectionTest.java | 4 +- .../test/context/CustomPseudoScopeTest.java | 4 +- .../arc/test/exclude/ExcludeTypesTest.java | 4 +- .../InterceptorBindingRegistrarTest.java | 4 +- .../InterceptorNoBindingsTest.java | 4 +- .../InterceptedStaticMethodTest.java | 4 +- .../io/quarkus/arc/test/lock/LockTest.java | 4 +- .../arc/test/log/InjectedLoggerTest.java | 4 +- .../LookupConditionOnProducersTest.java | 4 +- .../lookup/LookupConditionsCombinedTest.java | 4 +- .../arc/test/lookup/LookupConditionsTest.java | 4 +- .../metadata/InjectionPointMetadataTest.java | 4 +- .../arc/test/observer/AsyncObserverTest.java | 4 +- .../observer/ObserverTransformerTest.java | 4 +- .../test/observer/SyntheticObserverTest.java | 4 +- .../arc/test/profile/IfBuildProfileTest.java | 4 +- .../test/profile/UnlessBuildProfileTest.java | 4 +- ...nedBuildProfileAndBuildPropertiesTest.java | 4 +- .../test/properties/IfBuildPropertyTest.java | 4 +- .../SimpleUnlessBuildPropertyTest.java | 4 +- .../properties/UnlessBuildPropertyTest.java | 4 +- .../qualifiers/QualifierRegistrarTest.java | 4 +- .../arc/test/remove/RemoveFwkBeansTest.java | 4 +- .../test/startup/StartupAnnotationTest.java | 4 +- ...nDefiningAnnotationStereotypeTestCase.java | 4 +- .../stereotype/DoubleScopedBeanTestCase.java | 4 +- ...ubleScopedStereotypeHierarchyTestCase.java | 4 +- .../DoubleScopedStereotypeTestCase.java | 4 +- .../AddMissingNoargsConstructorTest.java | 4 +- ...iledToAddMissingNoargsConstructorTest.java | 4 +- .../FinalClassDoNotRemoveFlagTest.java | 4 +- .../unproxyable/FinalClassRemoveFlagTest.java | 4 +- ...ltipleAddMissingNoargsConstructorTest.java | 4 +- ...rivateNoArgsConstructorChangeFlagTest.java | 4 +- ...eNoArgsConstructorDoNotChangeFlagTest.java | 4 +- ...oducerAddMissingNoargsConstructorTest.java | 4 +- ...iledToAddMissingNoargsConstructorTest.java | 4 +- .../RequestScopedFinalMethodsTest.java | 4 +- ...xiableBeanWithoutNoArgConstructorTest.java | 4 +- .../arc/test/unused/UnusedExclusionTest.java | 4 +- .../ObserverOnInnerClassTest.java | 4 +- .../ProducerOnInnerClassTest.java | 4 +- .../ScopeOnInnerClassTest.java | 4 +- .../wrongannotations/WrongSingletonTest.java | 4 +- .../deployment/DeploymentExceptionsTest.java | 4 +- .../test/deployment/DisabledCacheTest.java | 4 +- .../test/deployment/UnknownCacheTypeTest.java | 4 +- .../test/devmode/CacheHotReloadTest.java | 4 +- .../runtime/CaffeineCacheInjectionTest.java | 4 +- .../cache/test/runtime/ConcurrencyTest.java | 4 +- .../test/runtime/NoOpCacheInjectionTest.java | 4 +- .../cache/test/runtime/NoOpCacheTest.java | 4 +- .../ThrowExecutionExceptionCauseTest.java | 4 +- .../cache/test/runtime/UniValueTest.java | 4 +- .../test/runtime/ZeroCaffeineCacheTest.java | 4 +- .../cache/test/runtime/ZeroNoOpCacheTest.java | 4 +- .../ApplicationYamlHotDeploymentTest.java | 4 +- .../deployment/ClassConfigPropertiesTest.java | 4 +- .../InterfaceConfigPropertiesTest.java | 4 +- .../jdbc/BcryptPasswordMapperTest.java | 4 +- .../security/jdbc/CustomRoleDecoderTest.java | 4 +- .../jdbc/MinimalConfigurationTest.java | 4 +- .../jdbc/MultipleDataSourcesTest.java | 4 +- .../MultipleQueriesConfigurationTest.java | 4 +- .../security/ldap/CustomRoleDecoderTest.java | 4 +- .../ldap/MinimalConfigurationTest.java | 4 +- .../security/ldap/SearchRecursiveTest.java | 4 +- .../security/test/BasicAuthTestCase.java | 4 +- .../CustomAuthEmbeddedEncryptedTestCase.java | 4 +- .../test/CustomAuthEmbeddedTestCase.java | 4 +- .../security/test/CustomAuthTestCase.java | 4 +- .../security/test/FormAuthTestCase.java | 4 +- .../test/NoConfiguredRealmsTestCase.java | 4 +- .../flyway/test/FlywayDevModeTest.java | 4 +- ...nBaselineOnMigrateNamedDataSourceTest.java | 4 +- .../FlywayExtensionBaselineOnMigrateTest.java | 4 +- .../test/FlywayExtensionCallbackTest.java | 4 +- ...ayExtensionCleanAndMigrateAtStartTest.java | 4 +- ...ndMigrateAtStartWithJavaMigrationTest.java | 4 +- .../test/FlywayExtensionCleanAtStartTest.java | 4 +- ...yExtensionConfigDefaultDataSourceTest.java | 4 +- ...figDefaultDataSourceWithoutFlywayTest.java | 6 +-- .../test/FlywayExtensionConfigEmptyTest.java | 6 +-- ...nsionConfigMissingNamedDataSourceTest.java | 6 +-- ...ayExtensionConfigMultiDataSourcesTest.java | 6 +-- ...figMultiDataSourcesWithoutDefaultTest.java | 6 +-- ...nfigNamedDataSourceWithoutDefaultTest.java | 6 +-- ...onfigNamedDataSourceWithoutFlywayTest.java | 6 +-- ...FlywayExtensionFilesystemResourceTest.java | 4 +- .../test/FlywayExtensionInitSqlTest.java | 4 +- ...sionMigrateAtStartNamedDataSourceTest.java | 4 +- ...yExtensionMigrateAtStartSubfolderTest.java | 4 +- .../FlywayExtensionMigrateAtStartTest.java | 4 +- .../FlywayMultiDataSourcesDevModeTest.java | 4 +- .../quarkus/funqy/test/QueryReaderTest.java | 4 +- .../io/quarkus/funqy/test/RootPathTest.java | 4 +- .../io/quarkus/funqy/test/SimpleTest.java | 4 +- .../quarkus/funqy/test/BinaryPayloadTest.java | 4 +- .../io/quarkus/funqy/test/ContextTest.java | 4 +- .../funqy/test/ExposedCloudEventTest.java | 4 +- .../io/quarkus/funqy/test/FallbackTest.java | 4 +- .../quarkus/funqy/test/GreetingAsyncTest.java | 4 +- .../quarkus/funqy/test/GreetingSyncTest.java | 4 +- .../io/quarkus/funqy/test/MappingTest.java | 4 +- .../quarkus/funqy/test/QueryReaderTest.java | 4 +- .../io/quarkus/funqy/test/RootPathTest.java | 4 +- .../quarkus/funqy/test/VoidFunctionTest.java | 4 +- .../funqy/test/WithAttributeFilterTest.java | 4 +- .../WithConflictingAttributeFilterTest.java | 4 +- .../WithDuplicateAttributeFilterTest.java | 4 +- .../quarkus/funqy/test/WithGenericsTest.java | 4 +- .../grpc/client/InvalidInjectionTypeTest.java | 4 +- .../devconsole/DevConsoleUnaryMethodTest.java | 4 +- .../BlockingClientCallOnEventLoopTest.java | 4 +- .../quarkus/grpc/server/GrpcServerTest.java | 4 +- .../io/quarkus/grpc/server/NoServerTest.java | 4 +- .../DevModeServerStartDisabledTest.java | 4 +- .../devmode/DevModeServerStartTest.java | 4 +- .../EnversAuditTableSuffixTestCase.java | 4 +- .../orm/envers/EnversFastBootingTest.java | 4 +- .../EnversStoreDataAtDeleteTestCase.java | 4 +- .../orm/envers/EnversValidationTestCase.java | 4 +- .../orm/ExcludePersistenceXmlConfigTest.java | 4 +- .../orm/HibernateHotReloadTestCase.java | 2 +- .../orm/HibernateMetricsTestCase.java | 4 +- ...rnateSchemaRecreateDevConsoleTestCase.java | 4 +- .../hibernate/orm/JPACacheDisabledTest.java | 4 +- .../hibernate/orm/JPAFastBootingTest.java | 4 +- .../hibernate/orm/NoTransactionTest.java | 4 +- .../hibernate/orm/UseNamedDatasourceTest.java | 4 +- .../AttributeConverterAutoApplyTest.java | 4 +- .../orm/batch/BatchFetchSizeTest.java | 4 +- ...ithExplicitUnconfiguredDatasourceTest.java | 4 +- ...ithImplicitUnconfiguredDatasourceTest.java | 4 +- .../hibernate/orm/config/NoEntitiesTest.java | 4 +- .../orm/config/NoHibernatePropertiesTest.java | 4 +- ...ithExplicitUnconfiguredDatasourceTest.java | 4 +- ...ntitiesInNamedPUWithoutDatasourceTest.java | 4 +- ...formationFailingDDLGenerationTestCase.java | 4 +- .../DevConsolePuInformationTestCase.java | 4 +- ...HibernateEntityEnhancerFinalFieldTest.java | 4 +- ...noreExplicitForJoinedDefaultValueTest.java | 6 +-- ...JoinedDefaultValueWithMultiplePUsTest.java | 6 +-- ...nedDefaultValueWithPersistenceXmlTest.java | 4 +- ...oinedFalseValueWithPersistenceXmlTest.java | 4 +- .../IgnoreExplicitForJoinedTrueValueTest.java | 6 +-- ...ForJoinedTrueValueWithMultiplePUsTest.java | 6 +-- ...JoinedTrueValueWithPersistenceXmlTest.java | 4 +- .../ApplicationScopedInterceptorTest.java | 4 +- .../interceptor/DependentInterceptorTest.java | 4 +- .../TransactionScopedInterceptorTest.java | 4 +- .../LogSqlFormatSqlDefaultValueTest.java | 4 +- .../orm/logsql/LogSqlFormatSqlFalseTest.java | 4 +- .../MetadataBuilderContributorTest.java | 4 +- ...ePersistenceUnitsCdiEntityManagerTest.java | 4 +- ...ultiplePersistenceUnitsCdiSessionTest.java | 4 +- ...sistenceUnitsClassLevelAnnotationTest.java | 4 +- ...enceUnitsImportSqlHotReloadScriptTest.java | 4 +- ...ceUnitsInconsistentStorageEnginesTest.java | 4 +- ...ltiplePersistenceUnitsInterceptorTest.java | 4 +- ...ersistenceUnitsPackageAnnotationsTest.java | 4 +- ...itsResourceInjectionEntityManagerTest.java | 4 +- ...enceUnitsResourceInjectionSessionTest.java | 4 +- ...ersistenceUnitsUnaffectedEntitiesTest.java | 4 +- ...PersistenceUnitsUndefinedPackagesTest.java | 4 +- .../naming/ImplicitNamingStrategyTest.java | 4 +- .../naming/PhysicalNamingStrategyTest.java | 4 +- .../packages/PackageLevelAnnotationTest.java | 4 +- ...idTypeForPersistenceUnitExtensionTest.java | 4 +- .../PublicFieldAccessAssociationsTest.java | 4 +- .../PublicFieldAccessFieldTypesTest.java | 4 +- .../PublicFieldAccessFinalFieldTest.java | 4 +- .../PublicFieldAccessInheritanceTest.java | 4 +- .../JPAQuotedTestCase.java | 4 +- .../GenerateScriptNotAppendedTestCase.java | 4 +- ...lePersistenceUnitCdiEntityManagerTest.java | 4 +- .../SinglePersistenceUnitCdiSessionTest.java | 4 +- ...nitResourceInjectionEntityManagerTest.java | 4 +- ...tenceUnitResourceInjectionSessionTest.java | 4 +- .../EarlyMetadaValidationTest.java | 4 +- .../AddNewSqlLoadScriptTestCase.java | 4 +- .../DefaultSqlLoadScriptTestCase.java | 4 +- .../FileNotFoundSqlLoadScriptTestCase.java | 4 +- ...tipleSqlLoadScriptsFileAbsentTestCase.java | 4 +- .../ImportMultipleSqlLoadScriptsTestCase.java | 4 +- .../ImportSqlHotReloadScriptTestCase.java | 4 +- .../ImportSqlLoadScriptTestCase.java | 4 +- ...ntroducingDefaultImportScriptTestCase.java | 4 +- ...InvalidMultilineSqlLoadScriptTestCase.java | 4 +- .../sql_load_script/NoFileOptionTestCase.java | 4 +- .../SqlLoadScriptFileAbsentTestCase.java | 4 +- .../SqlLoadScriptPresentTestCase.java | 4 +- .../AbstractTransactionLifecycleTest.java | 4 +- .../orm/validation/JPAValidationTestCase.java | 4 +- .../HbmXmlHotReloadExplicitFileTestCase.java | 4 +- .../orm/xml/hbm/HbmXmlQuarkusConfigTest.java | 4 +- .../xml/orm/OrmXmlAnnotationOverrideTest.java | 4 +- .../OrmXmlHotReloadExplicitFileTestCase.java | 4 +- .../OrmXmlHotReloadImplicitFileTestCase.java | 4 +- .../orm/xml/orm/OrmXmlPackageTest.java | 4 +- .../OrmXmlPersistenceXmlExplicitFileTest.java | 4 +- .../OrmXmlPersistenceXmlImplicitFileTest.java | 4 +- .../orm/OrmXmlPersistenceXmlNoFileTest.java | 4 +- .../OrmXmlQuarkusConfigExplicitFileTest.java | 4 +- .../OrmXmlQuarkusConfigImplicitFileTest.java | 4 +- .../orm/OrmXmlQuarkusConfigNoFileTest.java | 4 +- .../ExcludePersistenceXmlConfigTest.java | 4 +- .../xml/persistence/PersistenceXmlTest.java | 4 +- .../reactive/MultiLineImportTest.java | 4 +- .../hibernate/reactive/NoEntitiesTest.java | 4 +- .../quarkus/hibernate/reactive/NoJtaTest.java | 4 +- .../dev/HibernateReactiveDevModeTest.java | 4 +- .../PublicFieldAccessFieldTypesTest.java | 4 +- .../PublicFieldAccessInheritanceTest.java | 4 +- ...lePersistenceUnitCdiMutinySessionTest.java | 4 +- .../FileNotFoundSqlLoadScriptTestCase.java | 4 +- .../MultiplePersistenceUnitsCdiTest.java | 4 +- .../test/offline/StartOfflineTest.java | 4 +- .../SinglePersistenceUnitsCdiTest.java | 4 +- .../DevModeConstraintValidationTest.java | 4 +- ...acksonErroneousTimeZonePropertiesTest.java | 4 +- .../jaeger/test/JaegerMetricsTestCase.java | 4 +- .../DevServicesDB2DatasourceTestCase.java | 4 +- .../DevServicesDerbyDatasourceTestCase.java | 4 +- .../DevServicesMariaDBDatasourceTestCase.java | 4 +- .../DevServicesMsSQLDatasourceTestCase.java | 4 +- .../DevServicesMySQLDatasourceTestCase.java | 4 +- ...esPostgresqlDatasourceDevModeTestCase.java | 4 +- ...vServicesPostgresqlDatasourceTestCase.java | 4 +- .../jsonb/deployment/JsonbAdapterTest.java | 4 +- ...nBaselineOnMigrateNamedDataSourceTest.java | 4 +- ...quibaseExtensionBaselineOnMigrateTest.java | 4 +- ...seExtensionCleanAndMigrateAtStartTest.java | 4 +- .../LiquibaseExtensionCleanAtStartTest.java | 4 +- ...eExtensionConfigDefaultDataSourceTest.java | 4 +- ...DefaultDataSourceWithoutLiquibaseTest.java | 4 +- .../LiquibaseExtensionConfigEmptyTest.java | 4 +- ...nsionConfigMissingNamedDataSourceTest.java | 4 +- ...seExtensionConfigMultiDataSourcesTest.java | 4 +- ...figMultiDataSourcesWithoutDefaultTest.java | 4 +- ...nfigNamedDataSourceWithoutDefaultTest.java | 4 +- ...igNamedDataSourceWithoutLiquibaseTest.java | 4 +- .../LiquibaseExtensionLoadChangeLogTest.java | 4 +- ...nMigrateAtStartDirectoryChangeLogTest.java | 4 +- ...ensionMigrateAtStartJsonChangeLogTest.java | 4 +- ...sionMigrateAtStartNamedDataSourceTest.java | 4 +- ...tensionMigrateAtStartSqlChangeLogTest.java | 4 +- .../LiquibaseExtensionMigrateAtStartTest.java | 4 +- ...tensionMigrateAtStartXmlChangeLogTest.java | 4 +- ...ensionMigrateAtStartYamlChangeLogTest.java | 4 +- .../json/JsonFormatterCustomConfigTest.java | 4 +- .../java/io/quarkus/mailer/InjectionTest.java | 4 +- .../mailer/MailTemplateValidationTest.java | 4 +- .../mailer/i18n/MailMessageBundleTest.java | 4 +- .../deployment/GlobalDefaultDisabledTest.java | 4 +- .../deployment/MetricFiltersTest.java | 4 +- .../MetricsFromMetricsFactoryTestCase.java | 4 +- .../deployment/MicrometerDisabledTest.java | 4 +- .../binder/HttpDevModeConfigTest.java | 4 +- .../KafkaClientMetricsDisabledTest.java | 4 +- .../KafkaStreamsMetricsDisabledTest.java | 4 +- .../deployment/binder/UriTagCorsTest.java | 4 +- .../deployment/binder/UriTagTest.java | 4 +- .../UriTagWithHttpApplicationRootTest.java | 4 +- .../binder/UriTagWithHttpRootTest.java | 4 +- .../binder/UriWithMaxTagMeterFilterTest.java | 4 +- .../binder/VertxWithHttpDisabledTest.java | 4 +- .../binder/VertxWithHttpEnabledTest.java | 4 +- .../export/AllRegistriesDisabledTest.java | 4 +- .../JsonAndPrometheusRegistryEnabledTest.java | 4 +- .../export/JsonRegistryEnabledTest.java | 4 +- .../export/NoDefaultPrometheusTest.java | 4 +- .../export/PrometheusEnabledTest.java | 4 +- .../export/SecondPrometheusTest.java | 4 +- .../MicrometerCounterInterceptorTest.java | 4 +- .../MicrometerTimedInterceptorTest.java | 4 +- .../binder/mpmetrics/MpMetricNamingTest.java | 4 +- .../DefaultAndNamedMongoClientConfigTest.java | 4 +- .../mongodb/DefaultMongoClientConfigTest.java | 4 +- .../MongoClientBuildItemConsumerTest.java | 4 +- .../mongodb/MongoClientConfigTest.java | 4 +- .../io/quarkus/mongodb/MongoLazyTest.java | 4 +- .../io/quarkus/mongodb/MongoMetricsTest.java | 4 +- ...amedClientClientBuildItemConsumerTest.java | 4 +- .../mongodb/NamedMongoClientConfigTest.java | 4 +- .../NamedReactiveMongoClientConfigTest.java | 4 +- .../mutiny/deployment/test/MutinyTest.java | 4 +- .../interceptor/TransactionalTest.java | 4 +- ...ansactionalObserversErrorHandlingTest.java | 4 +- .../observers/TransactionalObserversTest.java | 4 +- .../neo4j/deployment/Neo4jDevModeTests.java | 12 ++--- .../filter/OidcClientFilterDevModeTest.java | 4 +- .../NamedOidcClientInjectionTestCase.java | 4 +- ...CredentialsJwtPrivateKeyStoreTestCase.java | 4 +- ...lientCredentialsJwtPrivateKeyTestCase.java | 4 +- ...idcClientCredentialsJwtSecretTestCase.java | 4 +- .../client/OidcClientCredentialsTestCase.java | 4 +- ...lientUserPasswordCustomFilterTestCase.java | 4 +- .../OidcClientUserPasswordTestCase.java | 4 +- .../CodeFlowDevModeDefaultTenantTestCase.java | 4 +- .../oidc/test/CodeFlowDevModeTestCase.java | 4 +- .../oidc/test/SecurityDisabledTestCase.java | 4 +- .../JaegerExporterBadEndpointTest.java | 4 +- .../JaegerExporterDisabledTest.java | 4 +- .../OtlpExporterBadEndpointTest.java | 4 +- .../deployment/OtlpExporterDisabledTest.java | 4 +- .../NonAppEndpointsDisabledTest.java | 4 +- .../NonAppEndpointsEnabledTest.java | 4 +- .../OpenTelemetryContinuousTestingTest.java | 2 +- .../deployment/OpenTelemetryDevModeTest.java | 4 +- .../deployment/OpenTelemetryDisabledTest.java | 4 +- .../OpenTelemetryIdGeneratorTest.java | 4 +- .../OpenTelemetryPropagatorsTest.java | 4 +- .../deployment/OpenTelemetryResourceTest.java | 4 +- .../OpenTelemetrySamplerBeanTest.java | 4 +- .../OpenTelemetrySamplerConfigTest.java | 4 +- .../deployment/TracerDisabledTest.java | 4 +- .../TracerWithInvalidExtensionTest.java | 4 +- .../VertxOpenTelemetryForwardedTest.java | 4 +- .../deployment/VertxOpenTelemetryTest.java | 4 +- .../VertxOpenTelemetryXForwardedTest.java | 4 +- .../test/DuplicateIdEntityTest.java | 4 +- .../test/DuplicateIdWithParentTest.java | 4 +- .../deployment/test/EntityManagerTest.java | 4 +- .../ErroneousConfigHotReloadTestCase.java | 4 +- .../test/InheritanceNoFieldsTestCase.java | 4 +- .../test/PanacheHotReloadTestCase.java | 4 +- .../deployment/test/PanacheJAXBTest.java | 4 +- .../DefaultPersistenceUnitConfigTest.java | 4 +- .../DefaultPersistenceUnitFileTest.java | 4 +- .../ErroneousPersistenceUnitConfigTest.java | 4 +- .../MultiplePersistenceUnitConfigTest.java | 4 +- ...ersistenceUnitConfigForRepositoryTest.java | 4 +- ...PanacheEntityResourceDeleteMethodTest.java | 4 +- .../PanacheEntityResourceDevModeTest.java | 4 +- .../PanacheEntityResourceGetMethodTest.java | 4 +- .../PanacheEntityResourceHotReloadTest.java | 4 +- ...heEntityResourcePathCustomisationTest.java | 4 +- .../PanacheEntityResourcePostMethodTest.java | 4 +- .../PanacheEntityResourcePutMethodTest.java | 4 +- ...cheRepositoryResourceDeleteMethodTest.java | 4 +- .../PanacheRepositoryResourceDevModeTest.java | 4 +- ...anacheRepositoryResourceGetMethodTest.java | 4 +- ...anacheRepositoryResourceHotReloadTest.java | 4 +- ...positoryResourcePathCustomisationTest.java | 4 +- ...nacheRepositoryResourcePostMethodTest.java | 4 +- ...anacheRepositoryResourcePutMethodTest.java | 4 +- .../panache/test/DuplicateIdEntityTest.java | 4 +- .../test/DuplicateIdWithParentTest.java | 4 +- .../test/PanacheHotReloadTestCase.java | 4 +- .../kotlin/deployment/TestEnhancers.java | 2 +- .../panache/DuplicateIdMongoEntityTest.java | 4 +- .../DuplicateIdReactiveMongoEntityTest.java | 4 +- .../panache/DuplicateIdWithParentTest.java | 4 +- .../Bug10812MongodbMultiClientsTest.java | 4 +- .../panache/mongoentity/MongoEntityTest.java | 4 +- .../test/ConcurrentExecutionProceedTest.java | 4 +- .../test/ConcurrentExecutionSkipTest.java | 4 +- .../quartz/test/ConditionalExecutionTest.java | 4 +- .../test/DisabledScheduledMethodTest.java | 4 +- .../quartz/test/DisabledSchedulerTest.java | 4 +- .../test/DuplicateIdentityExpressionTest.java | 4 +- .../quartz/test/HaltedSchedulerTest.java | 6 +-- .../io/quarkus/quartz/test/InjectJobTest.java | 4 +- .../test/InjectQuartzSchedulerTest.java | 4 +- .../test/InvalidCronExpressionTest.java | 4 +- .../test/InvalidDelayedExpressionTest.java | 4 +- .../test/InvalidEveryExpressionTest.java | 4 +- ...validTriggerListenerConfigurationTest.java | 4 +- .../test/MissingConfigCronExpressionTest.java | 4 +- .../MissingConfigIdentityExpressionTest.java | 4 +- .../quartz/test/MissingDataSourceTest.java | 4 +- .../quarkus/quartz/test/NoExpressionTest.java | 4 +- .../test/PausedMethodExpressionTest.java | 4 +- .../quarkus/quartz/test/PausedMethodTest.java | 4 +- .../quartz/test/PausedResumedMethodTest.java | 4 +- .../PropertyDefaultValueSchedulerTest.java | 4 +- .../quartz/test/RegisterJobListenerTest.java | 4 +- .../RegisterLoggingJobHistoryPluginTest.java | 4 +- .../test/RequestScheduledMethodTest.java | 4 +- .../quartz/test/SimpleDelayedTest.java | 4 +- .../quartz/test/SimpleIdentityTest.java | 4 +- .../test/SimpleScheduledMethodTest.java | 4 +- ...upportedClusteredJobConfigurationTest.java | 4 +- .../quartz/test/metrics/MpTimedTest.java | 4 +- .../subclass/InterceptedJobClassTest.java | 4 +- .../io/quarkus/qute/deployment/AsyncTest.java | 4 +- .../quarkus/qute/deployment/EscapingTest.java | 4 +- .../io/quarkus/qute/deployment/MultiTest.java | 4 +- .../quarkus/qute/deployment/OrEmptyTest.java | 4 +- .../PropertyNotFoundDevModeTest.java | 4 +- .../qute/deployment/PropertyNotFoundTest.java | 4 +- .../deployment/ReflectionResolverTest.java | 4 +- .../qute/deployment/TemplateDataTest.java | 4 +- .../TemplateDataValidationTest.java | 4 +- .../qute/deployment/TreeMapDataTest.java | 4 +- .../qute/deployment/VariantTemplateTest.java | 4 +- .../deployment/asyncdata/AsyncDataTest.java | 4 +- .../AdditionalContentTypeTest.java | 4 +- .../CurrentRequestDisabledTest.java | 4 +- .../currentrequest/CurrentRequestTest.java | 4 +- .../devconsole/DevConsolePreviewTest.java | 4 +- .../AdditionalTemplatePathExcludeTest.java | 4 +- .../exclude/TemplatePathExcludeTest.java | 4 +- .../CollectionTemplateExtensionsTest.java | 4 +- .../ConfigTemplateExtensionsTest.java | 4 +- .../ExtensionMethodCompletionStageTest.java | 4 +- .../InvalidExtensionMethodMatchRegexTest.java | 4 +- .../InvalidExtensionMethodNamespaceTest.java | 4 +- .../NamespaceTemplateExtensionTest.java | 4 +- ...emplateExtensionValidationFailureTest.java | 4 +- .../extensions/NoExtensionMethodsTest.java | 4 +- .../NumberTemplateExtensionsTest.java | 4 +- .../StringTemplateExtensionsTest.java | 4 +- .../TemplateExtensionAttributeTest.java | 4 +- .../TemplateExtensionMethodsTest.java | 4 +- .../TimeTemplateExtensionsTest.java | 4 +- .../generatedresolvers/HierarchyTest.java | 4 +- ...MessageBundleExpressionValidationTest.java | 4 +- .../MessageBundleInvalidNamespaceTest.java | 4 +- .../i18n/MessageBundleLocaleTest.java | 4 +- .../i18n/MessageBundleLogicalLineTest.java | 4 +- ...sageBundleMethodMissingAnnotationTest.java | 4 +- .../MessageBundleMethodReturnTypeTest.java | 4 +- .../i18n/MessageBundleNameConflictTest.java | 4 +- ...undleTemplateExpressionValidationTest.java | 4 +- .../deployment/i18n/MessageBundleTest.java | 4 +- .../i18n/MessageBundleValidationTest.java | 4 +- .../deployment/i18n/MessageParamTest.java | 4 +- .../i18n/NestedMessageBundleDevModeTest.java | 4 +- .../qute/deployment/include/IncludeTest.java | 4 +- .../inject/InjectNamespaceResolverTest.java | 4 +- .../qute/deployment/inject/InjectionTest.java | 4 +- .../inject/NamedBeanNotFoundTest.java | 4 +- .../inject/NamedBeanPropertyNotFoundTest.java | 4 +- .../NamedBeanValidationFailureTest.java | 4 +- .../NamedBeanValidationSuccessTest.java | 4 +- .../qute/deployment/loop/LoopTest.java | 4 +- .../PropertyNotFoundNoopTest.java | 4 +- .../PropertyNotFoundOutputOriginalTest.java | 4 +- .../PropertyNotFoundThrowExceptionTest.java | 4 +- .../DoNotRemoveStandaloneLinesTest.java | 4 +- .../scanning/WrongTemplatesDirectoryTest.java | 4 +- .../deployment/tag/UserTagIncludeTest.java | 4 +- .../tag/UserTagNameCollisionTest.java | 4 +- .../qute/deployment/tag/UserTagTest.java | 4 +- .../CheckedTemplateArrayParamTest.java | 4 +- .../typesafe/CheckedTemplateBasePathTest.java | 4 +- .../typesafe/CheckedTemplateConflictTest.java | 4 +- ...eckedTemplateDoNotRequireTypeSafeTest.java | 4 +- .../CheckedTemplateRequireTypeSafeTest.java | 4 +- .../DefaultMethodValidationSuccessTest.java | 4 +- .../InterfaceValidationFailureTest.java | 4 +- .../InterfaceValidationSuccessTest.java | 4 +- .../typesafe/LoopValidationTest.java | 4 +- .../NestedVirtualMethodSuccessTest.java | 4 +- .../typesafe/ObjectValidationSuccessTest.java | 4 +- .../typesafe/ParamDeclarationTest.java | 4 +- .../ParamDeclarationWrongClassTest.java | 4 +- .../typesafe/TypeCheckExcludesTest.java | 4 +- .../typesafe/TypeSafeJavaLangTest.java | 4 +- .../deployment/typesafe/TypeSafeLetTest.java | 4 +- .../typesafe/TypeSafeLoopFailureTest.java | 4 +- .../deployment/typesafe/TypeSafeLoopTest.java | 4 +- .../typesafe/ValidationFailuresTest.java | 4 +- .../typesafe/ValidationSuccessTest.java | 4 +- .../typesafe/WhenValidationFailureTest.java | 4 +- .../typesafe/WhenValidationTest.java | 4 +- .../deployment/varargs/VarargsMethodTest.java | 4 +- .../http/RegistrationForReflectionTest.java | 4 +- .../http/sink/HttpSinkBackpressureTest.java | 4 +- .../http/sink/HttpSinkTest.java | 4 +- .../http/source/HttpSourceTest.java | 4 +- .../websocket/sink/WebSocketSinkTest.java | 4 +- .../websocket/source/WebSocketSourceTest.java | 4 +- .../mssql/client/CredentialsTest.java | 4 +- .../DataSourceHealthCheckExclusionTest.java | 4 +- .../mssql/client/MSSQLPoolProducerTest.java | 4 +- .../mssql/client/MultipleDataSourcesTest.java | 4 +- .../mssql/client/ReactiveMSSQLReloadTest.java | 4 +- .../mysql/client/CredentialsTest.java | 4 +- .../DataSourceHealthCheckExclusionTest.java | 4 +- .../mysql/client/MultipleDataSourcesTest.java | 4 +- .../mysql/client/MySQLPoolProducerTest.java | 4 +- .../mysql/client/ReactiveMySQLReloadTest.java | 4 +- .../reactive/pg/client/CredentialsTest.java | 4 +- .../DataSourceHealthCheckExclusionTest.java | 4 +- .../pg/client/MultipleDataSourcesTest.java | 4 +- .../pg/client/PgPoolProducerTest.java | 4 +- .../pg/client/ReactivePgReloadTest.java | 4 +- .../vertx/web/ConflictingRouteTest.java | 4 +- .../quarkus/vertx/web/DependentRouteTest.java | 4 +- .../vertx/web/DisabledUploadsTest.java | 4 +- .../web/SecureSocketWithKeyStoreTestCase.java | 4 +- .../vertx/web/ServerLimitsConfigTestCase.java | 4 +- .../io/quarkus/vertx/web/SimpleRouteTest.java | 4 +- .../vertx/web/UploadsDirectoryTest.java | 4 +- .../vertx/web/VertxWebDevModeTestCase.java | 4 +- .../quarkus/vertx/web/base/RouteBaseTest.java | 4 +- .../vertx/web/blocking/BlockingRouteTest.java | 4 +- .../web/cors/CORSDisabledHandlerTestCase.java | 4 +- .../cors/CORSFullConfigHandlerTestCase.java | 4 +- .../vertx/web/cors/CORSHandlerTestCase.java | 4 +- .../web/cs/CompletionStageRouteTest.java | 4 +- .../web/failure/FailureHandlerPathTest.java | 4 +- .../vertx/web/failure/FailureHandlerTest.java | 4 +- ...ipleThrowableParamsFailureHandlerTest.java | 4 +- .../ThrowableParamNormalHandlerTest.java | 4 +- .../filter/InvalidFilterParametersTest.java | 4 +- ...erFilterRequestContextPropagationTest.java | 4 +- .../vertx/web/filter/UserFilterTest.java | 4 +- .../vertx/web/mutiny/JsonMultiRouteTest.java | 4 +- .../vertx/web/mutiny/MultiRouteTest.java | 4 +- .../web/mutiny/NdjsonMultiRouteTest.java | 4 +- .../vertx/web/mutiny/RawMutinyTest.java | 4 +- .../quarkus/vertx/web/mutiny/RawUniTest.java | 4 +- .../vertx/web/mutiny/SSEMultiRouteTest.java | 4 +- .../vertx/web/mutiny/SyncRouteTest.java | 4 +- .../vertx/web/mutiny/UniRouteTest.java | 4 +- .../params/InvalidPathParameterNameTest.java | 4 +- .../InvalidRouteMethodParametersTest.java | 4 +- .../web/params/RouteMethodParametersTest.java | 4 +- .../web/params/VoidInvalidParameterTest.java | 4 +- .../RequestContextPropagationTest.java | 4 +- .../web/validation/MultiValidationTest.java | 4 +- .../web/validation/SyncValidationTest.java | 4 +- .../web/validation/UniValidationTest.java | 4 +- ...ReactiveStreamsOperatorsHotReloadTest.java | 4 +- .../ReactiveStreamsOperatorsUsageTest.java | 4 +- ...ReactiveStreamsOperatorsHotReloadTest.java | 4 +- .../ReactiveStreamsOperatorsUsageTest.java | 4 +- .../deployment/JacksonRestClientTest.java | 4 +- .../jaxb/deployment/JaxbRestClientTest.java | 4 +- .../jsonb/deployment/JsonbRestClientTest.java | 4 +- .../deployment/MutinyRestClientTest.java | 4 +- .../configuration/MPRestClientsTest.java | 4 +- .../QuarkusConfigurationTest.java | 4 +- .../configuration/QuarkusRestClientsTest.java | 4 +- ...stClientExceptionOriginalBehaviorTest.java | 4 +- .../exception/RestClientExceptionTest.java | 4 +- .../ft/AsyncRestClientFallbackTest.java | 4 +- .../restclient/ft/RestClientFallbackTest.java | 4 +- .../RestClientInterceptorTest.java | 4 +- .../RegisterClientHeadersTest.java | 4 +- .../ProviderClientRegistrationTest.java | 4 +- .../RegisterProviderTest.java | 4 +- .../resteasy/jackson/JsonViewTest.java | 4 +- .../jackson/MultipleTimeModuleTest.java | 4 +- .../resteasy/jackson/NoMediaTypeTest.java | 4 +- .../jaxb/deployment/ConsumesXMLTestCase.java | 4 +- .../jaxb/deployment/ProducesXMLTestCase.java | 4 +- .../resteasy/jsonb/NoMediaTypeTest.java | 4 +- .../VertxSerializerRegistrationTest.java | 4 +- .../multipart/InvalidEncodingTest.java | 4 +- .../multipart/MultipartEncodingTest.java | 4 +- .../parttype/PartTypeMultipartTest.java | 4 +- .../mutiny/test/RestEasyMutinyTest.java | 4 +- .../vertx/RestEasyMutinyWithJsonTest.java | 4 +- .../deployment/MessageBundleDevModeTest.java | 4 +- .../MessageBundleLocaleFromVariantTest.java | 4 +- .../deployment/MissingTemplateTest.java | 4 +- .../TemplateResponseFilterTest.java | 4 +- .../resteasy/deployment/TypeErrorTest.java | 4 +- .../resteasy/deployment/TypeErrorTest3.java | 4 +- .../deployment/VariantTemplateTest.java | 4 +- .../test/CacheControlFeatureTest.java | 4 +- .../test/ClasspathResourceTestCase.java | 4 +- .../ConstructorInjectionResourceTestCase.java | 4 +- .../resteasy/test/ContentLengthTestCase.java | 4 +- .../io/quarkus/resteasy/test/ContextTest.java | 4 +- .../io/quarkus/resteasy/test/CookieTest.java | 4 +- .../test/CustomExceptionMapperTestCase.java | 4 +- .../ExceptionReturnStatusAndBodyTest.java | 4 +- .../resteasy/test/ForwardedEnabledTest.java | 4 +- .../resteasy/test/IncompletePostTestCase.java | 4 +- .../resteasy/test/JsonProviderTestCase.java | 4 +- .../resteasy/test/MaxRequestSizeTestCase.java | 4 +- ...tFoundExceptionMapperHttpRootTestCase.java | 4 +- ...onMapperHttpRootTrailingSlashTestCase.java | 4 +- .../test/NotFoundExceptionMapperTestCase.java | 4 +- .../resteasy/test/NullHeaderTestCase.java | 4 +- .../test/PathInterfaceImplementorTest.java | 4 +- .../resteasy/test/ReadTimeoutTestCase.java | 4 +- .../resteasy/test/RestEasyCORSTestCase.java | 4 +- .../test/RestEasyDevModeTestCase.java | 4 +- .../test/RestEasyRootResourceTestCase.java | 4 +- .../resteasy/test/VertxIOHangTestCase.java | 4 +- .../resteasy/test/asyncio/AsyncIOTest.java | 4 +- .../test/asyncio/AsyncIOUndertowTest.java | 4 +- .../resteasy/test/cdi/BeanGenerationTest.java | 4 +- .../config/ConfigMappingWithProviderTest.java | 4 +- .../resteasy/test/files/NoResourceTest.java | 4 +- .../StaticFileWithResourcesHttpRootTest.java | 4 +- .../files/StaticFileWithResourcesTest.java | 4 +- .../files/StaticFileWithoutResourcesTest.java | 4 +- ...esourceDeletionBeforeFirstRequestTest.java | 4 +- .../resteasy/test/gzip/GZipResourceTest.java | 4 +- .../test/multipart/MultipartResourceTest.java | 6 +-- .../root/ApplicationPathHttpRootTest.java | 4 +- .../test/root/ApplicationPathTest.java | 4 +- .../resteasy/test/root/ApplicationTest.java | 4 +- .../resteasy/test/root/BuildProfileTest.java | 4 +- .../resteasy/test/route/UserRouteTest.java | 4 +- .../DefaultRolesAllowedJaxRsTest.java | 4 +- .../DefaultRolesAllowedStarJaxRsTest.java | 4 +- .../test/security/DenyAllJaxRsTest.java | 4 +- .../LazyAuthRolesAllowedJaxRsTestCase.java | 4 +- ...tityLazyAuthRolesAllowedJaxRsTestCase.java | 4 +- .../security/RolesAllowedJaxRsTestCase.java | 4 +- .../resteasy/test/sse/SseTestCase.java | 4 +- .../SubresourceLocatorHttpRootTest.java | 4 +- .../subresource/SubresourceLocatorTest.java | 4 +- .../test/AsyncRestClientFilterTestCase.java | 4 +- .../test/ClientResponseFilterTestCase.java | 4 +- .../deployment/test/FailureTestCase.java | 4 +- .../deployment/test/UniInvokerTestCase.java | 4 +- .../jaxb/deployment/test/EmptyInputTest.java | 4 +- .../jaxb/deployment/test/SimpleXmlTest.java | 4 +- .../jaxb/deployment/test/SseResourceTest.java | 4 +- .../deployment/test/sse/SseTestCase.java | 4 +- .../deployment/RestLinksInjectionTest.java | 4 +- .../deployment/MessageBundleDevModeTest.java | 4 +- .../qute/deployment/MissingTemplateTest.java | 4 +- .../TemplateResponseFilterTest.java | 4 +- .../qute/deployment/TypeErrorTest.java | 4 +- .../qute/deployment/TypeErrorTest3.java | 4 +- .../qute/deployment/VariantTemplateTest.java | 4 +- .../client/test/ContentTypeHeaderTest.java | 4 +- .../GeneratedJaxRsResourceTest.java | 4 +- .../test/headers/ResponseHeaderTest.java | 4 +- .../test/multipart/InvalidEncodingTest.java | 4 +- .../test/path/RelativeRestPathTestCase.java | 4 +- .../path/RestApplicationPathTestCase.java | 4 +- .../server/test/path/RestPathTestCase.java | 4 +- .../server/test/providers/FileTestCase.java | 4 +- .../test/providers/InvalidFileTestCase.java | 4 +- .../test/response/NullHeaderTestCase.java | 4 +- .../DefaultRolesAllowedJaxRsTest.java | 4 +- .../DefaultRolesAllowedStarJaxRsTest.java | 4 +- .../test/security/DenyAllJaxRsTest.java | 4 +- .../LazyAuthRolesAllowedJaxRsTestCase.java | 4 +- ...tityLazyAuthRolesAllowedJaxRsTestCase.java | 4 +- .../security/RolesAllowedJaxRsTestCase.java | 4 +- .../SecurityWithMethodGenericsTest.java | 4 +- .../server/test/simple/ApplicationTest.java | 4 +- .../server/test/simple/BuildProfileTest.java | 4 +- .../test/simple/InterfaceWithImplTest.java | 4 +- ...lDateCustomParamConverterProviderTest.java | 4 +- .../test/simple/LocalDateParamTest.java | 4 +- .../test/simple/RawListQueryParamTest.java | 4 +- .../test/status/ResponseStatusTest.java | 4 +- .../server/test/stream/StreamTestCase.java | 4 +- .../test/stress/SuspendResumeStressTest.java | 4 +- .../AnnotationTransformationTest.java | 4 +- .../test/websocket/WebSocketTestCase.java | 4 +- .../test/BadRequestNotPropagatedTestCase.java | 4 +- .../reactive/jackson/test/MultiSseTest.java | 4 +- .../rest/client/reactive/AsyncHeaderTest.java | 4 +- .../client/reactive/BasicRestClientTest.java | 4 +- .../reactive/ClassNameScopeOverrideTest.java | 4 +- .../ClientAndServerSharingResponseTest.java | 4 +- .../reactive/ConfigKeyScopeOverrideTest.java | 4 +- .../client/reactive/ConfigurationTest.java | 4 +- .../reactive/LegacyConfigurationTest.java | 4 +- .../MpClassNameScopeOverrideTest.java | 4 +- .../MpConfigKeyScopeOverrideTest.java | 4 +- .../reactive/MpGlobalScopeOverrideTest.java | 4 +- .../reactive/MultipartFilenameTest.java | 4 +- .../client/reactive/NoPathInTheAppTest.java | 4 +- .../reactive/ShortNameScopeOverrideTest.java | 4 +- .../reactive/error/ErrorMappingTest.java | 4 +- .../error/ResponseExceptionMapperTest.java | 4 +- .../client/reactive/form/FormParamTest.java | 4 +- .../ft/AsyncRestClientFallbackTest.java | 4 +- .../reactive/ft/RestClientFallbackTest.java | 4 +- .../ft/UniRestClientFallbackTest.java | 4 +- .../ClientHeaderParamFromPropertyTest.java | 4 +- .../client/reactive/headers/CookieTest.java | 4 +- .../client/reactive/headers/HeaderTest.java | 4 +- .../RestClientReactiveBlockingTest.java | 4 +- .../ProviderDisabledAutodiscoveryTest.java | 4 +- .../provider/ProviderPriorityTest.java | 4 +- .../reactive/provider/ProviderTest.java | 4 +- .../reactive/redirect/RedirectTest.java | 4 +- .../client/reactive/ssl/TrustAllTest.java | 4 +- .../reactive/stork/StorkDevModeTest.java | 4 +- .../reactive/stork/StorkIntegrationTest.java | 4 +- .../StorkResponseTimeLoadBalancerTest.java | 4 +- .../reactive/subresource/SubResourceTest.java | 4 +- .../timeout/BuilderReadTimeoutTest.java | 4 +- .../timeout/RegisterReadTimeoutTest.java | 4 +- ...mpleScheduledMethodDefaultPackageTest.java | 4 +- .../test/ConcurrentExecutionProceedTest.java | 4 +- .../test/ConcurrentExecutionSkipTest.java | 4 +- .../test/ConditionalExecutionTest.java | 4 +- .../test/DisabledScheduledMethodTest.java | 4 +- .../scheduler/test/DisabledSchedulerTest.java | 4 +- .../test/DuplicateIdentityExpressionTest.java | 4 +- .../test/DuplicateJobIdentityTest.java | 4 +- .../test/InvalidConditionalExecutionTest.java | 4 +- .../test/InvalidCronExpressionTest.java | 4 +- .../test/InvalidDelayedExpressionTest.java | 4 +- .../test/InvalidEveryExpressionTest.java | 4 +- .../test/InvalidScheduledMethodTest.java | 4 +- .../test/MissingConfigCronExpressionTest.java | 4 +- .../MissingConfigIdentityExpressionTest.java | 4 +- .../scheduler/test/NoExpressionTest.java | 4 +- .../test/PausedMethodExpressionTest.java | 4 +- .../scheduler/test/PausedMethodTest.java | 4 +- .../test/PausedResumedMethodTest.java | 4 +- .../scheduler/test/PausedSchedulerTest.java | 4 +- .../PropertyDefaultValueSchedulerTest.java | 4 +- .../test/RequestScheduledMethodTest.java | 4 +- .../scheduler/test/SimpleDelayedTest.java | 4 +- .../scheduler/test/SimpleIdentityTest.java | 4 +- .../test/SimpleScheduledMethodTest.java | 4 +- .../DevConsoleRunScheduledTaskTest.java | 4 +- .../test/metrics/MicrometerTimedTest.java | 4 +- .../jpa/BcryptPasswordMapperTest.java | 4 +- ...stomIdentityProviderConfigurationTest.java | 4 +- .../jpa/CustomPasswordMapperTest.java | 4 +- .../jpa/MinimalConfigurationTest.java | 4 +- .../MultipleEntitiesConfigurationTest.java | 4 +- ...pleRolesInCollectionConfigurationTest.java | 4 +- .../security/jpa/MultipleRolesTest.java | 4 +- .../jpa/NaturalIdConfigurationTest.java | 4 +- .../jpa/PanacheEntitiesConfigurationTest.java | 4 +- ...atedDifferentBouncycastleProviderTest.java | 4 +- ...icatedTheSameBouncycastleProviderTest.java | 4 +- .../test/cdi/CDIAccessDefaultTest.java | 4 +- .../cdi/CDIAccessDenyUnannotatedTest.java | 4 +- .../SecurityAnnotationOnFinalMethodTest.java | 4 +- ...inalMethodWithDisableFinalRemovalTest.java | 4 +- .../deployment/test/AllClearedConfigTest.java | 4 +- .../test/AllUnchangedConfigTest.java | 4 +- .../context/deployment/test/NoConfigTest.java | 4 +- .../test/FaultToleranceTest.java | 4 +- .../additional/BlockingAsyncTest.java | 4 +- .../BlockingNonBlockingOnClassTest.java | 4 +- .../BlockingNonBlockingOnMethodTest.java | 4 +- .../additional/NonblockingAsyncTest.java | 4 +- .../FaultToleranceContextPropagationTest.java | 4 +- .../noncompat/NoncompatAsyncTest.java | 4 +- .../mutiny/MutinyFaultToleranceTest.java | 4 +- .../CircuitBreakerNameInheritanceTest.java | 4 +- .../DuplicateCircuitBreakerNameTest.java | 4 +- .../backoff/ClassAndMethodBackoffTest.java | 4 +- .../RetryOnClassBackoffOnMethodTest.java | 4 +- .../RetryOnMethodBackoffOnClassTest.java | 4 +- .../backoff/TwoBackoffsOnMethodTest.java | 4 +- .../DynamicGraphQLClientInjectionTest.java | 4 +- ...LClientInjectionWithQuarkusConfigTest.java | 4 +- .../DynamicGraphQLClientMissingUrlTest.java | 4 +- ...micGraphQLClientProgrammaticUsageTest.java | 4 +- .../TypesafeGraphQLClientFQNameTest.java | 4 +- .../TypesafeGraphQLClientInjectionTest.java | 4 +- ...LClientInjectionWithQuarkusConfigTest.java | 4 +- .../TypesafeGraphQLClientMissingUrlTest.java | 4 +- ...afeGraphQLClientProgrammaticUsageTest.java | 4 +- .../TypesafeGraphQLClientShortcutTest.java | 4 +- .../deployment/CompletionStageTest.java | 6 +-- .../GraphQLCDIContextPropagationTest.java | 4 +- .../deployment/GraphQLConfigMappingTest.java | 4 +- .../deployment/GraphQLGroupedTest.java | 4 +- .../graphql/deployment/GraphQLNamingTest.java | 4 +- .../deployment/GraphQLOverHttpTest.java | 4 +- .../GraphQLSchemaUnavailableTest.java | 4 +- .../graphql/deployment/GraphQLTest.java | 4 +- .../GraphQLTracingDisabledTest.java | 4 +- .../deployment/GraphQLTracingTest.java | 4 +- .../graphql/deployment/HotReloadTest.java | 4 +- .../deployment/InjectRoutingContextTest.java | 4 +- .../deployment/MetricsDisabledTest.java | 4 +- .../graphql/deployment/MetricsTest.java | 4 +- .../deployment/RequestContextTest.java | 4 +- .../graphql/deployment/SecurityTest.java | 4 +- .../SmallRyeGraphQLContextTestCase.java | 4 +- .../smallrye/graphql/deployment/UniTest.java | 6 +-- .../deployment/ui/CustomConfigTest.java | 4 +- .../graphql/deployment/ui/DisabledTest.java | 4 +- .../deployment/ui/ErroneousConfigTest.java | 4 +- .../test/AsyncDispatchedThreadTest.java | 4 +- .../health/test/DispatchedThreadTest.java | 4 +- .../health/test/ExpectedBeansUnitTest.java | 4 +- .../smallrye/health/test/FailingUnitTest.java | 4 +- .../HealthCheckContextPropagationTest.java | 4 +- .../test/HealthCheckDefaultScopeTest.java | 4 +- .../HealthCheckProducerDefaultScopeTest.java | 4 +- .../health/test/HealthOpenAPITest.java | 4 +- .../smallrye/health/test/HealthUnitTest.java | 4 +- .../health/test/StartedHealthCheckTest.java | 4 +- .../health/test/WellnessHealthCheckTest.java | 4 +- .../health/test/ui/CustomConfigTest.java | 4 +- .../smallrye/health/test/ui/DisabledTest.java | 4 +- .../health/test/ui/ErroneousConfigTest.java | 4 +- .../quarkus/jwt/build/JwtBuildUnitTest.java | 4 +- .../DefaultGroupsCustomFactoryUnitTest.java | 4 +- .../DefaultGroupsSignEncryptUnitTest.java | 4 +- .../jwt/test/DefaultGroupsUnitTest.java | 4 +- .../io/quarkus/jwt/test/JwtAuthUnitTest.java | 4 +- .../jwt/test/JwtCookieDevModeTestCase.java | 4 +- .../quarkus/jwt/test/JwtCookieUnitTest.java | 4 +- .../jwt/test/PrimitiveInjectionUnitTest.java | 4 +- .../jwt/test/PrincipalInjectionUnitTest.java | 4 +- .../jwt/test/RequiredClaimsUnitTest.java | 4 +- .../jwt/test/RolesAllowedUnitTest.java | 4 +- .../io/quarkus/jwt/test/ScopingUnitTest.java | 4 +- .../jwt/test/SmallRyeJwtDisabledTest.java | 4 +- .../test/java/DefaultPackageMetricsTest.java | 4 +- .../deployment/DevModeMetricRegistryTest.java | 4 +- .../deployment/DevModeMetricsTest.java | 4 +- .../metrics/jaxrs/JaxRsMetricsTestCase.java | 4 +- .../registration/DefaultMethodTest.java | 4 +- .../StereotypeCountedClassTest.java | 4 +- .../MetricsFromExtensionDisabledTestCase.java | 4 +- .../test/MetricsFromExtensionTestCase.java | 4 +- .../MetricsFromMetricsFactoryTestCase.java | 4 +- .../metrics/test/MetricsHandlerPathTest.java | 4 +- ...icrometerMetricsCompatibilityModeTest.java | 4 +- ...PiEndpointInNotFoundExceptionPageTest.java | 4 +- .../test/hotreload/OpenApiHotReloadTest.java | 4 +- .../AutoSecurityRequirementTestCase.java | 4 +- .../openapi/test/jaxrs/AutoTagTestCase.java | 4 +- .../BasicSecurityWithConfigTestCase.java | 4 +- .../openapi/test/jaxrs/ConfigMappingTest.java | 4 +- .../test/jaxrs/DefaultContentTypeTest.java | 4 +- .../jaxrs/JWTSecurityWithConfigTestCase.java | 4 +- .../jaxrs/OIDCSecurityWithConfigTestCase.java | 4 +- ...th2ImplicitSecurityWithConfigTestCase.java | 4 +- .../jaxrs/OpenApiDefaultPathTestCase.java | 4 +- .../jaxrs/OpenApiDynamicFilterTestCase.java | 4 +- .../OpenApiHttpRootDefaultPathTestCase.java | 4 +- .../OpenApiPathWithSegmentsTestCase.java | 4 +- .../OpenApiPathWithoutSegmentsTestCase.java | 4 +- .../jaxrs/OpenApiRuntimeFilterTestCase.java | 4 +- .../jaxrs/OpenApiStaticModelsTestCase.java | 4 +- .../jaxrs/OpenApiStoreSchemaTestCase.java | 4 +- .../test/jaxrs/OpenApiWithConfigTestCase.java | 4 +- ...steasyPathHttpRootDefaultPathTestCase.java | 4 +- .../OpenApiWithResteasyPathTestCase.java | 4 +- ...SwaggerAndOpenAPIWithCommonPrefixTest.java | 4 +- .../vertx/OpenApiDefaultPathTestCase.java | 6 +-- .../OpenApiHttpRootDefaultPathTestCase.java | 6 +-- .../OpenApiPathWithSegmentsTestCase.java | 6 +-- .../OpenApiPathWithoutSegmentsTestCase.java | 6 +-- .../vertx/OpenApiStoreSchemaTestCase.java | 4 +- .../test/vertx/OpenApiWithConfigTestCase.java | 6 +-- ...SwaggerAndOpenAPIWithCommonPrefixTest.java | 6 +-- .../opentracing/deployment/TracingTest.java | 4 +- .../amqp/devmode/AmqpDevModeTest.java | 4 +- .../devmode/nohttp/AmqpDevModeNoHttpTest.java | 4 +- .../smallrye/reactivemessaging/ChainTest.java | 4 +- .../reactivemessaging/DefaultScopeTest.java | 4 +- .../ReactiveMessagingTest.java | 4 +- .../SmallRyeBlockingSubscriberTest.java | 6 +-- .../blocking/BlockingPublisherTest.java | 4 +- .../blocking/BlockingSubscriberTest.java | 4 +- .../blocking/BlockingValidationErrorTest.java | 4 +- ...ingWithoutOutgoingOnIncomingErrorTest.java | 4 +- .../SmallRyeBlockingPublisherTest.java | 4 +- .../SmallRyeBlockingSubscriberTest.java | 4 +- .../channels/DeprecatedInjectionTest.java | 4 +- ...EmitterWithBroadcastAndSubscriberTest.java | 4 +- .../channels/EmitterWithBroadcastTest.java | 4 +- .../EmitterWithOverflowAndBroadcastTest.java | 4 +- .../channels/EmitterWithOverflowTest.java | 4 +- .../channels/MutinyEmitterTest.java | 4 +- ...nyEmitterWithConstructorInjectionTest.java | 4 +- ...tinyEmitterWithParameterInjectionTest.java | 4 +- .../config/ConnectorConfigTest.java | 4 +- .../config/ConnectorProfileConfigTest.java | 4 +- .../converters/ConverterTest.java | 4 +- .../devmode/ConfigurationLiveReloadTest.java | 4 +- .../reactivemessaging/mutiny/MultiTest.java | 4 +- .../reactivemessaging/mutiny/UniTest.java | 4 +- .../signatures/IncomingsTest.java | 4 +- .../signatures/ProcessorSignatureTest.java | 4 +- .../signatures/PublisherSignatureTest.java | 4 +- .../signatures/SubscriberSignatureTest.java | 4 +- .../signatures/TransformerSignatureTest.java | 4 +- .../data/devmode/RepositoryReloadTest.java | 4 +- .../rest/crud/DefaultCrudResourceTest.java | 4 +- .../rest/crud/ModifiedCrudResourceTest.java | 4 +- .../rest/paged/DefaultPagedResourceTest.java | 4 +- .../rest/paged/ModifiedPagedResourceTest.java | 4 +- .../spring/di/deployment/BeanNameTest.java | 4 +- .../BeanWithoutConfigurationTest.java | 4 +- .../spring/di/deployment/SpelTest.java | 4 +- .../deployment/InvalidCronExpressionTest.java | 4 +- .../RepeatedScheduledMethodTest.java | 4 +- .../deployment/ScheduledMethodNoBeanTest.java | 4 +- .../deployment/SpringDelayedTest.java | 4 +- .../deployment/SpringScheduledMethodTest.java | 4 +- .../UnsupportedFixedDelayParamTest.java | 4 +- .../UnsupportedFixedDelayStringParamTest.java | 4 +- .../UnsupportedInitialDelayForCronTest.java | 4 +- .../AnnotationChangeReloadTest.java | 4 +- .../deployment/BeanMethodCheckTest.java | 4 +- .../deployment/MetaAnnotationsTest.java | 4 +- .../SecurityAnnotationMixingTest.java | 4 +- .../SpringPreAuthorizeClassAnnotatedTest.java | 4 +- .../deployment/SpringPreAuthorizeTest.java | 4 +- ...SpringPreAuthorizeWithExpressionsTest.java | 4 +- .../SpringSecuredAnnotatedTest.java | 4 +- .../spring/web/test/ControllerReloadTest.java | 4 +- .../web/test/MissingRestControllerTest.java | 4 +- ...ResponseStatusAndExceptionHandlerTest.java | 4 +- .../web/test/SimpleSpringControllerTest.java | 4 +- .../spring/web/test/BasicMappingTest.java | 4 +- ...ResponseStatusAndExceptionHandlerTest.java | 4 +- .../deployment/CustomConfigTest.java | 4 +- .../deployment/CustomHttpRootTest.java | 4 +- .../swaggerui/deployment/DisabledTest.java | 4 +- .../deployment/ErroneousConfigTest.java | 4 +- .../deployment/ErroneousConfigTest2.java | 4 +- .../swaggerui/deployment/NoConfigTest.java | 4 +- .../deployment/SwaggerOptionsTest.java | 4 +- .../deployment/TikaProcessorDevModeTest.java | 4 +- .../AnnotatedServletInitParamsTestCase.java | 4 +- .../test/AnnotatedServletTestCase.java | 4 +- .../test/AnnotationServletTestCase.java | 4 +- .../test/AnnotationWithWebXmlTestCase.java | 4 +- .../undertow/test/ContextPathTestCase.java | 4 +- .../undertow/test/ErrorServletTestCase.java | 4 +- .../LazyAuthRolesAllowedServletTestCase.java | 4 +- .../undertow/test/MaxParametersTestCase.java | 4 +- .../test/MultipartConfigTestCase.java | 4 +- .../test/RolesAllowedServletTestCase.java | 4 +- .../ServletContainerInitializerTestCase.java | 4 +- .../test/ServletContextInjectionTestCase.java | 4 +- .../undertow/test/ServletDestroyTestCase.java | 4 +- .../test/ServletEmptyWebXmlTestCase.java | 4 +- .../test/ServletSecurityTestCase.java | 4 +- .../ServletWebFragmentXmlMergingTestCase.java | 4 +- .../test/ServletWebFragmentXmlTestCase.java | 4 +- .../test/ServletWebXmlInitParamsTestCase.java | 4 +- .../test/ServletWebXmlSecurityTestCase.java | 4 +- .../undertow/test/ServletWebXmlTestCase.java | 4 +- .../test/UndertowHandlersConfTestCase.java | 4 +- .../WebFilterWithNoUrlPatternTestCase.java | 4 +- .../ServletBuiltinBeanTestCase.java | 4 +- .../test/push/Http2ServerPushTestCase.java | 4 +- .../SessionContextTestCase.java | 4 +- .../test/timeout/ReadTimeoutTestCase.java | 4 +- .../deployment/ErroneousConfigTest.java | 4 +- .../ServingUIFromCustomPathTest.java | 4 +- .../ServingUIFromDefaultPathTest.java | 4 +- .../io/quarkus/vertx/http/BadRequestTest.java | 4 +- .../quarkus/vertx/http/CompressionTest.java | 4 +- .../http/ConfigureForwardedHeadersTest.java | 4 +- .../vertx/http/ConnectionLimitsTest.java | 4 +- .../quarkus/vertx/http/DecompressionTest.java | 4 +- .../vertx/http/DisableHttpPortTest.java | 4 +- .../vertx/http/ForwardedHeaderTest.java | 4 +- .../vertx/http/ForwardedPrefixHeaderTest.java | 4 +- .../http/NonApplicationAndRootPathTest.java | 4 +- .../vertx/http/NonApplicationEscapeTest.java | 4 +- .../NonApplicationRootPathSiblingTest.java | 4 +- .../io/quarkus/vertx/http/RandomPortTest.java | 4 +- .../io/quarkus/vertx/http/RootPathTest.java | 4 +- .../vertx/http/UnhandledExceptionTest.java | 4 +- .../vertx/http/UserRouteRegistrationTest.java | 4 +- .../cors/CORSDisabledHandlerTestCase.java | 4 +- .../cors/CORSFullConfigHandlerTestCase.java | 4 +- .../vertx/http/cors/CORSHandlerTestCase.java | 4 +- .../CORSHandlerTestWildcardOriginCase.java | 4 +- ...DevConsoleConfigEditorBodyHandlerTest.java | 4 +- .../DevConsoleConfigEditorTest.java | 4 +- .../http/devconsole/FixConfigOnErrorTest.java | 4 +- .../vertx/http/devmode/ArcEndpointTest.java | 4 +- .../http/devmode/CompileProblemTest.java | 4 +- .../http/devmode/LiveReloadArtifactTest.java | 4 +- .../http/devmode/ParentFirstArtifactTest.java | 4 +- .../vertx/http/filters/UserFilterTest.java | 4 +- .../hotreload/HotReloadWithFilterTest.java | 4 +- .../hotreload/HotReloadWithRouteTest.java | 4 +- .../http/hotreload/VertxInjectionTest.java | 4 +- .../quarkus/vertx/http/http2/Http2Test.java | 4 +- .../vertx/http/router/RouterEventTest.java | 4 +- .../security/DisabledPermissionTestCase.java | 4 +- .../security/MtlsRequestBasicAuthTest.java | 4 +- .../vertx/http/security/MtlsRequestTest.java | 4 +- .../vertx/http/security/MtlsRequiredTest.java | 4 +- .../vertx/http/ssl/SslServerWithJksTest.java | 4 +- .../vertx/http/ssl/SslServerWithP12Test.java | 4 +- .../vertx/http/ssl/SslServerWithPemTest.java | 4 +- .../io/quarkus/vertx/VertxInjectionTest.java | 4 +- .../MessageConsumerContextTest.java | 4 +- .../MessageConsumerFailureTest.java | 4 +- .../deployment/MessageConsumerMethodTest.java | 4 +- .../RequestContextTerminationTest.java | 4 +- .../VerticleWithClassNameDeploymentTest.java | 4 +- .../VerticleWithInstanceDeploymentTest.java | 4 +- .../deployment/VertxCommonProducerTest.java | 4 +- .../vertx/deployment/VertxInjectionTest.java | 4 +- .../vertx/deployment/VertxLoggingTest.java | 4 +- .../vertx/deployment/VertxProducerTest.java | 4 +- .../test/WebJarLocatorDevModeTest.java | 4 +- .../locator/test/WebJarLocatorTest.java | 4 +- .../MultipleContainerImageExtensionTest.java | 4 +- .../SingleContainerImageExtensionTest.java | 4 +- .../devconsole/DevConsoleArcSmokeTest.java | 4 +- .../devconsole/DevConsoleCacheSmokeTest.java | 4 +- .../devconsole/DevConsoleConfigSmokeTest.java | 4 +- .../DevConsoleContainerImageSmokeTest.java | 4 +- .../devconsole/DevConsoleGrpcSmokeTest.java | 4 +- .../DevConsoleHibernateOrmSmokeTest.java | 4 +- .../devconsole/DevConsoleOidcSmokeTest.java | 4 +- .../devconsole/DevConsoleQuteSmokeTest.java | 4 +- .../DevConsoleReactiveMessagingSmokeTest.java | 4 +- .../DevConsoleResteastyReactiveSmokeTest.java | 4 +- .../DevConsoleSchedulerSmokeTest.java | 4 +- .../test/devconsole/DevConsoleSmokeTest.java | 4 +- .../no/src/main/NoSrcMainDevModeTest.java | 4 +- .../test/no/src/main/NoSrcMainUnitTest.java | 4 +- ...AdditionalWatchedResourcesDevModeTest.java | 4 +- .../vertx/ConsumeUuidEventHotReloadTest.java | 4 +- .../MutinyVerticleClassnameHotReloadTest.java | 4 +- .../MutinyVerticleInstanceHotReloadTest.java | 4 +- .../vertx/VerticleClassnameHotReloadTest.java | 4 +- .../vertx/VerticleInstanceHotReloadTest.java | 4 +- .../java/DefaultPackageWithFastJarPMT.java | 4 +- .../quarkus/it/panache/DDLGenerationPMT.java | 4 +- .../io/quarkus/it/panache/NoPagingPMT.java | 4 +- .../java/DefaultPackageWithFastJarPMT.java | 4 +- .../it/panache/reactive/NoPagingPMT.java | 4 +- .../client/AbsentConfigMapPropertiesPMT.java | 4 +- .../kubernetes/kafka/BasicKubernetesTest.java | 4 +- .../kubernetes/kafka/BasicMinikubeTest.java | 4 +- .../kubernetes/kafka/BasicOpenshiftTest.java | 4 +- .../it/kubernetes/BasicKubernetesTest.java | 4 +- .../it/kubernetes/BasicOpenshiftTest.java | 4 +- ...ratedKubernetesResourcesBuildItemTest.java | 4 +- .../kubernetes/KnativeClusterLocalTest.java | 4 +- .../kubernetes/KnativeContainerImageTest.java | 4 +- .../KnativeGlobalContainerConcurrency.java | 4 +- .../KnativeGlobalRequestsPerSecond.java | 4 +- .../it/kubernetes/KnativeScaleBoundsTest.java | 4 +- .../it/kubernetes/KnativeScaleToZeroTest.java | 4 +- .../io/quarkus/it/kubernetes/KnativeTest.java | 4 +- .../KnativeWithApplicationPropertiesTest.java | 4 +- .../it/kubernetes/KnativeWithHealthTest.java | 4 +- .../KnativeWithSecretConfigTest.java | 4 +- .../KnativeWithTrafficSplitting.java | 4 +- .../it/kubernetes/KnativeWithVolumesTest.java | 4 +- ...MinikubeWithApplicationPropertiesTest.java | 4 +- .../KubernetesConfigWithSecretsTest.java | 4 +- .../KubernetesInitContainersTest.java | 4 +- .../KubernetesServiceMappingTest.java | 4 +- ...bernetesWithApplicationPropertiesTest.java | 4 +- .../KubernetesWithArgumentsTest.java | 4 +- .../kubernetes/KubernetesWithCommandTest.java | 4 +- ...KubernetesWithConfigMapCustomModeTest.java | 4 +- .../KubernetesWithConfigMapTest.java | 4 +- ...tesWithConflictingEnvFromResourceTest.java | 4 +- .../KubernetesWithConflictingEnvTest.java | 4 +- .../KubernetesWithCustomResourcesTest.java | 4 +- .../KubernetesWithDefaultsTest.java | 4 +- ...ubernetesWithDeprecatedPropertiesTest.java | 4 +- .../KubernetesWithEnvFromConfigMapTest.java | 4 +- .../KubernetesWithEnvFromFieldTest.java | 4 +- .../KubernetesWithEnvFromSecretTest.java | 4 +- .../KubernetesWithGitlabLikeImageTest.java | 4 +- .../KubernetesWithHealthAndJibTest.java | 4 +- .../kubernetes/KubernetesWithHealthTest.java | 4 +- .../KubernetesWithHostAliasesTest.java | 4 +- .../kubernetes/KubernetesWithIngressTest.java | 4 +- ...esWithInitContainerResourceLimitsTest.java | 4 +- ...bernetesWithMetricsCustomAbsoluteTest.java | 4 +- ...bernetesWithMetricsCustomRelativeTest.java | 4 +- ...ubernetesWithMetricsNoAnnotationsTest.java | 4 +- .../kubernetes/KubernetesWithMetricsTest.java | 4 +- .../KubernetesWithMicrometerTest.java | 4 +- .../KubernetesWithMixedStyleEnvTest.java | 4 +- .../KubernetesWithMultiplePortsTest.java | 4 +- .../KubernetesWithNewStyleEnvTest.java | 4 +- .../KubernetesWithOldStyleEnvTest.java | 4 +- .../KubernetesWithPvcVolumesTest.java | 4 +- .../KubernetesWithQuarkusAppNameTest.java | 4 +- .../KubernetesWithRbacAndNamespaceTest.java | 4 +- ...bernetesWithResourcesRequirementsTest.java | 4 +- .../KubernetesWithRootAndHealthTest.java | 4 +- .../KubernetesWithServiceBindingTest.java | 4 +- .../KubernetesWithSidecarAndJibTest.java | 4 +- .../KubernetesWithSidecarAndProbesTest.java | 4 +- .../KubernetesWithSysGroupTest.java | 4 +- .../KubernetesWithWarningsEnvTest.java | 4 +- ...MinikubeWithApplicationPropertiesTest.java | 4 +- .../kubernetes/MinikubeWithDefaultsTest.java | 4 +- .../MinikubeWithMixedStyleEnvTest.java | 4 +- .../it/kubernetes/OpenshiftV3Test.java | 4 +- .../it/kubernetes/OpenshiftV4Test.java | 4 +- .../OpenshiftWithAppConfigMapTest.java | 4 +- .../OpenshiftWithAppSecretTest.java | 4 +- ...penshiftWithApplicationPropertiesTest.java | 4 +- .../OpenshiftWithArgumentsTest.java | 4 +- .../kubernetes/OpenshiftWithCommandTest.java | 4 +- .../OpenshiftWithDeploymentResourceTest.java | 4 +- .../OpenshiftWithDockerBuildStrategyTest.java | 4 +- .../kubernetes/OpenshiftWithHealthTest.java | 4 +- .../OpenshiftWithLegacySidecarAndS2iTest.java | 4 +- .../OpenshiftWithRoutePropertiesTest.java | 4 +- .../it/kubernetes/OpenshiftWithS2iTest.java | 4 +- .../OpenshiftWithServiceBindingTest.java | 4 +- .../OpenshiftWithSidecarAndS2iTest.java | 4 +- .../kubernetes/OpenshiftWithUberJarTest.java | 4 +- .../kubernetes/WithKubernetesClientTest.java | 4 +- .../LoggingWithPanacheDevModeTest.java | 4 +- .../LoggingWithPanacheGeneratedTest.java | 4 +- .../logging/LoggingWithPanacheTest.java | 4 +- .../add/to/bom/test/AddToBomDevModeTest.java | 2 +- .../project/add/to/bom/test/AddToBomTest.java | 2 +- .../project/itest/test/ItestDevModeTest.java | 2 +- .../acme/my/project/itest/test/ItestTest.java | 2 +- .../test/MinimalExtensionDevModeTest.java | 2 +- .../extension/test/MinimalExtensionTest.java | 2 +- .../test/WithGrandParentDevModeTest.java | 2 +- .../parent/test/WithGrandParentTest.java | 2 +- .../acme/my/ext/test/MyExtDevModeTest.java | 2 +- .../java/org/acme/my/ext/test/MyExtTest.java | 2 +- .../acme/my/ext/test/MyExtDevModeTest.java | 2 +- .../java/org/acme/my/ext/test/MyExtTest.java | 2 +- .../acme/my/ext/test/MyExtDevModeTest.java | 2 +- .../java/org/acme/my/ext/test/MyExtTest.java | 2 +- .../CustomManifestSectionsThinJarTest.java | 4 +- .../CustomManifestSectionsUberJarTest.java | 4 +- .../NoCustomManifestSectionsThinJarTest.java | 4 +- .../NoCustomManifestSectionsUberJarTest.java | 4 +- .../AbstractRemovedResourceTest.java | 4 +- .../java/io/quarkus/it/picocli/TestUtils.java | 5 +- .../context/test/CustomProducersTest.java | 4 +- .../test/SimpleContextPropagationTest.java | 4 +- .../test/customContext/CustomContextTest.java | 4 +- .../mutiny/MutinyContextPropagationTest.java | 4 +- .../spring/data/jpa/PropertyWarningsPMT.java | 4 +- .../web/openapi/OpenApiDefaultPathPMT.java | 4 +- .../openapi/OpenApiPathWithSegmentsPMT.java | 4 +- .../OpenApiPathWithoutSegmentsPMT.java | 4 +- .../web/openapi/OpenApiStoreSchemaPMT.java | 4 +- .../web/openapi/OpenApiWithConfigPMT.java | 4 +- .../SwaggerAndOpenAPIWithCommonPrefixPMT.java | 4 +- .../io/quarkus/vault/VaultAppRoleITCase.java | 4 +- .../quarkus/vault/VaultAppRoleWrapITCase.java | 4 +- .../io/quarkus/vault/VaultAuthITCase.java | 4 +- .../vault/VaultClientTokenWrapITCase.java | 4 +- .../quarkus/vault/VaultEnterpriseITCase.java | 4 +- .../java/io/quarkus/vault/VaultITCase.java | 4 +- .../quarkus/vault/VaultKubernetesITCase.java | 4 +- .../vault/VaultMultiPathConfigITCase.java | 4 +- .../java/io/quarkus/vault/VaultPKIITCase.java | 4 +- .../java/io/quarkus/vault/VaultSysITCase.java | 4 +- .../io/quarkus/vault/VaultTOTPITCase.java | 4 +- .../io/quarkus/vault/VaultTransitITCase.java | 4 +- .../vault/VaultUnableToConnectITCase.java | 4 +- .../vault/VaultUserpassKvv1WrapITCase.java | 4 +- .../vault/VaultUserpassKvv2WrapITCase.java | 4 +- .../io/quarkus/test/QuarkusDevModeTest.java | 47 +++++++++++++++++++ .../io/quarkus/test/QuarkusProdModeTest.java | 29 ++++++++++++ .../java/io/quarkus/test/QuarkusUnitTest.java | 23 +++++++-- 1281 files changed, 1400 insertions(+), 3822 deletions(-) diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java index ebe2b88a0613c..2e310ab0485d1 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class DefaultProfileInjectingMainTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PropertyInjectingMain.class)) .setApplicationName("property-injecting") .setApplicationVersion("0.1-SNAPSHOT") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java index 0c0e2e9d4cf44..a004f2f81db93 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class ExceptionHandlingCommandModeTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(ThrowExceptionApplicationMain.class, ThrowExceptionApplication.class)) .setApplicationName("exception-handling") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java index b8c6d2eae18c3..6142d9768b31a 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class ExceptionThrowingCommandModeTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(ExceptionThrowingMain.class)) .setApplicationName("exception-throwing") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java index 5dcdf4d41d2c3..c096d6117a74f 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java @@ -4,8 +4,6 @@ import java.util.concurrent.ExecutionException; import java.util.function.BiConsumer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ExitCodeTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testReturnedExitCode() throws ExecutionException, InterruptedException { diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java index 1d6c0a8b242dc..9dd59e14742ee 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class InvalidNamedMainTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(JavaMain.class, HelloWorldNonDefault.class, NamedMain.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java index 6c352b18e2dc9..409c4f82c0475 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class JavaMainFullyQualifiedTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(JavaMain.class, HelloWorldNonDefault.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java index befcf6623fbb6..a9ece67fd0d58 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class JavaMainTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(JavaMain.class, HelloWorldNonDefault.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java index 6b73830dd7a26..247fe0a1e1dcf 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class NamedMainTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(JavaMain.class, HelloWorldNonDefault.class, NamedMain.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java index 6a2329dc7d8bb..f41e9e42270e2 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java @@ -3,8 +3,6 @@ import java.util.Collections; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OverriddenProfileInjectingMainTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PropertyInjectingMain.class)) .setApplicationName("property-injecting") .setApplicationVersion("0.1-SNAPSHOT") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java index 95ae7f87c36ac..ebd720cfd14ae 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class SimpleCommandModeBothMainsTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(BothTypesMain.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java index 4b1b757cd6d0d..b563a2d169808 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.commandmode; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class SimpleCommandModeTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClasses(HelloWorldMain.class, NamedMain.class)) .setApplicationName("run-exit") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java index 4f0f897bdd813..8d38daab3c3c0 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class StaticInitConfigMappingInvalidTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RuntimeInitConfigSource.class) .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource", RuntimeInitConfigSource.class.getName())) diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java index fed4b968472cc..422201a2a4db1 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class StaticInitConfigMappingTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(StaticInitConfigSource.class) .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource", StaticInitConfigSource.class.getName())); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java index 38ce6efbff182..ece9c39f6e9ad 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java @@ -12,8 +12,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ class GeneratedResourceBuildItemTest { @RegisterExtension static final QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClass(UberJarMain.class)) .setApplicationName("generated-resource") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java index a29373de19fa0..16ab2c7328682 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ class UberJarIgnoredResourceBuildItemTest { @RegisterExtension static final QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClass(UberJarMain.class)) .setApplicationName("uber-jar-ignored") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java index 4491a952a92fc..200db2f8cee66 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java @@ -11,8 +11,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ class UberJarMergedResourceBuildItemTest { @RegisterExtension static final QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties") .addClass(UberJarMain.class)) .setApplicationName("uber-jar-merged") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java index 47831946a1b60..9b1e988faa1b0 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java @@ -25,8 +25,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -52,7 +50,7 @@ public class ConfiguredBeanTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConfiguredBean.class) // Don't change this to types, because of classloader class cast exception. .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource", diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java index 9bdbb12124858..0423620785259 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class RuntimeDefaultsTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar // Don't change this to types, because of classloader class cast exception. .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource", "io.quarkus.extest.runtime.config.EnvBuildTimeConfigSource") diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java index ad0dff814af90..a59611628b777 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class StaticInitSourcesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConfiguredBean.class) // Don't change this to types, because of classloader class cast exception. .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource", diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java index ca5df987c434d..d17daafb46309 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.Config; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class UnknownConfigTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties")) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue()) .assertLogRecords(logRecords -> { diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java index 5ff5ec33e5f23..5d609bc5fb6c4 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.forkjoin; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ForkJoinProdModeTestCase { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProductionModeTestsEndpoint.class, ForkJoinPoolAssertions.class) .addAsResource(new StringAsset("quarkus.banner.enabled=false\nquarkus.log.level=ERROR"), "application.properties")) diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java index d582ba370b581..db07f1751afd4 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java @@ -6,8 +6,6 @@ import java.util.logging.Handler; import java.util.logging.Level; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class AdditionalHandlersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-additional-handlers.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java index be888cc08b8da..f8746777d18b2 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.handlers.AsyncHandler; import org.jboss.logmanager.handlers.ConsoleHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class AsyncConsoleHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-console-log.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("AsyncConsoleHandlerTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java index 7569894fbb46e..df8cabf08c668 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.handlers.AsyncHandler; import org.jboss.logmanager.handlers.FileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class AsyncFileHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-file-log.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("AsyncFileHandlerTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java index 3f3193edf80be..eb64369be26f1 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.handlers.AsyncHandler; import org.jboss.logmanager.handlers.SyslogHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class AsyncSyslogHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-syslog.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("AsyncSyslogHandlerTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerInvalidDueToMultipleHandlersTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerInvalidDueToMultipleHandlersTest.java index 148fe01c226fa..02d6acfd1d5ad 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerInvalidDueToMultipleHandlersTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerInvalidDueToMultipleHandlersTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CategoryConfiguredHandlerInvalidDueToMultipleHandlersTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeException.class) .withConfigurationResource("application-category-invalid-configured-handlers-output.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties")); @Test diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java index 5ccd126e0e435..915db742c6c56 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java @@ -8,8 +8,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.ConsoleHandler; import org.jboss.logmanager.handlers.FileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class CategoryConfiguredHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-category-configured-handlers-output.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("application.properties", "microprofile-config.properties")); @Test diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/ConsoleHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/ConsoleHandlerTest.java index 6e48f7e12d6c2..facb0e4f4b3fa 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/ConsoleHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/ConsoleHandlerTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.ConsoleHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ConsoleHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-console-output.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/FileHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/FileHandlerTest.java index 8d5e14a0d70b1..86a84fdccf3bc 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/FileHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/FileHandlerTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.FileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class FileHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-file-output-log.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java index 292d266eea0e9..201b2d7bb724f 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.PeriodicRotatingFileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class PeriodicRotatingLoggingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-file-log-rotating.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("PeriodicRotatingLoggingTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java index d5b0e6f82d655..fcfb8591dac4a 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.PeriodicSizeRotatingFileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class PeriodicSizeRotatingLoggingRotateOnBootTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-size-file-log-rotating-rotate-on-boot.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName(FILE_NAME); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java index 425456d93537e..6bda2458eed9f 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.PeriodicSizeRotatingFileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class PeriodicSizeRotatingLoggingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-size-file-log-rotating.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("PeriodicSizeRotatingLoggingTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java index e2bec1fcef349..896d08790b07e 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java @@ -9,8 +9,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.SizeRotatingFileHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class SizeRotatingLoggingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-size-file-log-rotating.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")) .setLogFileName("SizeRotatingLoggingTest.log"); diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/SyslogHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/SyslogHandlerTest.java index 139202237bbb7..a0123e9ee6792 100644 --- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/SyslogHandlerTest.java +++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/SyslogHandlerTest.java @@ -11,8 +11,6 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.SyslogHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class SyslogHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-syslog-output.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LoggingTestsHelper.class) .addAsManifestResource("application.properties", "microprofile-config.properties")); diff --git a/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java b/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java index bea249e22f50b..a499bae11339e 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java +++ b/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java @@ -11,7 +11,7 @@ public class [=artifactIdBaseCamelCase]DevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java b/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java index 67c7dc6d47196..4a7969323f43a 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java +++ b/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java @@ -12,7 +12,7 @@ class [=artifactIdBaseCamelCase]Test { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc index 109fa4675e4a6..f7465796b5702 100644 --- a/docs/src/main/asciidoc/building-my-first-extension.adoc +++ b/docs/src/main/asciidoc/building-my-first-extension.adoc @@ -583,7 +583,7 @@ public class GreetingExtensionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); // <1> + .withEmptyApplication(); // <1> @Test public void testGreeting() { diff --git a/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc index a478062396b3c..8735616e52152 100644 --- a/docs/src/main/asciidoc/writing-extensions.adoc +++ b/docs/src/main/asciidoc/writing-extensions.adoc @@ -1981,7 +1981,7 @@ public class PersistenceAndQuarkusConfigTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) <1> - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") .addAsResource("application.properties")); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckExclusionTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckExclusionTest.java index 776207b1f191a..134cb1da754ff 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckExclusionTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckExclusionTest.java @@ -1,8 +1,6 @@ package io.quarkus.agroal.test; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DataSourceHealthCheckExclusionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .withConfigurationResource("application-datasources-with-health.properties"); @Test diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java index b58990e052d16..84e109ece6f44 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java @@ -16,8 +16,6 @@ import javax.sql.DataSource; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class DataSourceHealthCheckWithExtraProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExtraDataSourceProducer.class, ExtraDataSource.class)) .withConfigurationResource("application-datasources-with-health.properties"); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java index 79e7838ad8a8b..c29d39d62ecd3 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java @@ -10,8 +10,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DevServicesH2DatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() // There are other warnings: JDK8, TestContainers, drivers, ... diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java index 058e2a252999e..1352b04bc6fdc 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java @@ -12,9 +12,7 @@ import javax.inject.Singleton; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ class FlushOnCloseDataSourceConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addClasses(FlushOnCloseDataSourceConfigTest.class) .addClasses(ClientUserTrackerInterceptor.class)) diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java index 53618b3a638c5..d80580c4b0e5a 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java @@ -6,8 +6,6 @@ import java.util.function.Function; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MultipleDataSourcesConfigDevModeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MultipleDataSourcesTestUtil.class, DevModeTestEndpoint.class) .addAsResource("application-multiple-datasources.properties", "application.properties")); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java index cfbb502ae9816..1c0506a38b8bf 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class MultipleDataSourcesConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MultipleDataSourcesTestUtil.class)) .withConfigurationResource("application-multiple-datasources.properties"); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java index cd68fa18cac32..d8154cc39634b 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class MultipleDataSourcesErroneousButWorkingConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MultipleDataSourcesTestUtil.class)) .withConfigurationResource("application-multiple-datasources-erroneous-but-working.properties"); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java index 19fec44312d04..15cbc2484e5df 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class MultipleDevServicesDataSourcesConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MultipleDataSourcesTestUtil.class)) .withConfigurationResource("application-multiple-devservices-datasources.properties"); diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java index 69b34b87c2c4c..510ecb9608893 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class PoolInterceptorsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addClasses(PoolInterceptorsTest.class) .addClasses(DefaultInterceptor.class, AnotherInterceptor.class, AnotherPriorityInterceptor.class)) diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientBrokenProxyConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientBrokenProxyConfigTest.java index c2636185d11b4..eac0045b0f5e3 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientBrokenProxyConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientBrokenProxyConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DynamodbAsyncClientBrokenProxyConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("async-broken-proxy-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientFullConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientFullConfigTest.java index 1e4efbf259b34..f7d5b8d759766 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientFullConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbAsyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("async-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java index 1b0a647150c13..413ce7f15cd27 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbAsyncClientTlsKeyFileStoreConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("async-tls-key-filestore-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java index c48476f6e5456..f16ed3c29c902 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbAsyncClientTlsTrustFileStoreConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("async-tls-trust-filestore-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java index c87fe02d3f9ed..55dbf806406be 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbAsyncClientTlsTrustTrustAllConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("async-tls-trust-trustall-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbBrokenEndpointConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbBrokenEndpointConfigTest.java index 9636eda27211c..9392f68f5a7c8 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbBrokenEndpointConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbBrokenEndpointConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DynamodbBrokenEndpointConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("broken-endpoint-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientDefaultCredentialsProviderConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientDefaultCredentialsProviderConfigTest.java index d6d2967118815..32ab9329dc293 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientDefaultCredentialsProviderConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientDefaultCredentialsProviderConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class DynamodbClientDefaultCredentialsProviderConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("default-credentials-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientProfileCredentialsProviderConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientProfileCredentialsProviderConfigTest.java index cb0bc440a25f1..06204a10894e8 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientProfileCredentialsProviderConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbClientProfileCredentialsProviderConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class DynamodbClientProfileCredentialsProviderConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("profile-credentials-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessCredentialsBrokenConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessCredentialsBrokenConfigTest.java index 06c35aa1e37e6..f3f703590ffc9 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessCredentialsBrokenConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessCredentialsBrokenConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DynamodbProcessCredentialsBrokenConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("process-credentials-broken-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbStaticCredentialsBrokenConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbStaticCredentialsBrokenConfigTest.java index c16b8ff330058..62de1033d6116 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbStaticCredentialsBrokenConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbStaticCredentialsBrokenConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DynamodbStaticCredentialsBrokenConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("static-credentials-broken-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenConfigTest.java index 25fd3fb5d5e4e..592ea5f767019 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DynamodbSyncApacheClientBrokenConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-apache-broken-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenProxyConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenProxyConfigTest.java index b61067b8b237e..4c48edfbc883e 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenProxyConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientBrokenProxyConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DynamodbSyncApacheClientBrokenProxyConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(RuntimeConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-apache-broken-proxy-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientFullConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientFullConfigTest.java index 3eb555ad10c05..02c4c7969a05d 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientFullConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncApacheClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbSyncApacheClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-apache-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java index 06fa6ddb85dcb..5fdc3d014e9bb 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbSyncClientTlsKeyFileStoreConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-tls-key-filestore-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java index dd9a300518e53..f63fec4e87f78 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbSyncClientTlsTrustFileStoreConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-tls-trust-filestore-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java index 12b43826df709..b4980d82973d8 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbSyncClientTlsTrustTrustAllConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-tls-trust-trustall-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncUrlConnClientFullConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncUrlConnClientFullConfigTest.java index 23b795207e9a5..addd4a5829027 100644 --- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncUrlConnClientFullConfigTest.java +++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncUrlConnClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DynamodbSyncUrlConnClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java b/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java index 312eaf1bfd9e6..98508d5e0a440 100644 --- a/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java +++ b/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class IamSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/kms/deployment/src/test/java/io/quarkus/amazon/kms/deployment/KmsSyncClientFullConfigTest.java b/extensions/amazon-services/kms/deployment/src/test/java/io/quarkus/amazon/kms/deployment/KmsSyncClientFullConfigTest.java index daf8ae667b0a1..4d85f41ff2811 100644 --- a/extensions/amazon-services/kms/deployment/src/test/java/io/quarkus/amazon/kms/deployment/KmsSyncClientFullConfigTest.java +++ b/extensions/amazon-services/kms/deployment/src/test/java/io/quarkus/amazon/kms/deployment/KmsSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KmsSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/s3/deployment/src/test/java/io/quarkus/amazon/s3/deployment/S3SyncClientFullConfigTest.java b/extensions/amazon-services/s3/deployment/src/test/java/io/quarkus/amazon/s3/deployment/S3SyncClientFullConfigTest.java index 2c4a86d04f027..67fc97328677f 100644 --- a/extensions/amazon-services/s3/deployment/src/test/java/io/quarkus/amazon/s3/deployment/S3SyncClientFullConfigTest.java +++ b/extensions/amazon-services/s3/deployment/src/test/java/io/quarkus/amazon/s3/deployment/S3SyncClientFullConfigTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class S3SyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/ses/deployment/src/test/java/io/quarkus/amazon/ses/deployment/SesSyncClientFullConfigTest.java b/extensions/amazon-services/ses/deployment/src/test/java/io/quarkus/amazon/ses/deployment/SesSyncClientFullConfigTest.java index 9ddc5e2c89425..b656a4ec050ca 100644 --- a/extensions/amazon-services/ses/deployment/src/test/java/io/quarkus/amazon/ses/deployment/SesSyncClientFullConfigTest.java +++ b/extensions/amazon-services/ses/deployment/src/test/java/io/quarkus/amazon/ses/deployment/SesSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class SesSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/sns/deployment/src/test/java/io/quarkus/amazon/sns/deployment/SnsSyncClientFullConfigTest.java b/extensions/amazon-services/sns/deployment/src/test/java/io/quarkus/amazon/sns/deployment/SnsSyncClientFullConfigTest.java index c00a1dea96f2c..53f3c4a50f038 100644 --- a/extensions/amazon-services/sns/deployment/src/test/java/io/quarkus/amazon/sns/deployment/SnsSyncClientFullConfigTest.java +++ b/extensions/amazon-services/sns/deployment/src/test/java/io/quarkus/amazon/sns/deployment/SnsSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SnsSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/sqs/deployment/src/test/java/io/quarkus/amazon/sqs/deployment/SqsSyncClientFullConfigTest.java b/extensions/amazon-services/sqs/deployment/src/test/java/io/quarkus/amazon/sqs/deployment/SqsSyncClientFullConfigTest.java index e54636d936a6a..827e15791e2e7 100644 --- a/extensions/amazon-services/sqs/deployment/src/test/java/io/quarkus/amazon/sqs/deployment/SqsSyncClientFullConfigTest.java +++ b/extensions/amazon-services/sqs/deployment/src/test/java/io/quarkus/amazon/sqs/deployment/SqsSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SqsSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("full-config.properties", "application.properties")); @Test diff --git a/extensions/amazon-services/ssm/deployment/src/test/java/io/quarkus/amazon/ssm/deployment/SsmSyncClientFullConfigTest.java b/extensions/amazon-services/ssm/deployment/src/test/java/io/quarkus/amazon/ssm/deployment/SsmSyncClientFullConfigTest.java index 6d80300b25cff..60af2cc2a753e 100644 --- a/extensions/amazon-services/ssm/deployment/src/test/java/io/quarkus/amazon/ssm/deployment/SsmSyncClientFullConfigTest.java +++ b/extensions/amazon-services/ssm/deployment/src/test/java/io/quarkus/amazon/ssm/deployment/SsmSyncClientFullConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class SsmSyncClientFullConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("sync-urlconn-full-config.properties", "application.properties")); @Test diff --git a/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java index a1bb0783b04b7..a7427a72b0e86 100644 --- a/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java +++ b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java @@ -2,9 +2,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class SingleLetterDefaultPackageTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(B.class, C.class, L.class) .addAsResource(new StringAsset("simpleBean.baz=1"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java index f52532f3d87dd..9b162bfbf1fa4 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class SimpleBeanTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class) .addAsResource(new StringAsset("simpleBean.baz=1"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java index 00e5258afe049..655ea198f2988 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java @@ -8,9 +8,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SelectedAlternativesFqcnTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SelectedAlternativesFqcnTest.class, Alpha.class, Producers.class, Foo.class, Bar.class, MyStereotype.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java index df51421814aac..dc24f009e36a9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java @@ -8,9 +8,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SelectedAlternativesPackageStartsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SelectedAlternativesPackageStartsTest.class, Alpha.class, Producers.class, Foo.class, Bar.class, MyStereotype.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java index 308a50f2aca4a..28d2579f8722c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java @@ -8,9 +8,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SelectedAlternativesPackageTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SelectedAlternativesPackageTest.class, Alpha.class, Producers.class, Foo.class, Bar.class, MyStereotype.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java index 40d0a83ad5f54..d4a3d6f8e29d3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java @@ -8,9 +8,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SelectedAlternativesSimpleNameTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SelectedAlternativesSimpleNameTest.class, Alpha.class, Producers.class, Foo.class, Bar.class, MyStereotype.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java index b7ed1325f1bfc..44f28a75620f3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class SharedLiteralWithPrivateDefaultTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WithPrivateDefault.TO_IMPORT) .addClasses(PrivateDefaultBean.class, MySupplier.class, OtherSupplier.class)); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java index 3b330988106c4..a30169b488337 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CommandLineArgumentsTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setCommandLineParameters("Hello", "World") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject @CommandLineArguments diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java index 7f1912fd70637..69333fcd13ecb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java @@ -16,8 +16,6 @@ import javax.inject.Inject; import javax.inject.Qualifier; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class AutoFieldInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AutoFieldInjectionTest.class, Client.class, Producer.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java index a62398817fe2e..231b3adb4f36a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java @@ -18,9 +18,7 @@ import javax.inject.Inject; import javax.inject.Qualifier; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class AutoProducerMethodDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AutoProducerMethodDisabledTest.class, Client.class, Producers.class) .addAsResource(new StringAsset("quarkus.arc.auto-producer-methods=false"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java index c4cc4fa6ce2c3..75a497e3afe32 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java @@ -20,8 +20,6 @@ import javax.inject.Inject; import javax.inject.Qualifier; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class AutoProducerMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AutoProducerMethodTest.class, Client.class, Producers.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java index e5f51edab3daf..d9a1741335be7 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java @@ -6,9 +6,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ConfigArrayConverterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Configured.class) .addAsResource(new StringAsset("foos=1,2,bar\nbools=true,false"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java index ec32bc4961fcc..0ddcf2d264dea 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ConfigImplicitConverterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Configured.class) .addAsResource(new StringAsset("foo=1"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java index 019633add73fb..e651d90957fc2 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java @@ -19,9 +19,7 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.Converter; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class ConfigMappingTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("config.my.prop=1234\n" + "config.override.my.prop=5678\n" + "group.host=localhost\n" + diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java index 183fb4014dd9a..fa93fe79baf68 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java @@ -13,9 +13,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ConfigOptionalsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UsingOptionals.class) .addAsResource(new StringAsset("foo=42\nbar=4.2"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java index f587da7d6b66b..77240a0531527 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java @@ -10,9 +10,7 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperties; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class ConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "smallrye.config.mapping.validate-unknown=false\n" + "server.host=localhost\n" + diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java index fad6e0815387f..98f8cacbdba5a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ConfigPropertyInjectionValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Configured.class)) .setExpectedException(ConfigurationException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java index 9a6b84fde51d4..01bd589c223bb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java @@ -2,9 +2,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ConfigPropertyInjectionWithoutInjectAnnotationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConfigPropertyInjectionWithoutInjectAnnotationTest.class, SomeBeanUsingConfig.class) .addAsResource(new StringAsset("something=" + configValue), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyMapInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyMapInjectionTest.java index 55a4d80e041ab..ff2c75589e47a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyMapInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyMapInjectionTest.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ConfigPropertyMapInjectionTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsServiceProvider(Converter.class, VersionConverter.class) .addAsResource(new StringAsset( "root.numbers.1=one\n" + diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java index 966c83edc03aa..c7f9cf265428b 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java @@ -19,9 +19,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class IndexedPropertiesInjectionTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(IndexedBean.class) .addAsServiceProvider(Converter.class, ConvertedValueConverter.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java index bc04f81556051..4dfe167c1c9ab 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java @@ -6,9 +6,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class NullConverterTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NullConverterBean.class) .addAsServiceProvider(Converter.class, CustomTypeConverter.class) .addAsResource(new StringAsset("my.prop=1234\n"), "application.properties")) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java index 88cb11b00b0f2..056fa27eddfa8 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class RemovedConfigMappingTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RemovedConfigBean.class) .addClass(RemovedConfigMapping.class)); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java index 60125a41edb54..ec4afc607053d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java @@ -7,8 +7,6 @@ import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class RemovedConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RemovedConfigBean.class) .addClass(RemovedConfigProperties.class)); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java index 83b4843a3deba..c961a8c0f6610 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RemovedConfigPropertyTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(RemovedConfigBean.class)); + .withApplicationRoot((jar) -> jar.addClass(RemovedConfigBean.class)); @Test void skipConfigValidation() { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java index 95126cced3c39..62aec774965d9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class UnremovedConfigMappingTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(UnremovedConfigMapping.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsAndSuperclassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsAndSuperclassConfigPropertiesTest.java index f66c1c7abd70d..f9cb48c027967 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsAndSuperclassConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsAndSuperclassConfigPropertiesTest.java @@ -11,9 +11,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class ClassWithAllPublicFieldsAndSuperclassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, SuperDummyProperties.class, SuperDuperDummyProperties.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java index 433d8a2fff1f7..d7f99237a898f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java @@ -12,9 +12,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ClassWithAllPublicFieldsConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100\ndummy.opt-int-lst=1,2"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllowedMissingSetterConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllowedMissingSetterConfigPropertiesTest.java index 9e74e650803bc..c5e52aac68789 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllowedMissingSetterConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllowedMissingSetterConfigPropertiesTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ClassWithAllowedMissingSetterConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.nested.numbers2=1,2\ndummy.unused=whatever"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingConfigPropertiesTest.java index fffb59d5c4755..f4ec5ac386e4e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingConfigPropertiesTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ClassWithMissingConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Configured.class, DummyProperties.class)) + .withApplicationRoot((jar) -> jar.addClasses(Configured.class, DummyProperties.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); assertTrue(e.getMessage().contains("dummy.foo")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingNestedConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingNestedConfigPropertiesTest.java index c37d0a9a9a9a6..64c9d30b3229f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingNestedConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithMissingNestedConfigPropertiesTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ClassWithMissingNestedConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Configured.class, DummyProperties.class)) + .withApplicationRoot((jar) -> jar.addClasses(Configured.class, DummyProperties.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); assertTrue(e.getMessage().contains("dummy.inner.foo")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithNotAllowedMissingSetterConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithNotAllowedMissingSetterConfigPropertiesTest.java index f855802db7fe4..573fe5566ff21 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithNotAllowedMissingSetterConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithNotAllowedMissingSetterConfigPropertiesTest.java @@ -9,9 +9,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ClassWithNotAllowedMissingSetterConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.unused=whatever"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithoutGettersConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithoutGettersConfigPropertiesTest.java index dcdf28b9180ca..3ff7fa29a3ace 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithoutGettersConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithoutGettersConfigPropertiesTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ClassWithoutGettersConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.my-enum=OPTIONAL\ndummy.other-enum=Enum_Two\ndummy.numbers=1,2,3,4\ndummy.unused=whatever"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/FromConfigConfigDefaultConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/FromConfigConfigDefaultConfigPropertiesTest.java index 3eb5d2d97874a..46fb918ffe432 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/FromConfigConfigDefaultConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/FromConfigConfigDefaultConfigPropertiesTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class FromConfigConfigDefaultConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "quarkus.arc.config-properties-default-naming-strategy=verbatim\ndummy.fooBarDev=quarkus1\ndummy2.foo-bar=quarkus2"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceExtendingOthersConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceExtendingOthersConfigPropertiesTest.java index 045b5159354f4..113c368682f85 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceExtendingOthersConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceExtendingOthersConfigPropertiesTest.java @@ -10,9 +10,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class InterfaceExtendingOthersConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1.0,2.0\ndummy.bool=true"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceNoGetterWithMissingConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceNoGetterWithMissingConfigPropertiesTest.java index ce0d7c24c2f7c..126c1b55c0529 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceNoGetterWithMissingConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceNoGetterWithMissingConfigPropertiesTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class InterfaceNoGetterWithMissingConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Configured.class, DummyProperties.class)) + .withApplicationRoot((jar) -> jar.addClasses(Configured.class, DummyProperties.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); assertTrue(e.getMessage().contains("dummy.foo")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithMissingConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithMissingConfigPropertiesTest.java index cb0b8b0f561b1..b47b17d9956ec 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithMissingConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithMissingConfigPropertiesTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class InterfaceWithMissingConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Configured.class, DummyProperties.class)) + .withApplicationRoot((jar) -> jar.addClasses(Configured.class, DummyProperties.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); assertTrue(e.getMessage().contains("dummy.foo")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java index 2f59a91048431..8bf677386c58f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java @@ -11,9 +11,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class InterfaceWithNestedInterfaceConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummy.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.boolWD=true\ndummy.nested-dummy.foo=bar\ndummy.nested-dummy.other=some\ndummy.other-nested.foo=bar2\ndummy.other-nested.other=some2"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithOtherConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithOtherConfigPrefixTest.java index 4e9f76747a7f4..e8833dd2137f9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithOtherConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithOtherConfigPrefixTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class InterfaceWithOtherConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, Other.class) .addAsResource(new StringAsset("dummy.other.name=test"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MapTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MapTest.java index f7b3d4f83c7ec..0aac19cb404cb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MapTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MapTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MapTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(WithMap.class)) + .withApplicationRoot((jar) -> jar.addClasses(WithMap.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); assertTrue(e.getMessage().contains("config-mappings")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleClassConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleClassConfigPrefixTest.java index f7b605a439f32..0103f0f1d7a3c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleClassConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleClassConfigPrefixTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultipleClassConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.someNumbers=1,2,3,4\nother.name=redhat\nother.someNumbers=3,2,1"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java index 736992ba740c8..42effbe392aed 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java @@ -9,9 +9,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MultipleInterfaceConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\nother.name=redhat\nother.numbers=3,2,1"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java index 8b493eea6e782..eb878d7bbf576 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java @@ -10,9 +10,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class NestedClassAndSuperclassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummyProperties.class) .addAsResource(new StringAsset( "dummy.lname=redhat\ndummy.name=quarkus\ndummy.nested.ages=1,2,3,4\ndummy.supernested.afraid-of-heights=100,200\ndummy.unused=whatever\ndummy.nested.unused=whatever2"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java index 7738d4ef3f6cf..e854292acc7ae 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java @@ -9,9 +9,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class NestedClassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.nested.rock-of-ages=1,2,3,4\ndummy.unused=whatever\ndummy.nested.unused=whatever2"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPrefixTest.java index 89d96471c8e12..54432496daec4 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPrefixTest.java @@ -12,9 +12,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class TypicalClassConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.int-with-default=999\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPropertiesTest.java index 93e732fc0ba56..d428989e1adf1 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassConfigPropertiesTest.java @@ -11,9 +11,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class TypicalClassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassWithSuperclassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassWithSuperclassConfigPropertiesTest.java index b4dcc49171d15..7b417ef9beb22 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassWithSuperclassConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalClassWithSuperclassConfigPropertiesTest.java @@ -11,9 +11,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class TypicalClassWithSuperclassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, SuperDummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPrefixTest.java index 1ed5c37d900db..c9040caf7342a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPrefixTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPrefixTest.java @@ -13,9 +13,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class TypicalInterfaceConfigPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.boolWD=true\ndummy.optional-int=100\ndummy.optionalStringList=a,b"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java index c91f9e09a4fbc..5c8b77787489d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java @@ -13,9 +13,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class TypicalInterfaceConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.boolWD=true\ndummy.optional-int=100\ndummy.optionalStringList=a,b"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/UnspecifiedPrefixConfigProperties.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/UnspecifiedPrefixConfigProperties.java index f5fca003e391c..46ef5b176b027 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/UnspecifiedPrefixConfigProperties.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/UnspecifiedPrefixConfigProperties.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class UnspecifiedPrefixConfigProperties { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class, GreetingExtraProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ngreeting-extra.message=hello"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimConfigPropertiesTest.java index 1fb2e2586ba74..fe85a7a5e2d60 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimConfigPropertiesTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class VerbatimConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.fooBar=quarkus1\ndummy.foo=quarkus2\ndummy.unused=whatever"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimInterfaceConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimInterfaceConfigPropertiesTest.java index 1de9761ecbea9..6c483691867d6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimInterfaceConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/VerbatimInterfaceConfigPropertiesTest.java @@ -11,9 +11,7 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class VerbatimInterfaceConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( "dummy.name=quarkus\ndummy.bool-with-default=true\ndummy.optional-int=100\ndummy.numbers=1,2,3,4"), diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java index 1447c82ad2a50..283fe7c195cd3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class ConfigRootInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConfigRootInjectionTest.class, Client.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java index ea6f364606b10..608716d68b9ca 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java @@ -18,8 +18,6 @@ import javax.inject.Inject; import javax.inject.Scope; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class CustomPseudoScopeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyPseudoScope.class, SimpleBean.class, MyPseudoContext.class)) .addBuildChainCustomizer(b -> { b.addBuildStep(new BuildStep() { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java index c4908cf3ba7c7..e55696dd03de1 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java @@ -17,9 +17,7 @@ import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class ExcludeTypesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExcludeTypesTest.class, Pong.class, Alpha.class, Bravo.class, Charlie.class, Bar.class, Baz.class, Magic.class, MagicInterceptor.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java index 804339e931b73..4e02c449ade01 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java @@ -16,8 +16,6 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class InterceptorBindingRegistrarTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NotAnInterceptorBinding.class, SimpleBean.class, SimpleInterceptor.class)) .addBuildChainCustomizer(b -> { b.addBuildStep(new BuildStep() { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java index 4cb75368cc573..9121031232e92 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java @@ -6,8 +6,6 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class InterceptorNoBindingsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InterceptorWithoutBindings.class)) .setExpectedException(DefinitionException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java index 14d83c07215c3..eb0adf4a65c14 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java @@ -21,8 +21,6 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.MethodInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.opentest4j.AssertionFailedError; @@ -38,7 +36,7 @@ public class InterceptedStaticMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InterceptMe.class, Simple.class, AnotherSimple.class, SimpleInterceptor.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java index 45dc95cb8606c..735e43c873326 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java @@ -17,8 +17,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class LockTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java index 24e0bcb3a9039..1d7490532b410 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class InjectedLoggerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java index 95af683816787..fc71f9b7581a3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class LookupConditionOnProducersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Service.class, ServiceProducer.class)) .overrideConfigKey("service.alpha.enabled", "false"); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java index ec604699675d8..4c1ff364a9267 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class LookupConditionsCombinedTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, ServiceAlpha.class, ServiceBravo.class)) .overrideConfigKey("service.alpha.enabled", "false"); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java index d5e1b0da42b9a..c8c4fbd3951da 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class LookupConditionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, ServiceAlpha.class, ServiceBravo.class, ServiceCharlie.class)) .overrideConfigKey("service.alpha.enabled", "false"); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java index e959b2197980e..0da3f232c822a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class InjectionPointMetadataTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidInjection.class)) .setExpectedException(DefinitionException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java index 2e3ef95525935..b7f3ab2a5bf54 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java @@ -20,8 +20,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class AsyncObserverTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StringProducer.class, StringObserver.class, ThreadNameProvider.class)); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java index 5e6d57a1ca69c..a43df663465cf 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java @@ -23,8 +23,6 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -41,7 +39,7 @@ public class ObserverTransformerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyObserver.class, AlphaQualifier.class, BravoQualifier.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java index e784c3dc94176..4398ab780fb5c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java @@ -11,8 +11,6 @@ import javax.inject.Singleton; import org.jboss.jandex.DotName; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class SyntheticObserverTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyObserver.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java index d18d52a7198e5..fed235c96c225 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java @@ -18,9 +18,7 @@ import javax.interceptor.InvocationContext; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class IfBuildProfileTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, OtherProducer.class, AnotherProducer.class, TestInterceptor.class, ProdInterceptor.class, Logging.class, DummyTestBean.class, DummyProdBean.class) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java index 145b7a27243b2..25ba56515b503 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java @@ -18,9 +18,7 @@ import javax.interceptor.InvocationContext; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class UnlessBuildProfileTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, AnotherProducer.class, GreetingBean.class, Hello.class, PingBean.class, PongBean.class, FooBean.class, BarBean.class, TestInterceptor.class, ProdInterceptor.class, Logging.class, DummyTestBean.class, diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java index 654cec5f4399a..bbd3e8dd3ac3f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class CombinedBuildProfileAndBuildPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, AnotherProducer.class, GreetingBean.class, Hello.class, PingBean.class, PongBean.class, FooBean.class, BarBean.class)) .overrideConfigKey("some.prop1", "v1") diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java index 723bae9d5fc75..8a8f7fcf17f9a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class IfBuildPropertyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, AnotherProducer.class, GreetingBean.class, Hello.class, PingBean.class, PongBean.class, FooBean.class, BarBean.class)) .overrideConfigKey("some.prop1", "v1") diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java index 934bc0b857f4a..6f824c20ebb84 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SimpleUnlessBuildPropertyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PingService.class, AlphaService.class, BravoService.class)) .overrideConfigKey("foo.bar", "baz"); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java index ff038ef52185e..5626676e91df9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class UnlessBuildPropertyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, AnotherProducer.class, GreetingBean.class, PingBean.class, PongBean.class, FooBean.class, BarBean.class)) .overrideConfigKey("some.prop1", "v1") diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java index b917b9d66659e..8b57925898fa3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java @@ -20,8 +20,6 @@ import javax.inject.Singleton; import org.jboss.jandex.DotName; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class QualifierRegistrarTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NotAQualifier.class, SimpleBean.class, Client.class)) .addBuildChainCustomizer(b -> { b.addBuildStep(new BuildStep() { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java index 265208ad5e6e6..51262ad14c2d5 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java @@ -2,9 +2,7 @@ import javax.enterprise.context.Dependent; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RemoveFwkBeansTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnusedBean.class) .addAsResource(new StringAsset("quarkus.arc.remove-unused-beans=fwk"), "application.properties")); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java index 225151dbedbd1..1838f59f386bb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java @@ -15,8 +15,6 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class StartupAnnotationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StartMe.class, SingletonStartMe.class, DependentStartMe.class, ProducerStartMe.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/BeanDefiningAnnotationStereotypeTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/BeanDefiningAnnotationStereotypeTestCase.java index 448649de6bdbc..187050f1e4b56 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/BeanDefiningAnnotationStereotypeTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/BeanDefiningAnnotationStereotypeTestCase.java @@ -19,8 +19,6 @@ import javax.inject.Inject; import org.jboss.jandex.DotName; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class BeanDefiningAnnotationStereotypeTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class, MakeItBean.class, DependentStereotype.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java index 48547050f1b47..d78cdfac814cd 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DoubleScopedBeanTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SessionStereotype.class, RequestStereotype.class, DoubleScopedStereotypeBean.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java index 3d3dde57e232c..db5cb47a226a8 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DoubleScopedStereotypeHierarchyTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SessionStereotype.class, RequestStereotype.class, AnotherStereotype.class, DoubleScopedStereotypeBean.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java index cc96855f7f0fe..87c7ab7485ed1 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DoubleScopedStereotypeTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DoubleScopedStereotype.class, DoubleScopedStereotypeBean.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java index ec9a9a3eefb48..8a67a04977691 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class AddMissingNoargsConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AddMissingNoargsConstructorTest.class, MyBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java index bd890d1e5a2cd..bc093ca197f6e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class FailedToAddMissingNoargsConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FailedToAddMissingNoargsConstructorTest.class, MyBean.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java index 03ef7d315e1cf..65fbeb2be01bb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java @@ -3,9 +3,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class FinalClassDoNotRemoveFlagTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FinalClassDoNotRemoveFlagTest.class, MyBean.class) .addAsResource(new StringAsset("quarkus.arc.transform-unproxyable-classes=false"), "application.properties")) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java index 53b64417a1ec0..1feb96aff89eb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class FinalClassRemoveFlagTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FinalClassRemoveFlagTest.class, MyBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java index b8e3249a45f23..3b91621ffb113 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java @@ -10,8 +10,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultipleAddMissingNoargsConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class, MyBeanProducer.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java index 98119bf03ccf1..dfd22e456d9b4 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class PrivateNoArgsConstructorChangeFlagTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PrivateNoArgsConstructorChangeFlagTest.class, MyBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java index 9813f63a5a517..2080250b28cbb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java @@ -3,9 +3,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class PrivateNoArgsConstructorDoNotChangeFlagTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PrivateNoArgsConstructorDoNotChangeFlagTest.class, MyBean.class) .addAsResource(new StringAsset("quarkus.arc.transform-unproxyable-classes=false"), "application.properties")) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java index 1935630e29085..08e16da21fe5d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ProducerAddMissingNoargsConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProducerAddMissingNoargsConstructorTest.class, MyProducer.class, MyBean.class)); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java index 32b5fd35b2e50..e655ec4d685a9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class ProducerFailedToAddMissingNoargsConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProducerFailedToAddMissingNoargsConstructorTest.class, MyProducer.class, MyBean.class, MyBase.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java index 1b9f876002541..212addc838fa1 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class RequestScopedFinalMethodsTest { @RegisterExtension public static QuarkusUnitTest container = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RequestScopedBean.class)); @Test diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java index da72411db6389..acd789b187820 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Vetoed; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class SynthProxiableBeanWithoutNoArgConstructorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SynthBean.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java index 583b46d0b8418..3f81e738c8f6a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java @@ -8,9 +8,7 @@ import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class UnusedExclusionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnusedExclusionTest.class, Alpha.class, Beta.class, Charlie.class, Delta.class, ProducerBean.class, TestRecorder.class, Gama.class, GamaProducer.class) .addAsResource(new StringAsset( diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java index b9b33ab76e64a..8f596ed83b45a 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java @@ -5,8 +5,6 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ObserverOnInnerClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(IgnoredClass.class)) .assertException(t -> { Throwable rootCause = ExceptionUtil.getRootCause(t); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java index 0287ed633152f..964a73d6b6cd0 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.Produces; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ProducerOnInnerClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(IgnoredClass.class)) .assertException(t -> { Throwable rootCause = ExceptionUtil.getRootCause(t); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java index 23d60fb518fd9..bc896e2889bd3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ScopeOnInnerClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(IgnoredClass.class)) .assertException(t -> { Throwable rootCause = ExceptionUtil.getRootCause(t); diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java index 4e4d10e62b4c7..e276c9dcdee0e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class WrongSingletonTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EjbSingleton.class)) .assertException(t -> { Throwable rootCause = ExceptionUtil.getRootCause(t); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java index 892918f5ba7bf..4b026b31e7eb3 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java @@ -11,8 +11,6 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -38,7 +36,7 @@ public class DeploymentExceptionsTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestResource.class, TestBean.class)) + .withApplicationRoot((jar) -> jar.addClasses(TestResource.class, TestBean.class)) .assertException(t -> { assertEquals(DeploymentException.class, t.getClass()); assertEquals(10, t.getSuppressed().length); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java index 57234f7b34e88..dd59c088dcd33 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java @@ -5,9 +5,7 @@ import javax.enterprise.context.Dependent; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DisabledCacheTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties") .addClass(CachedService.class)); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java index 3beff50967f1e..144d98304ecee 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java @@ -5,9 +5,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class UnknownCacheTypeTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.cache.type=i_am_an_unknown_cache_type"), "application.properties") .addClass(CachedService.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadTest.java index 64116004c92d4..708b9224f9ca1 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadTest.java @@ -4,8 +4,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CacheHotReloadTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CacheHotReloadResource.class)); + .withApplicationRoot((jar) -> jar.addClass(CacheHotReloadResource.class)); @Test public void testHotReload() { diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java index dd90c8f09d77d..a732c03fbdeb0 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class CaffeineCacheInjectionTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class)); + .withApplicationRoot((jar) -> jar.addClass(CachedService.class)); @Inject CachedService cachedService; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java index 206afa5b9e329..c021e73ea9274 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java @@ -13,8 +13,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class ConcurrencyTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class)); + .withApplicationRoot((jar) -> jar.addClass(CachedService.class)); @Inject CachedService cachedService; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java index 3d1278adf7835..b094e91e39a23 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class NoOpCacheInjectionTest { private static final String CACHE_NAME = "test-cache"; @RegisterExtension - static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + static final QuarkusUnitTest TEST = new QuarkusUnitTest().withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties") .addClass(CachedService.class)); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java index af194e30d71e4..3f1d198908673 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java @@ -9,9 +9,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class NoOpCacheTest { private static final String FORCED_EXCEPTION_MESSAGE = "Forced exception"; @RegisterExtension - static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + static final QuarkusUnitTest TEST = new QuarkusUnitTest().withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties") .addClass(CachedService.class)); diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java index 0c4ddb1a0267a..f727969910204 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ThrowExecutionExceptionCauseTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class)); + .withApplicationRoot((jar) -> jar.addClass(CachedService.class)); @Inject CachedService cachedService; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniValueTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniValueTest.java index 5ac0f9aef9116..824a65edde1bb 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniValueTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniValueTest.java @@ -6,9 +6,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class UniValueTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class).addAsResource( + .withApplicationRoot((jar) -> jar.addClass(CachedService.class).addAsResource( new StringAsset("quarkus.log.category.\"io.quarkus.cache\".level=DEBUG"), "application.properties")); @Inject diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java index 1d3894afa09d4..7ea8c94f317b2 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ZeroCaffeineCacheTest { @RegisterExtension - static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + static final QuarkusUnitTest TEST = new QuarkusUnitTest().withEmptyApplication(); @Inject CacheManager cacheManager; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java index 9d14808d9c77b..49fa7c596ef93 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ZeroNoOpCacheTest { @RegisterExtension - static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + static final QuarkusUnitTest TEST = new QuarkusUnitTest().withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties")); @Inject diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java index 55785f32f7670..3ee786b90691e 100644 --- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java +++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ApplicationYamlHotDeploymentTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.yaml") .addAsResource("application.yml") .addClass(FooResource.class)); diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java index 5b46ecdfd4747..4bf1dcfd2ece8 100644 --- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java +++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java @@ -6,8 +6,6 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ClassConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, SqlConfiguration.class, Nested.class) .addAsResource("configprops.yaml", "application.yaml")); diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java index e32edfabdb6e1..0f4a6fecebda3 100644 --- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java +++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java @@ -6,8 +6,6 @@ import javax.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class InterfaceConfigPropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DummyBean.class, SqlConfiguration.class, SqlConfiguration.Nested.class, SqlConfiguration.Type.class) .addAsResource("configprops.yaml", "application.yaml")); diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java index e75a7500ba9b3..09465cc89ec40 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.jdbc; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class BcryptPasswordMapperTest extends JdbcSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("bcrypt-password-mapper/import.sql") .addAsResource("bcrypt-password-mapper/application.properties", "application.properties")); diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java index d0026e45e8e4c..f15cba15d80f1 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java @@ -3,8 +3,6 @@ import java.util.Arrays; import java.util.stream.Stream; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -17,7 +15,7 @@ public class CustomRoleDecoderTest extends JdbcSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClassesWithCustomRoleDecoder) .addAsResource("custom-role-decoder/import.sql") .addAsResource("custom-role-decoder/application.properties", "application.properties")); diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java index 3f51926a51a31..92c80b1be0604 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.jdbc; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MinimalConfigurationTest extends JdbcSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("minimal-config/import.sql") .addAsResource("minimal-config/application.properties", "application.properties")); diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java index 39aedb75b9996..5637ec3bd0292 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.jdbc; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MultipleDataSourcesTest extends JdbcSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("multiple-data-sources/users.sql") .addAsResource("multiple-data-sources/permissions.sql") diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java index 5e9065ef93079..9d053e61b978a 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.jdbc; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MultipleQueriesConfigurationTest extends JdbcSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("multiple-queries/import.sql") .addAsResource("multiple-queries/application.properties", "application.properties")); diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoderTest.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoderTest.java index e4be68b51a431..ead44359ecf2f 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoderTest.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoderTest.java @@ -3,8 +3,6 @@ import java.util.Arrays; import java.util.stream.Stream; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -17,7 +15,7 @@ public class CustomRoleDecoderTest extends LdapSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClassesWithCustomRoleDecoder) .addAsResource("custom-role-decoder/application.properties", "application.properties")); diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/MinimalConfigurationTest.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/MinimalConfigurationTest.java index 6ae33d5b81698..9d9dc2d3e506f 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/MinimalConfigurationTest.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/MinimalConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.ldap; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MinimalConfigurationTest extends LdapSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("minimal-config/application.properties", "application.properties")); diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java index b90805c2937c7..657dc530d64fc 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java @@ -1,7 +1,5 @@ package io.quarkus.elytron.security.ldap; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class SearchRecursiveTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("search-recursive/application.properties", "application.properties")); diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java index 8cc8c2e98e2ce..51701f844b7ea 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java @@ -3,8 +3,6 @@ import static org.hamcrest.Matchers.containsStringIgnoringCase; import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class BasicAuthTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application.properties") .addAsResource("test-users.properties") diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedEncryptedTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedEncryptedTestCase.java index 3795193d01c97..717338f80ade2 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedEncryptedTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedEncryptedTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -16,7 +14,7 @@ public class CustomAuthEmbeddedEncryptedTestCase extends CustomAuthEmbeddedBase }; @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClasses(CustomAuth.class) .addAsResource("application-custom-auth-embedded-encrypted.properties", diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedTestCase.java index b94d954f07f52..fc7441b1a3d6f 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthEmbeddedTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -16,7 +14,7 @@ public class CustomAuthEmbeddedTestCase extends CustomAuthEmbeddedBase { }; @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClasses(CustomAuth.class) .addAsResource("application-custom-auth-embedded.properties", diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthTestCase.java index 8862be1d0e7ba..88ba419325509 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuthTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class CustomAuthTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestSecureServlet.class, CustomAuth.class) .addAsResource("application-custom-auth.properties", "application.properties") //.addAsManifestResource("logging.properties") diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/FormAuthTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/FormAuthTestCase.java index 219effe9656a1..22a199e8336cf 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/FormAuthTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/FormAuthTestCase.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.given; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class FormAuthTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-form-auth.properties", "application.properties") .addAsResource("test-users.properties") diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/NoConfiguredRealmsTestCase.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/NoConfiguredRealmsTestCase.java index f74b189923eb0..c0a799ea5744e 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/NoConfiguredRealmsTestCase.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/NoConfiguredRealmsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NoConfiguredRealmsTestCase { }; @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource(new StringAsset("quarkus.security.file.enabled=false"), "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java index d8d849d052c6c..db139875a57c7 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java @@ -2,8 +2,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class FlywayDevModeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DevModeTestEndpoint.class) .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("config-empty.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java index 413d5cb8e774a..e316ab7e9b211 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java @@ -6,8 +6,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class FlywayExtensionBaselineOnMigrateNamedDataSourceTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setBeforeAllCustomizer(customizer::startH2) .setAfterAllCustomizer(customizer::stopH2) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(FlywayH2TestCustomizer.class) .addAsResource("baseline-on-migrate-named-datasource.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java index 13e94e82b9d86..cf4a555038b4a 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java @@ -6,8 +6,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class FlywayExtensionBaselineOnMigrateTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setBeforeAllCustomizer(customizer::startH2) .setAfterAllCustomizer(customizer::stopH2) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(FlywayH2TestCustomizer.class) .addAsResource("baseline-on-migrate.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java index c38e34c944007..53e558e3b8e9b 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java @@ -13,8 +13,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class FlywayExtensionCallbackTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setBeforeAllCustomizer(customizer::startH2) .setAfterAllCustomizer(customizer::stopH2) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FlywayH2TestCustomizer.class, FlywayExtensionCallback.class, FlywayExtensionCallback2.class) .addAsResource("db/migration/V1.0.3__Quarkus_Callback.sql") diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java index 1ce19f72bf305..4d3ddf97e0b10 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java @@ -12,8 +12,6 @@ import org.flywaydb.core.Flyway; import org.h2.jdbc.JdbcSQLException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class FlywayExtensionCleanAndMigrateAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("clean-and-migrate-at-start-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java index 37aaff0af39a8..0426a945334dc 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java @@ -15,8 +15,6 @@ import org.flywaydb.core.api.migration.BaseJavaMigration; import org.flywaydb.core.api.migration.Context; import org.flywaydb.core.api.migration.JavaMigration; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(V1_0_1__Update.class, V1_0_2__Update.class) .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("clean-and-migrate-at-start-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java index e7c33ee8d09c1..bcb556266849e 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java @@ -13,8 +13,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; import org.h2.jdbc.JdbcSQLException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class FlywayExtensionCleanAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("clean-at-start-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java index aa6800c0f71c6..0ce8f0c6ee495 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class FlywayExtensionConfigDefaultDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(FlywayExtensionConfigFixture.class) .addClasses(FlywayExtensionCallback.class, FlywayExtensionCallback2.class) .addAsResource("config-for-default-datasource.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java index 4fee05bb4e9e3..4153bca4a8707 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(FlywayExtensionConfigFixture.class) .addAsResource("config-for-default-datasource-without-flyway.properties", "application.properties")); @@ -37,4 +35,4 @@ public void testFlywayDefaultConfigInjection() { fixture.assertDefaultConfigurationSettings(flyway.getConfiguration()); assertFalse(fixture.migrateAtStart("")); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java index a7195077bdf8a..ac1eaa444fcd8 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class FlywayExtensionConfigEmptyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("config-empty.properties", "application.properties")); @Test @@ -35,4 +33,4 @@ public class FlywayExtensionConfigEmptyTest { public void testFlywayNotAvailableWithoutDataSource() { assertThrows(UnsatisfiedResolutionException.class, flyway::get); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java index d65f98b3eec7e..48fa3f519c6e5 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class FlywayExtensionConfigMissingNamedDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("config-for-missing-named-datasource.properties", "application.properties")); @Test @@ -36,4 +34,4 @@ public class FlywayExtensionConfigMissingNamedDataSourceTest { public void testFlywayNotAvailableWithoutDataSource() { assertThrows(UnsatisfiedResolutionException.class, flyway::get); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java index d9fabe94e96c9..6d4ce974f2662 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java @@ -6,8 +6,6 @@ import javax.inject.Named; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class FlywayExtensionConfigMultiDataSourcesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class) .addAsResource("config-for-multiple-datasources.properties", "application.properties")); @@ -71,4 +69,4 @@ public void testFlywayConfigDirectlyNamedInventoryInjection() { fixture.assertAllConfigurationSettings(flywayNamedInventory.getConfiguration(), "inventory"); assertFalse(fixture.migrateAtStart("")); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java index 3290a92ab3c0b..3795a64ab20d7 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class) .addAsResource("config-for-multiple-datasources-without-default.properties", "application.properties")); @@ -49,4 +47,4 @@ public void testFlywayConfigNamedInventoryInjection() { fixture.assertAllConfigurationSettings(flywayInventory.getConfiguration(), "inventory"); assertFalse(fixture.migrateAtStart("")); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java index 022ba04df7623..c17e8149e3b66 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class FlywayExtensionConfigNamedDataSourceWithoutDefaultTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class) .addAsResource("config-for-named-datasource-without-default.properties", "application.properties")); @@ -38,4 +36,4 @@ public void testFlywayConfigNamedUsersInjection() { fixture.assertAllConfigurationSettings(flywayUsers.getConfiguration(), "users"); assertFalse(fixture.migrateAtStart("")); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java index bcc66980f5c70..a313404927752 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import org.flywaydb.core.Flyway; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class FlywayExtensionConfigNamedDataSourceWithoutFlywayTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(FlywayExtensionConfigFixture.class) .addAsResource("config-for-named-datasource-without-flyway.properties", "application.properties")); @@ -39,4 +37,4 @@ public void testFlywayDefaultConfigInjection() { fixture.assertDefaultConfigurationSettings(flyway.getConfiguration()); assertFalse(fixture.migrateAtStart("users")); } -} \ No newline at end of file +} diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java index 7dc2b774d6bf7..bb1c8c6f0c004 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java @@ -17,8 +17,6 @@ import org.flywaydb.core.api.migration.Context; import org.flywaydb.core.api.migration.JavaMigration; import org.h2.jdbc.JdbcSQLException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class FlywayExtensionFilesystemResourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(V1_0_1__Update.class, V1_0_2__Update.class) .addAsResource("clean-and-migrate-at-start-with-fs-resource-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java index ecf717acbe25f..d0ca6e2dbe7a1 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import javax.sql.DataSource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class FlywayExtensionInitSqlTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("init-sql-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java index c01d1c12dc7a6..fc473ae613f5e 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java @@ -7,8 +7,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class FlywayExtensionMigrateAtStartNamedDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("migrate-at-start-config-named-datasource.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java index fa3d8e04c9c63..691a994acb227 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java @@ -7,8 +7,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class FlywayExtensionMigrateAtStartSubfolderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration-subfolder/subfolder/V1.0.0__Quarkus.sql") .addAsResource("migrate-at-start-subfolder-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java index 72c1472a12496..d7ec0171b3e7c 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java @@ -7,8 +7,6 @@ import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class FlywayExtensionMigrateAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/migration/V1.0.0__Quarkus.sql") .addAsResource("migrate-at-start-config.properties", "application.properties")); diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java index e81e0559534ca..7fdb0262c9e6a 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.CoreMatchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class FlywayMultiDataSourcesDevModeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MultiDataSourcesDevModeEndpoint.class, FlywayExtensionCallback.class) .addAsResource("config-for-multiple-datasources.properties", "application.properties")); diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java index 4db5558ce1fcf..b6a0ac1dbee31 100644 --- a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java +++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class QueryReaderTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Simple.class, Nested.class, NestedCollection.class, QueryFunction.class)); @Test diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java index b53589de17396..80bedbcdcaf29 100644 --- a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java +++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class RootPathTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(PrimitiveFunctions.class, GreetingFunctions.class, Greeting.class, GreetingService.class, GreetingTemplate.class)); diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/SimpleTest.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/SimpleTest.java index 2476d5f9b80b4..7dd84eac65122 100644 --- a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/SimpleTest.java +++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/SimpleTest.java @@ -5,8 +5,6 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -19,7 +17,7 @@ public class SimpleTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PrimitiveFunctions.class, GreetingFunctions.class, Greeting.class, GreetingService.class, GreetingTemplate.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java index 5dc4b26e11e48..d9f9aa1a47776 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java @@ -4,8 +4,6 @@ import java.util.Base64; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class BinaryPayloadTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BinaryPayload.class)); private static final byte[] IN = new byte[] { 0x12, 0x34, 0x56, 0x78 }; diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ContextTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ContextTest.java index ab8507c3a492a..772fef17ed741 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ContextTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ContextTest.java @@ -1,7 +1,5 @@ package io.quarkus.funqy.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class ContextTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ContextFunction.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java index af7873a7438a3..0a3343ef5b73f 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java @@ -8,8 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -23,7 +21,7 @@ public class ExposedCloudEventTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExposedCloudEvents.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/FallbackTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/FallbackTest.java index a563a275b5565..860309271db6a 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/FallbackTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/FallbackTest.java @@ -6,8 +6,6 @@ import java.util.UUID; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class FallbackTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("trigger.properties", "application.properties") .addClasses(PrimitiveFunctionsWithFallback.class, GreetingFunctions.class, Greeting.class, GreetingService.class, diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingAsyncTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingAsyncTest.java index 23463a057dcc7..1e7729e4e7099 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingAsyncTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingAsyncTest.java @@ -1,7 +1,5 @@ package io.quarkus.funqy.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -9,7 +7,7 @@ public class GreetingAsyncTest extends GreetTestBase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("greeting-async.properties", "application.properties") .addClasses(PrimitiveFunctions.class, GreetingFunctions.class, Greeting.class, GreetingService.class, Identity.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingSyncTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingSyncTest.java index 708487bee297a..b6b335e2a7fbc 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingSyncTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingSyncTest.java @@ -1,7 +1,5 @@ package io.quarkus.funqy.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -9,7 +7,7 @@ public class GreetingSyncTest extends GreetTestBase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("greeting.properties", "application.properties") .addClasses(PrimitiveFunctions.class, GreetingFunctions.class, Greeting.class, GreetingService.class, Identity.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java index d1ef5a25da77f..c4fbacd828076 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java @@ -4,8 +4,6 @@ import java.util.UUID; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class MappingTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("trigger.properties", "application.properties") .addClasses(PrimitiveFunctions.class, GreetingFunctions.class, Greeting.class, GreetingService.class, Identity.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java index 4db5558ce1fcf..b6a0ac1dbee31 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class QueryReaderTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Simple.class, Nested.class, NestedCollection.class, QueryFunction.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java index 9bf5c72ac79b9..b9ea2af442974 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class RootPathTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(PrimitiveFunctions.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/VoidFunctionTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/VoidFunctionTest.java index ddb7f912a3104..73f94945a0562 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/VoidFunctionTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/VoidFunctionTest.java @@ -4,8 +4,6 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class VoidFunctionTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("void-function.properties", "application.properties") .addClasses(VoidFunction.class)); diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithAttributeFilterTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithAttributeFilterTest.java index 48151e2b70461..2b69bdbbe06ed 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithAttributeFilterTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithAttributeFilterTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class WithAttributeFilterTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WithAttributeFilter.class, Identity.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithConflictingAttributeFilterTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithConflictingAttributeFilterTest.java index f6341568226a8..2719b2c7b2855 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithConflictingAttributeFilterTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithConflictingAttributeFilterTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class WithConflictingAttributeFilterTest { assertTrue(found, "Build failed with wrong exception, expected IllegalStateException but got " + t); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WithConflictingAttributeFilter.class, Identity.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithDuplicateAttributeFilterTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithDuplicateAttributeFilterTest.java index 909612c5c32c1..aa153e4c534dc 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithDuplicateAttributeFilterTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithDuplicateAttributeFilterTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class WithDuplicateAttributeFilterTest { assertTrue(found, "Build failed with wrong exception, expected IllegalStateException but got " + t); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WithDuplicateAttributeFilter.class, Identity.class)); @Test diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java index 3e2084403e7fe..e72641f91fafd 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class WithGenericsTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WithGenerics.class, Identity.class)); @Test diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java index fcc798338f4eb..79e1539e17181 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class InvalidInjectionTypeTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(GreeterGrpc.class, GreeterGrpc.GreeterStub.class, MutinyGreeterGrpc.MutinyGreeterStub.class, MutinyGreeterGrpc.class, HelloRequest.class, HelloReply.class, diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java index 82d338c92d0e0..3b7756a9bba66 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java @@ -10,8 +10,6 @@ import java.util.concurrent.TimeUnit; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class DevConsoleUnaryMethodTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addPackage(MutinyGreeterGrpc.class.getPackage()) + .withApplicationRoot((jar) -> jar.addPackage(MutinyGreeterGrpc.class.getPackage()) .addClass(MutinyHelloService.class)); @Test diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/lock/detection/BlockingClientCallOnEventLoopTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/lock/detection/BlockingClientCallOnEventLoopTest.java index c46c3a509a645..e3a2d7cb77a8f 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/lock/detection/BlockingClientCallOnEventLoopTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/lock/detection/BlockingClientCallOnEventLoopTest.java @@ -4,8 +4,6 @@ import java.time.Duration; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class BlockingClientCallOnEventLoopTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setFlatClassPath(true) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloService.class, CallBlockingService.class, CallBlocking.class) .addPackage(GreeterGrpc.class.getPackage()) .addPackage(CallBlockingGrpc.class.getPackage())); diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java index 1d5a8a5d423e0..97f5ae868184e 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java @@ -8,8 +8,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class GrpcServerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyFakeService.class, MySecondFakeService.class)) .withConfigurationResource("grpc-server-no-health-configuration.properties"); diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/NoServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/NoServerTest.java index 536ccfe3297ce..3f180f3a72ece 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/NoServerTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/NoServerTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class NoServerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartDisabledTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartDisabledTest.java index f140ce652b917..1eb384bd2b3b8 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartDisabledTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartDisabledTest.java @@ -2,9 +2,7 @@ import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DevModeServerStartDisabledTest { @RegisterExtension public static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(IsUpEndpoint.class) .add(new StringAsset("quarkus.grpc.dev-mode.force-server-start=false\n"), "application.properties")); diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartTest.java index f5ef8974b7b23..3dd7a9e5e4e8b 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServerStartTest.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DevModeServerStartTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(IsUpEndpoint.class)); @Test diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversAuditTableSuffixTestCase.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversAuditTableSuffixTestCase.java index fe7e8560d1fc4..fc5bceedb774a 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversAuditTableSuffixTestCase.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversAuditTableSuffixTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class EnversAuditTableSuffixTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyAuditedEntity.class, MyRevisionEntity.class, MyRevisionListener.class, EnversTestAuditTableSuffixResource.class) .addAsResource("application-with-store-data-at-delete.properties", "application.properties")); diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java index 57dcc12149180..b85d1dc123544 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java @@ -3,8 +3,6 @@ import javax.inject.Inject; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.wildfly.common.Assert; @@ -25,7 +23,7 @@ public class EnversFastBootingTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyAuditedEntity.class)) .withConfigurationResource("application.properties") .addClassLoaderEventListener(limitsChecker); diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java index b578d321972a5..347a394f0a94e 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class EnversStoreDataAtDeleteTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyAuditedEntity.class, MyRevisionEntity.class, MyRevisionListener.class, EnversTestStoreDataAtDeleteResource.class) .addAsResource("application-with-store-data-at-delete.properties", "application.properties")); diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversValidationTestCase.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversValidationTestCase.java index 5eb83a89c23e4..b67f6bef0aaf4 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversValidationTestCase.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversValidationTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class EnversValidationTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyAuditedEntity.class, MyRevisionEntity.class, MyRevisionListener.class, EnversTestValidationResource.class) .addAsResource("application.properties") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java index aec3b2a325234..69301043d3371 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class ExcludePersistenceXmlConfigTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .setBeforeAllCustomizer(() -> System.setProperty(SKIP_PARSE_PERSISTENCE_XML, "true")) .setAfterAllCustomizer(() -> System.getProperties().remove(SKIP_PARSE_PERSISTENCE_XML)) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Address.class) .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java index 52c1bb4fb2f01..f391a789273f3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java @@ -20,7 +20,7 @@ public class HibernateHotReloadTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, MyEntityTestResource.class) .add(new StringAsset( //TODO: we can't use devservices here because of issues with the class loading diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java index 812aca9d8a665..51895d50c14e3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java @@ -13,8 +13,6 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class HibernateMetricsTestCase { @RegisterExtension - static QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + static QuarkusUnitTest TEST = new QuarkusUnitTest().withApplicationRoot((jar) -> jar .addAsResource("application-metrics-enabled.properties", "application.properties") .addClasses(DummyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateSchemaRecreateDevConsoleTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateSchemaRecreateDevConsoleTestCase.java index aed18b9d75170..b386fcca8b962 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateSchemaRecreateDevConsoleTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateSchemaRecreateDevConsoleTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class HibernateSchemaRecreateDevConsoleTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, MyEntityTestResource.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java index e3ef14bb7c474..16a072e787fbc 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java @@ -6,8 +6,6 @@ import org.hibernate.Session; import org.hibernate.cache.spi.CacheImplementor; import org.hibernate.cache.spi.TimestampsCache; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class JPACacheDisabledTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Address.class)) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.hibernate-orm.second-level-caching-enabled", "false"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java index 7654e019669a8..78bcacddd6b2a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java @@ -3,8 +3,6 @@ import javax.inject.Inject; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.wildfly.common.Assert; @@ -27,7 +25,7 @@ public class JPAFastBootingTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Address.class)) .withConfigurationResource("application.properties") .addClassLoaderEventListener(limitsChecker); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java index f0fec7faf92eb..27bbb9c23b507 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java @@ -4,8 +4,6 @@ import javax.persistence.EntityManager; import javax.persistence.TransactionRequiredException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class NoTransactionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Address.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java index b88102e14bd4b..1f32c84dd1535 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java @@ -6,8 +6,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class UseNamedDatasourceTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsResource("application-named-datasource.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java index 995bd03db4f54..f42f99c5d75dc 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java @@ -13,8 +13,6 @@ import javax.transaction.UserTransaction; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class AttributeConverterAutoApplyTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(MyData.class) .addClass(MyDataConverter.class)) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java index 067f503d0d55f..cc27d1a5bbf1b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java @@ -9,8 +9,6 @@ import org.hibernate.Hibernate; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class BatchFetchSizeTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MainEntity.class) .addClass(OtherEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java index 4a4b3fb8b42bc..4285499aad472 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest { "To solve this, configure datasource 'ds-1'.", "Refer to https://quarkus.io/guides/datasource for guidance."); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsResource("application-default-pu-explicit-unconfigured-datasource.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java index 244ec2335b403..4882a27bfa45a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest { .hasMessageContainingAll( "Model classes are defined for the default persistence unit, but no default datasource was found. The default EntityManagerFactory will not be created. To solve this, configure the default datasource. Refer to https://quarkus.io/guides/datasource for guidance."); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class)) .overrideConfigKey("quarkus.datasource.devservices", "false"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java index a449b0c486d10..697e7522f9413 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.config; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class NoEntitiesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testNoEntities() { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java index 1f610346a9e07..d313d24c1cf28 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java @@ -2,9 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class NoHibernatePropertiesTest { .hasMessageContainingAll( "The Hibernate ORM configuration in Quarkus does not support sourcing configuration properties from resources named `hibernate.properties`"); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsResource(new StringAsset(""), "hibernate.properties")) .withConfigurationResource("application.properties") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java index 1839102cb82b5..fdcaf43005835 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest { "To solve this, configure datasource 'ds-1'.", "Refer to https://quarkus.io/guides/datasource for guidance."); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(MyEntity.class.getPackage().getName()) .addAsResource("application-named-pu-explicit-unconfigured-datasource.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java index c7455fb38d401..30529cbbdd23e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class EntitiesInNamedPUWithoutDatasourceTest { }) .withConfigurationResource("application-named-pu-no-datasource.properties") .overrideConfigKey("quarkus.datasource.devservices", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(MyEntity.class.getPackage().getName())); @Test diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationFailingDDLGenerationTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationFailingDDLGenerationTestCase.java index dee44888acfb8..6e5ec71a4b02e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationFailingDDLGenerationTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationFailingDDLGenerationTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DevConsolePuInformationFailingDDLGenerationTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntityWithFailingDDLGeneration.class, TypeWithUnsupportedSqlCode.class, DevConsoleInfoSupplierTestResource.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationTestCase.java index 4671f4da14fda..2fa9b38d2a0fb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsolePuInformationTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DevConsolePuInformationTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntityWithSuccessfulDDLGeneration.class, DevConsoleInfoSupplierTestResource.class) .addAsResource("application.properties") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java index d322aaabc2602..9d2df3696772c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java @@ -25,8 +25,6 @@ import javax.transaction.UserTransaction; import org.hibernate.annotations.Immutable; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -42,7 +40,7 @@ public class HibernateEntityEnhancerFinalFieldTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( EntityWithFinalField.class, EntityWithEmbeddedIdWithFinalField.class, EntityWithEmbeddedIdWithFinalField.EmbeddableId.class, diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java index 8c68384406438..0171ef5763be2 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class IgnoreExplicitForJoinedDefaultValueTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class) .addAsResource("application-discriminator-ignore-explicit-for-joined-default-value.properties", "application.properties")); @@ -34,4 +32,4 @@ public void testDefaultValue() { Map properties = em.getEntityManagerFactory().getProperties(); assertEquals("false", properties.get("hibernate.discriminator.ignore_explicit_for_joined")); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java index cd5372ae27fb7..01d6cef662322 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addClass(Plane.class) .addAsResource("application-multiple-pu-discriminator-ignore-explicit-for-joined-default-value.properties", @@ -44,4 +42,4 @@ public void testDefaultValue() { Map inventoryProperties = emUsers.getEntityManagerFactory().getProperties(); assertEquals("false", inventoryProperties.get("hibernate.discriminator.ignore_explicit_for_joined")); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java index a857bfdae0dcb..503445ed4621e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsManifestResource("META-INF/persistence-discriminator-ignore-explicit-for-joined-default-value.xml", "persistence.xml") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java index 88a5b7839546d..0a1afb5c947f6 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsManifestResource("META-INF/persistence-discriminator-ignore-explicit-for-joined-false-value.xml", "persistence.xml") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java index 342ea433a9643..326562e12bf75 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class IgnoreExplicitForJoinedTrueValueTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class) .addAsResource("application-discriminator-ignore-explicit-for-joined-true-value.properties", "application.properties")); @@ -34,4 +32,4 @@ public void testTrueValue() { Map properties = em.getEntityManagerFactory().getProperties(); assertEquals("true", properties.get("hibernate.discriminator.ignore_explicit_for_joined")); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java index 9f50f1b6f37a3..73564b1cf1d77 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addClass(Plane.class) .addAsResource("application-multiple-pu-discriminator-ignore-explicit-for-joined-true-value.properties", @@ -44,4 +42,4 @@ public void testTrueValue() { Map inventoryProperties = emUsers.getEntityManagerFactory().getProperties(); assertEquals("true", inventoryProperties.get("hibernate.discriminator.ignore_explicit_for_joined")); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java index da236bc922d50..b6ce4786af3e3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsManifestResource("META-INF/persistence-discriminator-ignore-explicit-for-joined-true-value.xml", "persistence.xml") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java index 28d02b4b8017b..3acbf402aed18 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java @@ -18,8 +18,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.type.Type; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class ApplicationScopedInterceptorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(ApplicationScopedInterceptor.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java index e2c1f014bafce..c6b7a42a656d4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java @@ -19,8 +19,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.type.Type; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class DependentInterceptorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(DependentInterceptor.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java index 67cc3cb26da46..029d581d7f12d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java @@ -20,8 +20,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.type.Type; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class TransactionScopedInterceptorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(TransactionScopedInterceptor.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java index 44667eda47b16..8531fbdf9e717 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java @@ -8,8 +8,6 @@ import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,7 +20,7 @@ public class LogSqlFormatSqlDefaultValueTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class) .addAsResource("application-log-sql-format-sql-default.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java index cd3fad14e232c..19dc98dd5bd75 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java @@ -8,8 +8,6 @@ import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -23,7 +21,7 @@ public class LogSqlFormatSqlFalseTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class) .addAsResource("application-log-sql-format-sql-false.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java index c01ac72edd1fe..43179c824ca99 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java @@ -6,8 +6,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class MetadataBuilderContributorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(CustomMetadataBuilderContributor.class) .addAsResource("application-metadata-builder-contributor.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java index 947a7bb72b72b..0b0d76fe1408e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiplePersistenceUnitsCdiEntityManagerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addClass(User.class) .addClass(Plane.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java index 92aeb61309f5d..db36a956e6b62 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java @@ -7,8 +7,6 @@ import javax.transaction.Transactional; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiplePersistenceUnitsCdiSessionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addClass(User.class) .addClass(Plane.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java index 36278068a0136..c54039c29950c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java @@ -5,8 +5,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MultiplePersistenceUnitsClassLevelAnnotationTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(EntityWithClassLevelPersistenceUnit.class) .addAsResource("application-multiple-persistence-units.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java index ecf568a277f67..4c057940328d8 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java @@ -4,8 +4,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiplePersistenceUnitsImportSqlHotReloadScriptTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(Plane.class.getPackage().getName()) .addPackage(SharedEntity.class.getPackage().getName()) .addPackage(User.class.getPackage().getName()) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java index 04080ef8d7f23..3cb6a435f7cb9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits; import org.hibernate.dialect.H2Dialect; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MultiplePersistenceUnitsInconsistentStorageEnginesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addClass(DefaultEntity.class) .addClass(User.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java index 2e6f4d04f4308..3ea762b478a4e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java @@ -13,8 +13,6 @@ import org.hibernate.EmptyInterceptor; import org.hibernate.Session; import org.hibernate.type.Type; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class MultiplePersistenceUnitsInterceptorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addClass(User.class) .addClass(Plane.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java index 3f3242315668d..b60cc19306e3c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MultiplePersistenceUnitsPackageAnnotationsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(Plane.class.getPackage().getName()) .addPackage(SharedEntity.class.getPackage().getName()) .addPackage(User.class.getPackage().getName()) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java index b5de7c5613f60..559c3afaea2b0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java @@ -7,8 +7,6 @@ import javax.persistence.PersistenceContext; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultiplePersistenceUnitsResourceInjectionEntityManagerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addClass(Plane.class) .addAsResource("application-multiple-persistence-units.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java index 517bd845e485b..9f6bb37c5e904 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java @@ -7,8 +7,6 @@ import javax.transaction.Transactional; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultiplePersistenceUnitsResourceInjectionSessionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addClass(Plane.class) .addAsResource("application-multiple-persistence-units.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java index cc84cce4ec5bd..1f23dad8c30ff 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java @@ -11,8 +11,6 @@ import javax.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class MultiplePersistenceUnitsUnaffectedEntitiesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addClass(User.class) .addClass(Plane.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java index 06958381d8829..c405c8683ef4d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MultiplePersistenceUnitsUndefinedPackagesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(User.class) .addAsResource("application-multiple-persistence-units-undefined-packages.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java index 7ac2ebfc2d317..79aab86e17251 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,7 +18,7 @@ public class ImplicitNamingStrategyTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, CustomImplicitNamingStrategy.class) .addAsResource(EmptyAsset.INSTANCE, "import.sql") .addAsResource("application-implicit-naming-strategy.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java index e92703d9f8bc1..757e4a47c97c3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,7 +19,7 @@ public class PhysicalNamingStrategyTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, PrefixPhysicalNamingStrategy.class) .addAsResource(EmptyAsset.INSTANCE, "import.sql") .addAsResource("application-physical-naming-strategy.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java index 8272eb753d774..20f2da92decbb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java @@ -8,8 +8,6 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class PackageLevelAnnotationTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(PackageLevelAnnotationTest.class.getPackage()) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java index 0db02bafc908b..b1916e4be18e8 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java @@ -10,8 +10,6 @@ import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class InvalidTypeForPersistenceUnitExtensionTest { "Invalid bean:", InvalidExtension.class.getName()); }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, InvalidExtension.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessAssociationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessAssociationsTest.java index 59068f07c0b9b..47899dee9a8fe 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessAssociationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessAssociationsTest.java @@ -23,8 +23,6 @@ import javax.transaction.UserTransaction; import org.hibernate.Hibernate; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class PublicFieldAccessAssociationsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(ContainingEntity.class) .addClass(FieldAccessEnhancedDelegate.class)) .withConfigurationResource("application-fetch-max-depth-zero.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java index 406eb305b2d58..877eac326e4ec 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java @@ -17,8 +17,6 @@ import javax.transaction.UserTransaction; import org.hibernate.Hibernate; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class PublicFieldAccessFieldTypesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(FieldAccessEnhancedDelegate.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFinalFieldTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFinalFieldTest.java index 88d2667c02a6f..1f7a6ac0a8053 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFinalFieldTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFinalFieldTest.java @@ -25,8 +25,6 @@ import javax.transaction.UserTransaction; import org.hibernate.annotations.Immutable; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -42,7 +40,7 @@ public class PublicFieldAccessFinalFieldTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( EntityWithFinalField.class, EntityWithEmbeddedIdWithFinalField.class, EntityWithEmbeddedIdWithFinalField.EmbeddableId.class, diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java index be03cf81d7ce4..f43f146b887ff 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java @@ -16,8 +16,6 @@ import javax.transaction.UserTransaction; import org.hibernate.Hibernate; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class PublicFieldAccessInheritanceTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyMappedSuperclass.class) .addClass(MyAbstractEntity.class) .addClass(MyConcreteEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/JPAQuotedTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/JPAQuotedTestCase.java index ce49f099a34f2..68d711a3877f3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/JPAQuotedTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/JPAQuotedTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.core.StringContains.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class JPAQuotedTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Group.class, QuotedResource.class) .addAsResource("application-quoted-identifiers.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/scripts/GenerateScriptNotAppendedTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/scripts/GenerateScriptNotAppendedTestCase.java index 370e0267ad4dc..2775567f5b77b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/scripts/GenerateScriptNotAppendedTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/scripts/GenerateScriptNotAppendedTestCase.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.regex.Pattern; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class GenerateScriptNotAppendedTestCase { @RegisterExtension static QuarkusDevModeTest runner = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-generate-script.properties", "application.properties") .addClasses(MyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java index 94a4d85c669ff..4ec4a334aa694 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java @@ -6,8 +6,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SinglePersistenceUnitCdiEntityManagerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java index 6af04765baa90..a5b83067021a0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java @@ -6,8 +6,6 @@ import javax.transaction.Transactional; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SinglePersistenceUnitCdiSessionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java index 05d1541453089..97b252688ad6c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java @@ -6,8 +6,6 @@ import javax.persistence.PersistenceContext; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SinglePersistenceUnitResourceInjectionEntityManagerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java index 278a49f7fd19f..4e2e5904cf0f0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java @@ -6,8 +6,6 @@ import javax.transaction.Transactional; import org.hibernate.Session; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SinglePersistenceUnitResourceInjectionSessionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/EarlyMetadaValidationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/EarlyMetadaValidationTest.java index 0eeb023a8025c..6a605a5468b40 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/EarlyMetadaValidationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/EarlyMetadaValidationTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.specialmappings; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class EarlyMetadaValidationTest { @RegisterExtension final static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DataIdentity.class, IdVersionPK.class, NormalPointEntity.class, PointEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/AddNewSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/AddNewSqlLoadScriptTestCase.java index 068c67059140e..0d893b98158e5 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/AddNewSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/AddNewSqlLoadScriptTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class AddNewSqlLoadScriptTestCase { @RegisterExtension static QuarkusDevModeTest runner = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties") .addAsResource("import.sql") .addClasses(SqlLoadScriptTestResource.class, MyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/DefaultSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/DefaultSqlLoadScriptTestCase.java index 9b9a5b944845a..85eaae940e607 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/DefaultSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/DefaultSqlLoadScriptTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DefaultSqlLoadScriptTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties") .addAsResource("import.sql") .addClasses(SqlLoadScriptTestResource.class, MyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java index ee5f728e42d6b..79c2a6347459f 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class FileNotFoundSqlLoadScriptTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class)) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.hibernate-orm.sql-load-script", "file-that-does-not-exist.sql") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java index 23047dbe68e98..c998dcc8cf557 100755 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.sql_load_script; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ImportMultipleSqlLoadScriptsFileAbsentTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-import-multiple-load-scripts-test.properties", "application.properties") .addAsResource("import-multiple-load-scripts-1.sql", "import-1.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java index 44bc7b534df56..f3f90d7b0b033 100755 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ImportMultipleSqlLoadScriptsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-import-multiple-load-scripts-test.properties", "application.properties") .addAsResource("import-multiple-load-scripts-1.sql", "import-1.sql") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlHotReloadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlHotReloadScriptTestCase.java index e0b196f2ff721..ed45e19fe68ae 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlHotReloadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlHotReloadScriptTestCase.java @@ -4,8 +4,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ImportSqlHotReloadScriptTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-import-load-script-test.properties", "application.properties") .addAsResource("import.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlLoadScriptTestCase.java index 2cc1ae789c19a..f99d4f07078fa 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportSqlLoadScriptTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ImportSqlLoadScriptTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-import-load-script-test.properties", "application.properties") .addAsResource("import.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java index ee56b96781249..176144c78b165 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class IntroducingDefaultImportScriptTestCase { @RegisterExtension static QuarkusDevModeTest runner = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties") .addClasses(SqlLoadScriptTestResource.class, MyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java index b43016ef5f327..dd4a1347ae167 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java @@ -2,8 +2,6 @@ import javax.persistence.PersistenceException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidMultilineSqlLoadScriptTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(PersistenceException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-invalid-multiline-test.properties", "application.properties") .addAsResource("invalid-multiline.sql") .addClasses(MyEntity.class)); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/NoFileOptionTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/NoFileOptionTestCase.java index 75465e0955e3d..22356ce31cee7 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/NoFileOptionTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/NoFileOptionTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class NoFileOptionTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-no-file-option-test.properties", "application.properties") .addAsResource("import.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptFileAbsentTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptFileAbsentTestCase.java index 2c919923891c2..511b9e2e5261b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptFileAbsentTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptFileAbsentTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.sql_load_script; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class SqlLoadScriptFileAbsentTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class) .addAsResource("application-other-load-script-test.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptPresentTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptPresentTestCase.java index d042b3a3ea838..21a1377b4a735 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptPresentTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptPresentTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class SqlLoadScriptPresentTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, SqlLoadScriptTestResource.class) .addAsResource("application-other-load-script-test.properties", "application.properties") .addAsResource("load-script-test.sql")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java index 9d4ee57f1a389..d90b43798d551 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java @@ -21,8 +21,6 @@ import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -42,7 +40,7 @@ public abstract class AbstractTransactionLifecycleTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SimpleEntity.class) .addAsResource("application.properties")) // Expect no warnings (in particular from Agroal) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java index 530eddd3e2fed..f8fe1218f59c4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java @@ -3,9 +3,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class JPAValidationTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, JPATestValidationResource.class) .addAsResource("application.properties") .addAsResource(new StringAsset(""), "import.sql")); // define an empty import.sql file diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadExplicitFileTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadExplicitFileTestCase.java index 941b83d35aa8c..bd2667c0ab7bf 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadExplicitFileTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadExplicitFileTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class HbmXmlHotReloadExplicitFileTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java index ac174c7cc9af3..506ce6f0a26c4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class HbmXmlQuarkusConfigTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java index c692aceb09701..b4a753e39a8e3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlAnnotationOverrideTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(AnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadExplicitFileTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadExplicitFileTestCase.java index 90d2df48f7a0c..40a300082fcb3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadExplicitFileTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadExplicitFileTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OrmXmlHotReloadExplicitFileTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadImplicitFileTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadImplicitFileTestCase.java index 9978adaaa5414..c5666f1d72d2b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadImplicitFileTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadImplicitFileTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OrmXmlHotReloadImplicitFileTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java index 155308382b6ad..7dc1d9290c678 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class OrmXmlPackageTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java index 16f715e41af51..e4bec7228c7d7 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlPersistenceXmlExplicitFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java index 0555f1a7a3767..f7e6e79e7fff4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class OrmXmlPersistenceXmlImplicitFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java index 524693d3ddbfc..c51a708728b32 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlPersistenceXmlNoFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(AnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java index 632083f45f67d..24676dd89b24c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlQuarkusConfigExplicitFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java index 59e3d49fce8b4..9cca47240bcd3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlQuarkusConfigImplicitFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(NonAnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java index cced6ecd8d935..2179bd835eaa1 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManagerFactory; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OrmXmlQuarkusConfigNoFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(SchemaUtil.class) .addClass(AnnotatedEntity.class) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigTest.java index 0780494d52f98..2659606bdc9d2 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class ExcludePersistenceXmlConfigTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .setBeforeAllCustomizer(() -> System.setProperty(SKIP_PARSE_PERSISTENCE_XML, "true")) .setAfterAllCustomizer(() -> System.getProperties().remove(SKIP_PARSE_PERSISTENCE_XML)) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") .addAsResource("application.properties", "application.properties")); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java index efa72dca69ac9..887b1234f590c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java @@ -4,8 +4,6 @@ import javax.persistence.EntityManager; import javax.transaction.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class PersistenceXmlTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(SmokeTestUtils.class) .addClass(MyEntity.class) .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java index 3390963f1cba7..b5dc7747cec68 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java @@ -10,8 +10,6 @@ import javax.persistence.Table; import org.hibernate.reactive.mutiny.Mutiny; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiLineImportTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Hero.class) .addAsResource("complexMultilineImports.sql", "import.sql")) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java index b1434d0492996..fceb171984848 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.reactive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,7 +9,7 @@ public class NoEntitiesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testNoEntities() { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java index 8a9c28b1ef08e..836cde3ea438e 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java @@ -15,8 +15,6 @@ import org.hibernate.reactive.mutiny.Mutiny; import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class NoJtaTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/HibernateReactiveDevModeTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/HibernateReactiveDevModeTest.java index c6b405936eddc..c6425d42fa420 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/HibernateReactiveDevModeTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/HibernateReactiveDevModeTest.java @@ -5,9 +5,7 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class HibernateReactiveDevModeTest { @RegisterExtension static QuarkusDevModeTest runner = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Fruit.class, FruitMutinyResource.class).addAsResource("application.properties") .addAsResource(new StringAsset("INSERT INTO known_fruits(id, name) VALUES (1, 'Cherry');\n" + "INSERT INTO known_fruits(id, name) VALUES (2, 'Apple');\n" + diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java index 08e46e0a94666..bd8938baf65a0 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java @@ -15,8 +15,6 @@ import javax.transaction.SystemException; import org.hibernate.reactive.mutiny.Mutiny; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class PublicFieldAccessFieldTypesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyEntity.class) .addClass(FieldAccessEnhancedDelegate.class)) .withConfigurationResource("application.properties"); diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java index 798d3f6d1acfe..f26653c80c67b 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java @@ -14,8 +14,6 @@ import javax.transaction.SystemException; import org.hibernate.reactive.mutiny.Mutiny; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class PublicFieldAccessInheritanceTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyMappedSuperclass.class) .addClass(MyAbstractEntity.class) .addClass(MyConcreteEntity.class) diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java index 4ae0f0dd0ea72..dc64d28e4dbf4 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java @@ -7,8 +7,6 @@ import org.hibernate.SessionFactory; import org.hibernate.reactive.mutiny.Mutiny; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SinglePersistenceUnitCdiMutinySessionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java index 443279d21c509..84996fdfc3fd6 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java @@ -5,8 +5,6 @@ import javax.persistence.Entity; import javax.persistence.Id; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class FileNotFoundSqlLoadScriptTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class)) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.hibernate-orm.sql-load-script", "file-that-does-not-exist.sql") diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java index c42bec47d34ce..a50dcf598b1d1 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java @@ -17,8 +17,6 @@ import org.hibernate.search.mapper.orm.mapping.SearchMapping; import org.hibernate.search.mapper.orm.session.SearchSession; import org.hibernate.search.util.common.SearchException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class MultiplePersistenceUnitsCdiTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(DefaultPUEntity.class.getPackage()) .addPackage(PU1Entity.class.getPackage()) .addPackage(PU2Entity.class.getPackage()) diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/offline/StartOfflineTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/offline/StartOfflineTest.java index a0e2f693ee84c..e9e5c222a8556 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/offline/StartOfflineTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/offline/StartOfflineTest.java @@ -10,8 +10,6 @@ import org.hibernate.search.mapper.orm.mapping.SearchMapping; import org.hibernate.search.mapper.orm.session.SearchSession; import org.hibernate.search.util.common.SearchException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class StartOfflineTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(IndexedEntity.class) .addAsResource("application-start-offline.properties", "application.properties")); diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java index bf78afc959764..bb09d30b90985 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java @@ -11,8 +11,6 @@ import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity; import org.hibernate.search.mapper.orm.mapping.SearchMapping; import org.hibernate.search.mapper.orm.session.SearchSession; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SinglePersistenceUnitsCdiTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DefaultPUEntity.class) .addAsResource("application.properties")); diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java index 7c43a10fbc555..d787dcd246f67 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DevModeConstraintValidationTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestBean.class, + .withApplicationRoot((jar) -> jar.addClasses(TestBean.class, DevModeTestResource.class, ClassLevelConstraint.class, ClassLevelValidator.class, DependentTestBean.class)); @Test diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java index 68cee40b3f303..f13a896c2f8c8 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class JacksonErroneousTimeZonePropertiesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Pojo.class, SomeBean.class)) + .withApplicationRoot((jar) -> jar.addClasses(Pojo.class, SomeBean.class)) .withConfigurationResource("application-erroneous-timezone-properties.properties") .setExpectedException(ZoneRulesException.class); diff --git a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java index 9887d8524f2e4..d96e95470b6e8 100644 --- a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java +++ b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java @@ -10,8 +10,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class JaegerMetricsTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .withConfigurationResource("application-metrics-enabled.properties"); @Inject diff --git a/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java b/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java index ff5504bca36bf..a285aa1e53773 100644 --- a/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java +++ b/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java @@ -10,8 +10,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DevServicesDB2DatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("container-license-acceptance.txt")) // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() diff --git a/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java index 93fcb2e2eb7a8..cefdaad778cb0 100644 --- a/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java @@ -11,8 +11,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DevServicesDerbyDatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() // There are other warnings: JDK8, TestContainers, drivers, ... diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java index 6b21bed059d8f..cf871a848903a 100644 --- a/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java @@ -11,8 +11,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DevServicesMariaDBDatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() // There are other warnings: JDK8, TestContainers, drivers, ... diff --git a/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java b/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java index a0b582941aff8..77718dc7ac54b 100644 --- a/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java @@ -10,8 +10,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DevServicesMsSQLDatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("container-license-acceptance.txt")) // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() diff --git a/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java index 1c9e9b22ae702..11eb452ffedb8 100644 --- a/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java @@ -11,8 +11,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DevServicesMySQLDatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() // There are other warnings: JDK8, TestContainers, drivers, ... diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java index a2e6cca4ff207..6c0271e5f651d 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DevServicesPostgresqlDatasourceDevModeTestCase { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(PgResource.class) .addAsResource(new StringAsset(""), "application.properties")) // Expect no warnings (in particular from Agroal) diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java index e0a5765812f91..3041f45030ec0 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java @@ -11,8 +11,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DevServicesPostgresqlDatasourceTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() // Expect no warnings (in particular from Agroal) .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue() // There are other warnings: JDK8, TestContainers, drivers, ... diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java index 90e03d07fd21f..5133812d176a5 100644 --- a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java +++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java @@ -8,8 +8,6 @@ import javax.json.bind.Jsonb; import javax.json.bind.adapter.JsonbAdapter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class JsonbAdapterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Alpha.class, AlphaAdapter.class, Bravo.class)); @Inject diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateNamedDataSourceTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateNamedDataSourceTest.java index ff0f023cd6a02..adf9e3b176ab7 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateNamedDataSourceTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateNamedDataSourceTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class LiquibaseExtensionBaselineOnMigrateNamedDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml") .addAsResource("baseline-on-migrate-named-datasource.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java index 49efc2f8804a1..1cab343710530 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.sql.DataSource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class LiquibaseExtensionBaselineOnMigrateTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("baseline-on-migrate.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAndMigrateAtStartTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAndMigrateAtStartTest.java index f756f7e13c50a..cf4f75d12726b 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAndMigrateAtStartTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAndMigrateAtStartTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import org.h2.jdbc.JdbcSQLException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class LiquibaseExtensionCleanAndMigrateAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("clean-and-migrate-at-start-config.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAtStartTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAtStartTest.java index f360baaca0ea0..1562a147f2211 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAtStartTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionCleanAtStartTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.h2.jdbc.JdbcSQLException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class LiquibaseExtensionCleanAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("clean-at-start-config.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java index c67a37a3baede..8950fc586337a 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class LiquibaseExtensionConfigDefaultDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/xml/changeLog.xml") .addAsResource("db/xml/create-tables.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceWithoutLiquibaseTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceWithoutLiquibaseTest.java index a813ef76bcca8..eb649cce807fb 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceWithoutLiquibaseTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceWithoutLiquibaseTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class LiquibaseExtensionConfigDefaultDataSourceWithoutLiquibaseTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("config-for-default-datasource-without-liquibase.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java index f3b852d6d5fa1..9afa24374be04 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class LiquibaseExtensionConfigEmptyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("config-empty.properties", "application.properties")); @Test diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMissingNamedDataSourceTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMissingNamedDataSourceTest.java index 4bb9b927fd3f9..432b51a820f1f 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMissingNamedDataSourceTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMissingNamedDataSourceTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class LiquibaseExtensionConfigMissingNamedDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("config-for-missing-named-datasource.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java index 6edfc0aeb42fa..c2e3ebb464a65 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class LiquibaseExtensionConfigMultiDataSourcesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/inventory/changeLog.xml") .addAsResource("db/users/changeLog.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesWithoutDefaultTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesWithoutDefaultTest.java index 4c5cc71a1d0ad..4012a6ef9d489 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesWithoutDefaultTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesWithoutDefaultTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class LiquibaseExtensionConfigMultiDataSourcesWithoutDefaultTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/changeLog.xml") .addAsResource("db/inventory/changeLog.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java index ad2ee5a7bc1ad..4d83ede901019 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/xml/changeLog.xml") .addAsResource("db/xml/create-tables.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutLiquibaseTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutLiquibaseTest.java index 31df4bccc5b6e..9564df32d120c 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutLiquibaseTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutLiquibaseTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class LiquibaseExtensionConfigNamedDataSourceWithoutLiquibaseTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(LiquibaseExtensionConfigFixture.class) .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("config-for-named-datasource-without-liquibase.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java index 8cd6af6e5e6b4..e05d378e16f0d 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class LiquibaseExtensionLoadChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/xml/changeLog.xml") .addAsResource("db/xml/create-tables.xml") .addAsResource("db/xml/create-views.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartDirectoryChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartDirectoryChangeLogTest.java index f9d8a497a1c10..e83d766ca051e 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartDirectoryChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartDirectoryChangeLogTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class LiquibaseExtensionMigrateAtStartDirectoryChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/all/changeLog.xml") .addAsResource("db/all/test/changeLog.sql") .addAsResource("migrate-at-start-directory-config.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartJsonChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartJsonChangeLogTest.java index eddfca404dc85..6806df8db87d4 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartJsonChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartJsonChangeLogTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class LiquibaseExtensionMigrateAtStartJsonChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/json/changeLog.json") .addAsResource("db/json/create-tables.json") .addAsResource("db/json/test/test.json") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartNamedDataSourceTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartNamedDataSourceTest.java index 82193ea9917c0..a1d65fe9326a3 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartNamedDataSourceTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartNamedDataSourceTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class LiquibaseExtensionMigrateAtStartNamedDataSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("migrate-at-start-config-named-datasource.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartSqlChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartSqlChangeLogTest.java index d6a23fa5af115..1d46348443dcb 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartSqlChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartSqlChangeLogTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class LiquibaseExtensionMigrateAtStartSqlChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/sql/changeLog.sql") .addAsResource("migrate-at-start-sql-config.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartTest.java index d5b1b044c3b23..5a5e3887525c6 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class LiquibaseExtensionMigrateAtStartTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/changeLog.xml", "db/changeLog.xml") .addAsResource("migrate-at-start-config.properties", "application.properties")); diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java index fc190e63e5460..9967a0a570f4a 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class LiquibaseExtensionMigrateAtStartXmlChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/xml/changeLog.xml") .addAsResource("db/xml/create-tables.xml") .addAsResource("db/xml/create-views.xml") diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartYamlChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartYamlChangeLogTest.java index 1fe022ac9b0eb..b4999cbe2e3b6 100644 --- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartYamlChangeLogTest.java +++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartYamlChangeLogTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class LiquibaseExtensionMigrateAtStartYamlChangeLogTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("db/yaml/changeLog.yaml") .addAsResource("db/yaml/create-tables.yaml") .addAsResource("db/yaml/test/test.yaml") diff --git a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java index 7ffa69f7a8a08..c4fe1328053f9 100644 --- a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java +++ b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java @@ -7,8 +7,6 @@ import org.jboss.logmanager.formatters.JsonFormatter; import org.jboss.logmanager.formatters.StructuredFormatter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class JsonFormatterCustomConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(JsonFormatterDefaultConfigTest.class)) + .withApplicationRoot((jar) -> jar.addClasses(JsonFormatterDefaultConfigTest.class)) .withConfigurationResource("application-json-formatter-custom.properties"); @Test diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java index 747d32ef908cd..196cb3b4c772d 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class InjectionTest { @SuppressWarnings("unused") @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingBareMailClient.class, BeanUsingBlockingMailer.class, BeanUsingReactiveMailer.class, MailTemplates.class) .addAsResource("mock-config.properties", "application.properties") diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java index 79114506155fc..1a9ca7e3266e2 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MailTemplateValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MailTemplates.class) .addAsResource("mock-config.properties", "application.properties") .addAsResource(new StringAsset("" diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java index c0fcae9c12963..188ce54f64d2b 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MailMessageBundleTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Templates.class, AppMessages.class) .addAsResource("mock-config.properties", "application.properties") .addAsResource(new StringAsset( diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java index 70464d7ad251f..c6419db5612ff 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class GlobalDefaultDisabledTest { .withConfigurationResource("test-logging.properties") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class)); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java index 9d952d51df3ee..cb3448960789b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java @@ -8,8 +8,6 @@ import javax.inject.Singleton; import javax.ws.rs.Produces; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class MetricFiltersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AnnotatedFilter.class, NonAnnotatedFilter.class, MeterFilterProducer.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java index d9f41b2deb4a3..42dff99a057ee 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class MetricsFromMetricsFactoryTestCase { .withConfigurationResource("test-logging.properties") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MeasureThis.class)); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java index 899ac69aafa91..59d2655dae515 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java @@ -3,9 +3,7 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MicrometerDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.micrometer.enabled=false"), "application.properties")) .assertException(t -> { Assertions.assertEquals(DeploymentException.class, t.getClass()); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/HttpDevModeConfigTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/HttpDevModeConfigTest.java index 2dedf10dd0752..333aaa0750a2a 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/HttpDevModeConfigTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/HttpDevModeConfigTest.java @@ -4,9 +4,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class HttpDevModeConfigTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class) .add(new StringAsset("quarkus.micrometer.binder-enabled-default=false\n" + "quarkus.micrometer.binder.http-client.enabled=true\n" + diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java index 66d64a110c168..ac02004f1b963 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KafkaClientMetricsDisabledTest { .overrideConfigKey("quarkus.micrometer.binder.kafka.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject Instance kafkaEventObservers; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java index a61b46935c824..fb534eb77a24b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java @@ -5,8 +5,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KafkaStreamsMetricsDisabledTest { .overrideConfigKey("quarkus.micrometer.binder.kafka.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject Instance kafkaStreamEventObservers; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagCorsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagCorsTest.java index d2bc90310a49e..ab20fa9dda67b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagCorsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagCorsTest.java @@ -1,7 +1,5 @@ package io.quarkus.micrometer.deployment.binder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -26,7 +24,7 @@ public class UriTagCorsTest { .overrideConfigKey("quarkus.micrometer.binder.http-server.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("quarkus.http.cors", "true") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class, VertxWebEndpoint.class, HelloResource.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagTest.java index d5b777c79a63f..7f47ebd815290 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagTest.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -31,7 +29,7 @@ public class UriTagTest { .overrideConfigKey("quarkus.micrometer.binder.http-server.ignore-patterns", "/two") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class, PingPongResource.class, PingPongResource.PingPongRestClient.class, diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java index 88c4257bb3a7e..2e88d5b53f474 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java @@ -14,8 +14,6 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class UriTagWithHttpApplicationRootTest { .overrideConfigKey("quarkus.micrometer.binder.http-server.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class, PingPongResource.class, PingPongResource.PingPongRestClient.class, diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java index 3036b53ff6132..b69eece733adc 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java @@ -12,8 +12,6 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class UriTagWithHttpRootTest { .overrideConfigKey("quarkus.micrometer.binder.http-server.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class, PingPongResource.class, PingPongResource.PingPongRestClient.class, diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java index 59b2fb719b34d..795ac31d73868 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class UriWithMaxTagMeterFilterTest { .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, PingPongResource.class, PingPongResource.PingPongRestClient.class)); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java index 58791a101ce5c..a2e7246cf80c0 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class VertxWithHttpDisabledTest { .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PingPongResource.class, PingPongResource.PingPongRestClient.class)); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java index db13beb6f6922..b8ef45c5e69db 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class VertxWithHttpEnabledTest { .overrideConfigKey("quarkus.micrometer.binder.vertx.match-patterns", "/one=/two") .overrideConfigKey("quarkus.micrometer.binder.vertx.ignore-patterns", "/two") .overrideConfigKey("pingpong/mp-rest/url", "${test.url}") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PingPongResource.class, PingPongResource.PingPongRestClient.class)); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java index 0df9cde323bff..9c18f956b4e04 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class AllRegistriesDisabledTest { .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.export.json.enabled", "false") .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject MeterRegistry registry; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java index bd4b1855bd9f8..1807e4425d27c 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class JsonAndPrometheusRegistryEnabledTest { .overrideConfigKey("quarkus.micrometer.export.json.enabled", "true") .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject MeterRegistry registry; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java index 5e812a9f8c313..7a3a2faa84e2d 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class JsonRegistryEnabledTest { .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.export.json.enabled", "true") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject MeterRegistry registry; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java index 760ce9abb344d..30423bbe6c3e6 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class NoDefaultPrometheusTest { .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true") .overrideConfigKey("quarkus.micrometer.export.prometheus.default-registry", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Util.class, PrometheusRegistryProcessor.REGISTRY_CLASS, SecondPrometheusProvider.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java index 93efca74b497f..4f0e0bb01e196 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class PrometheusEnabledTest { .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject MeterRegistry registry; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java index 224afb1d14a1b..22be6912c45f6 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SecondPrometheusTest { .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(PrometheusRegistryProcessor.REGISTRY_CLASS) .addClass(SecondPrometheusProvider.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java index 1d10e15e7f032..fdb6cf30f66f7 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,7 +27,7 @@ public class MicrometerCounterInterceptorTest { .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "false") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(CountedResource.class) .addClass(TimedResource.class) .addClass(GuardedResult.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java index 090c2060be30b..f759a56458bbb 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,7 +26,7 @@ public class MicrometerTimedInterceptorTest { .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "false") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(CountedResource.class) .addClass(TimedResource.class) .addClass(GuardedResult.class)); diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java index c80762dc59c1a..ff5c4b98d2e22 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MpMetricNamingTest { .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "true") .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MpColorResource.class)); @Inject diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java index b82083803e6e6..504f581e09832 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class DefaultAndNamedMongoClientConfigTest extends MongoWithReplicasTestB @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("application-default-and-named-mongoclient.properties"); @Inject diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java index 564a914e79c1e..c48a9a7e1623e 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DefaultMongoClientConfigTest extends MongoWithReplicasTestBase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("default-mongoclient.properties"); @Inject diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientBuildItemConsumerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientBuildItemConsumerTest.java index f8cbc65c9a802..f1fc9335662c5 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientBuildItemConsumerTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientBuildItemConsumerTest.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.function.Consumer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MongoClientBuildItemConsumerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("default-mongoclient.properties") .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java index e2443af692402..08e0ba9e22088 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class MongoClientConfigTest extends MongoWithReplicasTestBase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("test-config-mongoclient.properties"); @Inject diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java index 71751ca8a5799..4da0e47f66552 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java @@ -9,8 +9,6 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class MongoLazyTest extends MongoTestBase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("application-metrics-mongo.properties"); @Test diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java index 4b1b26ade2aef..55b84c94426d1 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java @@ -10,8 +10,6 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class MongoMetricsTest extends MongoTestBase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("application-metrics-mongo.properties"); @AfterEach diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java index fabf5e9317fa1..58fa1a9c5a2d6 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.Default; import javax.enterprise.inject.literal.NamedLiteral; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class MongoNamedClientClientBuildItemConsumerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("named-mongoclient.properties") .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java index de3e24f624c66..35c2796f90fd4 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -29,7 +27,7 @@ public class NamedMongoClientConfigTest extends MongoWithReplicasTestBase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("application-named-mongoclient.properties"); @Inject diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java index f2839a46018f7..0b02cb2e98b85 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -34,7 +32,7 @@ public class NamedReactiveMongoClientConfigTest extends MongoWithReplicasTestBas @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class)) + .withApplicationRoot((jar) -> jar.addClasses(MongoTestBase.class)) .withConfigurationResource("application-named-mongoclient.properties"); @Inject diff --git a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java index 00c76e0b987aa..04571dcd56f55 100644 --- a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java +++ b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java @@ -14,8 +14,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class MutinyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingMutiny.class)); @Inject diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java index c8b2a29a54d24..bb7efbd941bdb 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java @@ -9,8 +9,6 @@ import javax.transaction.Transactional; import javax.transaction.UserTransaction; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -23,7 +21,7 @@ public class TransactionalTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TransactionalTest.TransactionalBean.class, TestXAResource.class, TxAssertionData.class, TestException.class)) .addClassLoaderEventListener(ClassLoaderLimiter.builder() diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java index 17eab04cbc09f..bd486052b3d21 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import javax.transaction.UserTransaction; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class TransactionalObserversErrorHandlingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ObservingBean.class)); @Inject diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java index 822436194cda0..d02fbcb1ee1fd 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.transaction.UserTransaction; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,7 +26,7 @@ public class TransactionalObserversTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ObservingBean.class, Actions.class)); public static String AFTER_SUCCESS = "AFTER_SUCCESS"; diff --git a/extensions/neo4j/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java b/extensions/neo4j/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java index a6f9c1e5d297d..fa0e133045a6c 100644 --- a/extensions/neo4j/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java +++ b/extensions/neo4j/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ static class DevServicesShouldStartNeo4jTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setLogRecordPredicate(record -> true) .withConfigurationResource("application.properties") .assertLogRecords(records -> assertThat(records).extracting(LogRecord::getMessage) @@ -48,7 +46,7 @@ static class WorkingWithDifferentImageAndAdditionalEnvTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setLogRecordPredicate(record -> true) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.neo4j.devservices.image-name", "neo4j:4.3-enterprise") @@ -76,7 +74,7 @@ static class WithLocallyDisabledDevServicesTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setLogRecordPredicate(record -> true) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.neo4j.devservices.enabled", "false") @@ -98,7 +96,7 @@ static class WithExplicitPropertyTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setLogRecordPredicate(record -> true) .withConfigurationResource("application.properties") .overrideConfigKey("quarkus.neo4j.uri", "bolt://localhost:7687") @@ -125,7 +123,7 @@ static class WithAlreadyReachableInstanceTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setLogRecordPredicate(record -> true) .withConfigurationResource("application.properties") .assertLogRecords(records -> assertThat(records).extracting(LogRecord::getMessage) diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java index 9e3f2fcff95df..b044ad245ab71 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java @@ -14,8 +14,6 @@ import java.util.concurrent.TimeUnit; import org.awaitility.core.ThrowingRunnable; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class OidcClientFilterDevModeTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-filter.properties", "application.properties")); diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientInjectionTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientInjectionTestCase.java index 9e69b39d5eefc..e06687718effd 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientInjectionTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientInjectionTestCase.java @@ -6,8 +6,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class NamedOidcClientInjectionTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-named-oidc-client-credentials.properties", "application.properties")); diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java index 92fcdbd07b7e3..fa47f73e9201a 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OidcClientCredentialsJwtPrivateKeyStoreTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-credentials-jwt-private-key-store.properties", "application.properties") diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java index 6d4604d8e6fbf..46e96feb39b37 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OidcClientCredentialsJwtPrivateKeyTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-credentials-jwt-private-key.properties", "application.properties") .addAsResource("publicKey.pem") diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java index 97414f72ca219..49ef2d1574aaf 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java @@ -4,8 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OidcClientCredentialsJwtSecretTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-credentials-jwt-secret.properties", "application.properties")); diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java index 64d4d0426e5a1..fe998f104859f 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java @@ -4,8 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OidcClientCredentialsTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-credentials.properties", "application.properties")); diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java index 7ef024eee6123..994ba493909f3 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java @@ -7,8 +7,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class OidcClientUserPasswordCustomFilterTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-custom-filter.properties", "application.properties")); diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java index feef0c12b8736..ff378fab81418 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java @@ -10,8 +10,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class OidcClientUserPasswordTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-oidc-client-user-password.properties", "application.properties")); diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java index 5cb10d6bf605f..ab820fbd643f0 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class CodeFlowDevModeDefaultTenantTestCase { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-dev-mode-default-tenant.properties", "application.properties")); diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java index ed0704e02aae7..20de311d28716 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java @@ -8,8 +8,6 @@ import java.io.IOException; import java.net.URI; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -38,7 +36,7 @@ public class CodeFlowDevModeTestCase { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-dev-mode.properties", "application.properties")); diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecurityDisabledTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecurityDisabledTestCase.java index 1587f4dd27bc0..003f8063bde6f 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecurityDisabledTestCase.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecurityDisabledTestCase.java @@ -4,8 +4,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class SecurityDisabledTestCase { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application-security-disabled.properties", "application.properties")); diff --git a/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterBadEndpointTest.java b/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterBadEndpointTest.java index c970685f03a67..71c8e4de07c23 100644 --- a/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterBadEndpointTest.java +++ b/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterBadEndpointTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class JaegerExporterBadEndpointTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.jaeger.endpoint", "httz://nada:zero") .setExpectedException(IllegalStateException.class); diff --git a/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java b/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java index 225be52f5f96d..2005c6ecf05da 100644 --- a/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java +++ b/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/src/test/java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java @@ -3,8 +3,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class JaegerExporterDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.jaeger.enabled", "false"); @Inject diff --git a/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterBadEndpointTest.java b/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterBadEndpointTest.java index a83b8cf75c67f..bc3de0520f983 100644 --- a/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterBadEndpointTest.java +++ b/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterBadEndpointTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OtlpExporterBadEndpointTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.otlp.endpoint", "httz://nada:zero") .setExpectedException(IllegalStateException.class); diff --git a/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterDisabledTest.java b/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterDisabledTest.java index 8e3eaaa80b67b..565d6b7711cd7 100644 --- a/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterDisabledTest.java +++ b/extensions/opentelemetry/opentelemetry-exporter-otlp/deployment/src/test/java/io/quarkus/opentelemetry/exporter/otlp/deployment/OtlpExporterDisabledTest.java @@ -3,8 +3,6 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class OtlpExporterDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.otlp.enabled", "false"); @Inject diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java index 7c8864961aaa7..ec914f66231cf 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class NonAppEndpointsDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TracerRouter.class) .addClass(TestSpanExporter.class)); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java index 25b9ceef02d4f..2b0c1cb6ddfa1 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class NonAppEndpointsEnabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .overrideConfigKey("quarkus.opentelemetry.tracer.suppress-non-application-uris", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TracerRouter.class) .addClass(TestSpanExporter.class)); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java index 8345afa9615b9..7796bbd34ea87 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java @@ -14,7 +14,7 @@ public class OpenTelemetryContinuousTestingTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestSpanExporter.class) .addClass(TracerRouter.class) .add(new StringAsset(ContinuousTestingTestUtils.appProperties("")), "application.properties")) diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java index b7dc348682d11..d4f3dee4bed1a 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenTelemetryDevModeTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestSpanExporter.class, TracerRouter.class, HelloResource.class) .add(new StringAsset(ContinuousTestingTestUtils.appProperties("")), "application.properties")); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java index 915324d87237d..2f5ad1d21646d 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java @@ -3,8 +3,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class OpenTelemetryDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.enabled", "false") .assertException(t -> Assertions.assertEquals(DeploymentException.class, t.getClass())); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java index dcabfb24b8366..eee7df0a0c233 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class OpenTelemetryIdGeneratorTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(TestUtil.class)); + .withApplicationRoot((jar) -> jar.addClass(TestUtil.class)); @Inject OpenTelemetry openTelemetry; diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java index 4c27bad5f4808..386188cdcaf3d 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java @@ -5,8 +5,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class OpenTelemetryPropagatorsTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() .overrideConfigKey("quarkus.opentelemetry.propagators", "tracecontext,xray") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(TestUtil.class)); + .withApplicationRoot((jar) -> jar.addClass(TestUtil.class)); @Inject OpenTelemetry openTelemetry; diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java index 54a362d06b118..7982eef5f6e38 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java @@ -11,8 +11,6 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class OpenTelemetryResourceTest { static final QuarkusUnitTest unitTest = new QuarkusUnitTest() .setBeforeAllCustomizer(() -> System.setProperty(RESOURCE_ATTRIBUTES, "service.name=authservice")) .setAfterAllCustomizer(() -> System.getProperties().remove(RESOURCE_ATTRIBUTES)) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestUtil.class) .addAsResource("resource-config/application.properties")); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java index de4bbadbaf071..52863aeaba7c2 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OpenTelemetrySamplerBeanTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(TestUtil.class)); + .withApplicationRoot((jar) -> jar.addClass(TestUtil.class)); @Inject OpenTelemetry openTelemetry; diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java index 176a64f720064..4968e85b1279d 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class OpenTelemetrySamplerConfigTest { .overrideConfigKey("quarkus.opentelemetry.tracer.sampler.ratio", "0.5") .overrideConfigKey("quarkus.opentelemetry.tracer.sampler.parent-based", "false") .overrideConfigKey("quarkus.opentelemetry.tracer.suppress-non-application-uris", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(TestUtil.class)); + .withApplicationRoot((jar) -> jar.addClass(TestUtil.class)); @Inject OpenTelemetry openTelemetry; diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java index 317e8494cf970..cc97d6e89340b 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java @@ -3,8 +3,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class TracerDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.opentelemetry.tracer.enabled", "false") .assertException(t -> Assertions.assertEquals(DeploymentException.class, t.getClass())); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerWithInvalidExtensionTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerWithInvalidExtensionTest.java index d999260338484..dfd35a470c8cb 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerWithInvalidExtensionTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerWithInvalidExtensionTest.java @@ -2,8 +2,6 @@ import java.util.Collections; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class TracerWithInvalidExtensionTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setForcedDependencies( Collections.singletonList( new AppArtifact("io.quarkus", "quarkus-smallrye-opentracing", "999-SNAPSHOT"))) diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryForwardedTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryForwardedTest.java index 1fa4e23c1f4f7..93df4f34c070a 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryForwardedTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryForwardedTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class VertxOpenTelemetryForwardedTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestSpanExporter.class) .addClass(TracerRouter.class)); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryTest.java index 586cd9bddbe6d..7885c96f0ce8c 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryTest.java @@ -21,8 +21,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -39,7 +37,7 @@ public class VertxOpenTelemetryTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestSpanExporter.class) .addClass(TracerRouter.class) .addClass(TestUtil.class)); diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryXForwardedTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryXForwardedTest.java index be13f1f4968b5..2e19156a1451f 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryXForwardedTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/VertxOpenTelemetryXForwardedTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class VertxOpenTelemetryXForwardedTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestSpanExporter.class) .addClass(TracerRouter.class)); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java index 727664fde4d0f..04ae983078a36 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DuplicateIdEntityTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdEntity.class)); @Test diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java index ad1d50c12ee92..26fdcec11ea95 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DuplicateIdWithParentTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class)); @Test diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java index 1f5a7d651ca90..c4cdd9daa694d 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class EntityManagerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-test.properties", "application.properties") .addClasses(MyEntity.class)); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java index 7c2e308850083..4e8721e5631bf 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java @@ -5,8 +5,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ErroneousConfigHotReloadTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnAnnotatedEntity.class, UnAnnotatedEntityResource.class) .addAsResource("application-commented-out.properties", "application.properties")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceNoFieldsTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceNoFieldsTestCase.java index 511f3c74bbcd7..8a07496bf1b1b 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceNoFieldsTestCase.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceNoFieldsTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.hibernate.orm.panache.deployment.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class InheritanceNoFieldsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MappedParent.class, ChildEntity.class, InheritanceResource.class) .addAsResource(new StringAsset("INSERT INTO ChildEntity(id, name) VALUES(1, 'my name');\n"), "import.sql") .addAsResource("application-test.properties", diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java index 118bad2548baf..9928660198a5d 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java @@ -4,8 +4,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class PanacheHotReloadTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, MyTestResource.class) .addAsResource("application-test.properties", "application.properties") .addAsResource("import.sql")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java index ea251d1fcc913..51cca2fd6176f 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java @@ -16,9 +16,7 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlTransient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class PanacheJAXBTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(JAXBEntity.class, JAXBTestResource.class) .addAsResource(new StringAsset("quarkus.hibernate-orm.database.generation=none"), "application.properties")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java index 29845c6ee9ce5..16d9ba3acadda 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultPersistenceUnitConfigTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class) .addAsResource("application-test.properties", "application.properties")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java index 5a57d4be1e39f..9b38c54b48bf6 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java @@ -3,9 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DefaultPersistenceUnitFileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class) .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") .addAsResource(new StringAsset( diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java index b0cc239b59df8..47623597b6f87 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousPersistenceUnitConfigTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class) .addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java index f671286de020e..b2d86aa1b975e 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java @@ -7,8 +7,6 @@ import javax.persistence.EntityManager; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiplePersistenceUnitConfigTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class) .addAsResource("application-multiple-persistence-units.properties", "application.properties")); diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java index 3f286af628da1..a6a0431b92bb4 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java @@ -1,8 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class MultiplePersistenceUnitConfigForRepositoryTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Issue11842Entity.class, Issue11842Repository.class, Issue11842Resource.class, FirstEntity.class) .addAsResource("application-multiple-persistence-units-for-repository.properties", "application.properties")); diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java index 32fb48e1b8e42..0e7bc799e833f 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDeleteMethodTest; @@ -11,7 +9,7 @@ class PanacheEntityResourceDeleteMethodTest extends AbstractDeleteMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java index bbdd384dd3b9d..737b3f4cf4709 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDevModeTest; @@ -11,7 +9,7 @@ public class PanacheEntityResourceDevModeTest extends AbstractDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java index 8aae2422a15a8..dafb0690b2983 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractGetMethodTest; @@ -11,7 +9,7 @@ class PanacheEntityResourceGetMethodTest extends AbstractGetMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java index 3bc6468196f29..5315150491cfd 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractHotReloadTest; @@ -11,7 +9,7 @@ public class PanacheEntityResourceHotReloadTest extends AbstractHotReloadTest { @RegisterExtension public final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java index cee4a84d1924c..dbc137ea5a57c 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java @@ -2,8 +2,6 @@ import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; @@ -18,7 +16,7 @@ class PanacheEntityResourcePathCustomisationTest extends AbstractPathCustomisati @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class, CustomPathCollectionsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java index 10aa0d9020827..1742569b65ff3 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPostMethodTest; @@ -11,7 +9,7 @@ class PanacheEntityResourcePostMethodTest extends AbstractPostMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java index de35261461c3f..a65878e122ff5 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPutMethodTest; @@ -11,7 +9,7 @@ class PanacheEntityResourcePutMethodTest extends AbstractPutMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java index 618767c817b3f..ce1e9adb44fb8 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDeleteMethodTest; @@ -11,7 +9,7 @@ class PanacheRepositoryResourceDeleteMethodTest extends AbstractDeleteMethodTest @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class, ItemsRepository.class) diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java index e577d3a9e3f82..fac342d5c8eb5 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDevModeTest; @@ -11,7 +9,7 @@ public class PanacheRepositoryResourceDevModeTest extends AbstractDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class, ItemsRepository.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java index a18441159182f..fd2d6bf248fad 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractGetMethodTest; @@ -11,7 +9,7 @@ class PanacheRepositoryResourceGetMethodTest extends AbstractGetMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class, ItemsRepository.class) diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java index 26f22e7c67631..1743de7f8badb 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractHotReloadTest; @@ -11,7 +9,7 @@ public class PanacheRepositoryResourceHotReloadTest extends AbstractHotReloadTes @RegisterExtension public final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java index b8f99e5788418..caa56c55553d4 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java @@ -2,8 +2,6 @@ import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; @@ -18,7 +16,7 @@ class PanacheRepositoryResourcePathCustomisationTest extends AbstractPathCustomi @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class, CustomPathCollectionsResource.class) .addAsResource("application.properties") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java index 2186f43dca263..1f5be73c8e1b6 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPostMethodTest; @@ -11,7 +9,7 @@ class PanacheRepositoryResourcePostMethodTest extends AbstractPostMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class, ItemsRepository.class) diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java index eb43f7c60e4e9..d0ccd01b67e64 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java @@ -1,7 +1,5 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPutMethodTest; @@ -11,7 +9,7 @@ class PanacheRepositoryResourcePutMethodTest extends AbstractPutMethodTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class, AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class, ItemsRepository.class) diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java index d455f671ab714..ab420c52ae2d4 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class DuplicateIdEntityTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .overrideConfigKey("quarkus.datasource.devservices", "false") .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdEntity.class)); @Test diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java index 715f3d05a5bb7..91e54d8429944 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DuplicateIdWithParentTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(BuildException.class) .overrideConfigKey("quarkus.datasource.devservices", "false") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class)); @Test diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java index ac87fe9da93f9..047e269281fe6 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java @@ -4,8 +4,6 @@ import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class PanacheHotReloadTestCase { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyEntity.class, MyTestResource.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java index e06ebec92dd17..9fde3cc85ed3e 100644 --- a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java +++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java @@ -45,7 +45,7 @@ public class TestEnhancers { public static final Pattern LABEL = Pattern.compile("^L(\\d)$"); @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Book.class) .addClasses(Student.class) .addClasses(StudentRepository.class)); diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdMongoEntityTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdMongoEntityTest.java index 4df1415003e57..3d117d53d9bc1 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdMongoEntityTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdMongoEntityTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DuplicateIdMongoEntityTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .overrideConfigKey("quarkus.mongodb.devservices.enabled", "false") .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdMongoEntity.class)); @Test diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdReactiveMongoEntityTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdReactiveMongoEntityTest.java index 02f7403876ec6..eeb3a4b70dafa 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdReactiveMongoEntityTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdReactiveMongoEntityTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DuplicateIdReactiveMongoEntityTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .overrideConfigKey("quarkus.mongodb.devservices.enabled", "false") .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdReactiveMongoEntity.class)); @Test diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdWithParentTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdWithParentTest.java index 9c1bf0c84bc76..4d263c375f88b 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdWithParentTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/DuplicateIdWithParentTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DuplicateIdWithParentTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .overrideConfigKey("quarkus.mongodb.devservices.enabled", "false") .setExpectedException(BuildException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class)); @Test diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java index 4814286e84dbb..df34c80065290 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ class Bug10812MongodbMultiClientsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( Bug10812BookNotAnnotatedEntity.class, Bug10812BookDefaultClientNameEntity.class, diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java index ce3690787c589..f353e7b2db9f9 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class MongoEntityTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( MongoEntityEntity.class, MongoEntityRepository.class) diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionProceedTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionProceedTest.java index 5edf0fd0ed2d9..6b43ec5d95866 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionProceedTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionProceedTest.java @@ -5,8 +5,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ConcurrentExecutionProceedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java index 1e63ad64a84d5..f2d9a88b1ac35 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java @@ -10,8 +10,6 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class ConcurrentExecutionSkipTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java index ffee6f7d8235c..919ccbfe3de38 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java @@ -10,8 +10,6 @@ import javax.enterprise.event.Observes; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class ConditionalExecutionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java index f14297449a774..baaabc818f45a 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java @@ -6,9 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DisabledScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("DisabledScheduledMethodTest.interval=disabled"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java index c8f6d0e1ebedc..44560bf75a1c4 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java @@ -7,9 +7,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class DisabledSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("quarkus.scheduler.enabled=false"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java index d2a91f2451cdc..bddd29e72df50 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java @@ -1,8 +1,6 @@ package io.quarkus.quartz.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DuplicateIdentityExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdentityExpressionTest.InvalidBean.class) .addAsResource(new StringAsset("my.identity=my_name"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java index b5d64284a99fc..37133050c0d8b 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.quartz.SchedulerException; @@ -18,7 +16,7 @@ public final class HaltedSchedulerTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.quartz.start-mode=halted"), "application.properties")); @@ -39,4 +37,4 @@ private void assertSchedulerState(final boolean expectedState) throws SchedulerE assertEquals(expectedState, scheduler.isRunning()); assertEquals(expectedState, quartzScheduler.isStarted()); } -} \ No newline at end of file +} diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java index d292fa6df9817..1534809671dcb 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java @@ -11,9 +11,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.quartz.Job; @@ -35,7 +33,7 @@ public class InjectJobTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Starter.class, Service.class, CountDownLatchProducer.class) .addAsResource(new StringAsset("quarkus.quartz.start-mode=forced"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java index e79f21ef1c6ed..0344a1cfc60cf 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java @@ -7,9 +7,7 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.quartz.Job; @@ -30,7 +28,7 @@ public class InjectQuartzSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Starter.class) .addAsResource(new StringAsset("quarkus.quartz.start-mode=forced"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java index e7690ea11381d..4fa5329e6e51d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidCronExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java index 3224c45724594..45f5f10247435 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidDelayedExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidDelayedExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java index 230167cc2c20a..3cdb17219505e 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidEveryExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidEveryExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java index 675233458a4be..d450891ab653d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java @@ -1,8 +1,6 @@ package io.quarkus.quartz.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class InvalidTriggerListenerConfigurationTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalArgumentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobs.class) .addAsResource(new StringAsset( "quarkus.quartz.trigger-listeners.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin\n" diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigCronExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigCronExpressionTest.java index eb8d712ac9c85..2a4838e40033a 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigCronExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigCronExpressionTest.java @@ -2,8 +2,6 @@ import java.util.NoSuchElementException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MissingConfigCronExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(NoSuchElementException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MissingConfigCronExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java index 9c97aeb525d0f..dd93082ee2a83 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java @@ -2,8 +2,6 @@ import java.util.NoSuchElementException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MissingConfigIdentityExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(NoSuchElementException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MissingConfigIdentityExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java index 167b89b2e1b96..a9cde70ddeacd 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java @@ -1,8 +1,6 @@ package io.quarkus.quartz.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MissingDataSourceTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobs.class) .addAsResource(new StringAsset("quarkus.quartz.store-type=jdbc-cmt"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java index 9249f2fc436ea..ccbe7505656f3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class NoExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java index 8b77239a8186e..86f75f5808900 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java @@ -9,9 +9,7 @@ import javax.enterprise.event.Observes; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class PausedMethodExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedMethodExpressionTest.Jobs.class) .addAsResource(new StringAsset("scheduler.identity=myIdentity"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java index 3e7ed9cba9fb0..7192caf70358d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class PausedMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedMethodTest.Jobs.class)); private static final String IDENTITY = "myScheduled"; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java index f659f04ba072d..b2b883774891f 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class PausedResumedMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedResumedMethodTest.Jobs.class)); private static final String IDENTITY = "myScheduled"; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java index 7f0ece6e6a4ce..dbfeab377316d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java @@ -6,9 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class PropertyDefaultValueSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("PropertyDefaultValueSchedulerTest.default=" + EXPECTED_IDENTITY), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java index 595fde4cfb437..219011dac67ca 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.quartz.SchedulerException; @@ -22,7 +20,7 @@ public class RegisterJobListenerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addClass(HelloJobListener.class) .addAsResource(new StringAsset( diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java index 1851efd88786b..d4161a2ff89cd 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class RegisterLoggingJobHistoryPluginTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset( "quarkus.quartz.plugin.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin\n" diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestScheduledMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestScheduledMethodTest.java index 2df4e7f81d961..a3ef7faae9be3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestScheduledMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestScheduledMethodTest.java @@ -4,8 +4,6 @@ import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class RequestScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(RequestContextJobs.class)); + .withApplicationRoot((jar) -> jar.addClasses(RequestContextJobs.class)); @Test public void testRequestContextScheduledJobs() throws InterruptedException { diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleDelayedTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleDelayedTest.java index 6155425950112..e1771d36feacc 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleDelayedTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleDelayedTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SimpleDelayedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("jobs.delay=1s"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java index c572869511aef..d51720d2254d3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SimpleIdentityTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("jobs.identity=every_1s_another_name"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleScheduledMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleScheduledMethodTest.java index ddc54cf88567f..15d1a5bb249b5 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleScheduledMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleScheduledMethodTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SimpleScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobs.class) .addAsResource(new StringAsset("simpleJobs.cron=0/1 * * * * ?\nsimpleJobs.every=1s"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/UnsupportedClusteredJobConfigurationTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/UnsupportedClusteredJobConfigurationTest.java index 0fc885b2ed857..793ad418ce5ec 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/UnsupportedClusteredJobConfigurationTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/UnsupportedClusteredJobConfigurationTest.java @@ -1,8 +1,6 @@ package io.quarkus.quartz.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class UnsupportedClusteredJobConfigurationTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobs.class) .addAsResource(new StringAsset( "quarkus.quartz.store-type=ram\nquarkus.quartz.clustered=true"), diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java index b761b62dd6b05..6f49aa59ddb41 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.Timer; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MpTimedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("quarkus.scheduler.metrics.enabled=true"), "application.properties")); diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java index 827a7bcce8a41..ed35e541c7d27 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java @@ -11,9 +11,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.quartz.Job; @@ -36,7 +34,7 @@ public class InterceptedJobClassTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StartupJob.class, Service.class, CountDownLatchProducer.class) .addAsResource(new StringAsset("quarkus.quartz.start-mode=forced"), "application.properties")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java index d1803600c7612..b09d510666421 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class AsyncTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Foo.class) .addAsResource(new StringAsset("{foo.val} is not {foo.val.setScale(2,roundingMode)}"), "templates/foo.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java index dbd4e830f0ab3..49d8331a4c4c8 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class EscapingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Item.class) .addAsResource(new StringAsset("{text} {other} {text.raw} {text.safe} {item.foo}"), "templates/foo.html") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java index 717452817683e..5312c248903a4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MultiTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Foo.class) .addAsResource(new StringAsset("{foo.val} is not {foo.val.setScale(2,roundingMode)}"), "templates/foo.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java index ce8736aa09421..773ea2faf1547 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java @@ -4,9 +4,7 @@ import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class OrEmptyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Templates.class) .addAsResource(new StringAsset( "START{#for pet in pets.orEmpty}...{/for}END::{pets.orEmpty.size}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java index 6e3020cb1afeb..2eb14743b3e15 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class PropertyNotFoundDevModeTest { @RegisterExtension static final QuarkusDevModeTest testConfig = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Routes.class) .addAsResource(new StringAsset("{foo.surname}"), "templates/foo.html") .addAsResource(new StringAsset("{bar.name}"), "templates/bar.html")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java index ecb2a3a74d60a..997365f4930ae 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class PropertyNotFoundTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Foo.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.PropertyNotFoundTest$Foo foo}" + "{foo.surname}"), "templates/foo.html")) diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java index ed6618480d55d..e17f52a8ce134 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ReflectionResolverTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloReflect.class) .addAsResource( new StringAsset( diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java index 7a57ae7810527..e05594bcbb7ac 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class TemplateDataTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Foos.class, TransactionType.class) .addAsResource(new StringAsset( "{foo.val} is not {foo.val.setScale(2,roundingMode)} and {foo.bar}={foo.hasBar} and {foo.baz}={foo.isBaz}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataValidationTest.java index a66a0639494b0..53dbbe6f04710 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataValidationTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class TemplateDataValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyClass.class) .addAsResource(new StringAsset( "{foo_My:BAZ}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java index ba4aa55b01323..ffd4cd9aff3ea 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class TreeMapDataTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{map.get(1)}:{map.entrySet.iterator.next.value}"), "templates/map.html")); @Inject diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java index 4c2afbcc6b405..e412034798ea6 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java @@ -6,9 +6,7 @@ import javax.enterprise.context.Dependent; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class VariantTemplateTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class) .addAsResource(new StringAsset("{this}"), "templates/foo.txt") .addAsResource(new StringAsset("{this}"), "templates/foo.html")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java index e007ea1f82243..9b137ed7509ee 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class AsyncDataTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.asyncdata.Client client}" + "{#for token in client.tokens}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java index 73601e5fc4c57..a1160b5f8b7df 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class AdditionalContentTypeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("Empty txt"), "templates/foo.txt") .addAsResource(new StringAsset("Empty graphql"), "templates/foo.graphql") .addAsResource(new StringAsset("quarkus.qute.content-types.graphql=application/graphql\n" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestDisabledTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestDisabledTest.java index df1693f9b614e..6cae2e1c335ba 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestDisabledTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestDisabledTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CurrentRequestDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "quarkus.arc.exclude-types=io.quarkus.vertx.http.runtime.CurrentRequestProducer"), "application.properties") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java index 9b3b19a85a40d..35601003987b0 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java @@ -5,9 +5,7 @@ import javax.inject.Inject; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class CurrentRequestTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MyRoute.class) .addAsResource(new StringAsset( "Hello {inject:vertxRequest.getParam('name')}!"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java index dc8c39f2fd4a2..66e53080fd2d0 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java @@ -1,9 +1,7 @@ package io.quarkus.qute.deployment.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DevConsolePreviewTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "{#for i in total}{i}:{/for}"), "templates/loop.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java index af123e8895183..b46b2229231c4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class AdditionalTemplatePathExcludeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar // excluded .addAsResource(new StringAsset("{@java.util.List myList}{myList.bar}"), "templates/foo.txt") // not excluded diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java index 8c9ca98f0073b..98731b95b8b75 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class TemplatePathExcludeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar // excluded .addAsResource(new StringAsset("{@java.util.List myList}{myList.bar}"), "templates/.foo.txt") .addAsResource(new StringAsset("{@java.util.List myList}{myList.bar}"), "templates/foo/bar/.hidden") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java index 7a6ecb8a6b457..ab50bdca294ed 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class CollectionTemplateExtensionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject Engine engine; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java index 8212b65518d39..737b50c197b27 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ConfigTemplateExtensionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "{config:foo}={config:property('foo')}\n" + "{config:nonExistent ?: 'NOT_FOUND'}={config:property('nonExistent') ?: 'NOT_FOUND'}\n" + diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java index ab995e72d4864..946257f9c64d0 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ExtensionMethodCompletionStageTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Extensions.class, FooParentService.class)); @Inject diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java index c756f8180f150..416b7f2a61c8f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class InvalidExtensionMethodMatchRegexTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Extensions.class)) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodNamespaceTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodNamespaceTest.java index 8a4647cebb272..1d39a15fd6707 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodNamespaceTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodNamespaceTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidExtensionMethodNamespaceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Extensions.class)) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java index 35d7d9212392f..533b685cfa8e1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java @@ -9,9 +9,7 @@ import javax.enterprise.event.TransactionPhase; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class NamespaceTemplateExtensionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "{#for state in domain:states}{state.foo}{/for}"), "templates/foo.html") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionValidationFailureTest.java index 09da240df6850..7afc7cef8ff03 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionValidationFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionValidationFailureTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NamespaceTemplateExtensionValidationFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "{bro:surname}\n" + "{bro:name.bubu}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NoExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NoExtensionMethodsTest.java index dee87d38371d5..f63124e696f18 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NoExtensionMethodsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NoExtensionMethodsTest.java @@ -4,8 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class NoExtensionMethodsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Extensions.class)) .assertException(t -> { Throwable ise = t; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java index b25b339e79974..6e01b0fc152a2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class NumberTemplateExtensionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{num.mod(4)}"), "templates/foo.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java index 67fc2dd558dcd..26d27f283427a 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class StringTemplateExtensionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject Engine engine; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java index c0572c66c1c5f..e669dc943f64f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class TemplateExtensionAttributeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Extensions.class)); @Inject diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java index 4c99be638ccd5..727850552854f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java @@ -10,9 +10,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class TemplateExtensionMethodsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Extensions.class, PrioritizedExtensions.class) .addAsResource( new StringAsset("{foo.name.toLower} {foo.name.ignored ?: 'NOT_FOUND'} {foo.callMe(1)} {foo.baz}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java index 5bbc6d7be5606..40e56e1ef05ea 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java @@ -10,9 +10,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class TimeTemplateExtensionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset( "{now.format('d uuuu')}:{nowLocalDate.format('d MMM uuuu',myLocale)}:{time:format(nowDate,'d MMM uuuu',myLocale)}:{time:format(nowCalendar,'d uuuu')}"), "templates/foo.html")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java index 4f8280a3157c5..cd2eaf69664f8 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class HierarchyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, Bar.class) .addAsResource(new StringAsset("{foo.name}"), "templates/test.html")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java index fc31165d04ca2..d730e1a6faa8c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java @@ -3,9 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MessageBundleExpressionValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WrongBundle.class, Item.class) .addAsResource(new StringAsset( "hello=Hallo {foo}!"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleInvalidNamespaceTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleInvalidNamespaceTest.java index c1943a4e6fd90..bc6b727fa8215 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleInvalidNamespaceTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleInvalidNamespaceTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class MessageBundleInvalidNamespaceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Hellos.class)) .assertException(t -> { Throwable e = t; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java index 23a2e5c609a3b..68e31138f651f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MessageBundleLocaleTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Messages.class) .addAsResource(new StringAsset( "{msg:helloWorld}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java index 5f6a6035bd919..8b41a3facf89d 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MessageBundleLogicalLineTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Messages.class) .addAsResource("messages/msg_cs.properties") .addAsResource(new StringAsset( diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodMissingAnnotationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodMissingAnnotationTest.java index 97f13b347ed4e..d090d3096421f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodMissingAnnotationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodMissingAnnotationTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MessageBundleMethodMissingAnnotationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBundle.class)) .setExpectedException(MessageBundleException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodReturnTypeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodReturnTypeTest.java index 62f5f865372e2..b964c7b06a6f2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodReturnTypeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleMethodReturnTypeTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MessageBundleMethodReturnTypeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBundle.class)) .setExpectedException(MessageBundleException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleNameConflictTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleNameConflictTest.java index a6ced9252ba43..9b889318687e2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleNameConflictTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleNameConflictTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class MessageBundleNameConflictTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AppMessages.class, BravoMessages.class)) .setExpectedException(MessageBundleException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTemplateExpressionValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTemplateExpressionValidationTest.java index 1ea5ff011fc58..f92cdcd4664e2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTemplateExpressionValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTemplateExpressionValidationTest.java @@ -3,9 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MessageBundleTemplateExpressionValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBundle.class, Item.class) .addAsResource(new StringAsset( "{@java.util.List names} {msg:hello('foo')} {msg:hello_and_bye} {msg:hello(1,2)} {#each names}{msg:helloName(it)}{/each}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java index 8644ecee205a0..c679561385af2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MessageBundleTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AppMessages.class, OtherMessages.class, AlphaMessages.class, Item.class) .addAsResource(new StringAsset( "{msg:hello} {msg:hello_name('Jachym')} {msg:hello_with_if_section(3)} {alpha:hello-alpha} {alpha:hello_alpha} {alpha:hello-with-param('foo')}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleValidationTest.java index aa8089060ffa1..227b7d32f3554 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleValidationTest.java @@ -3,9 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MessageBundleValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Hellos.class) .addAsResource(new StringAsset( "hello=Hallo {foo}!\nhello_never=Ball!"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageParamTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageParamTest.java index 230bb67255084..2f8b82ccfd704 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageParamTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageParamTest.java @@ -1,7 +1,5 @@ package io.quarkus.qute.deployment.i18n; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MessageParamTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBundle.class)); @Test diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java index c75612faed905..bf008d0aad546 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java @@ -4,8 +4,6 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class NestedMessageBundleDevModeTest { @RegisterExtension static final QuarkusDevModeTest testConfig = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyNestedMessages.class, TestRouteConfig.class)); @Test diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java index 5a03f309169d6..a71212b6c6834 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class IncludeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{#insert item}NOK{/}:{#insert foo}default foo{/}"), "templates/base.html") .addAsResource(new StringAsset("{#include base}{#item}OK{/}{#foo}my foo{/include}"), "templates/detail.html") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java index 7ee1bd8f02a39..711a38c5c7114 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java @@ -5,9 +5,7 @@ import javax.enterprise.context.Dependent; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class InjectNamespaceResolverTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class, Hello.class) .addAsResource(new StringAsset("{inject:hello.ping}"), "templates/foo.html")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java index b348d83f76927..a2db5fa5e16b9 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java @@ -6,9 +6,7 @@ import javax.enterprise.context.Dependent; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class InjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class) .addAsResource(new StringAsset("quarkus.qute.suffixes=txt"), "application.properties") .addAsResource(new StringAsset("{this}"), "templates/foo.txt") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanNotFoundTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanNotFoundTest.java index b227041cff3ac..b85fbfc010cb2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanNotFoundTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanNotFoundTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class NamedBeanNotFoundTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{inject:bing.ping}"), "templates/bing.html")) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java index e6fcfc5ed0a0d..04937fcd9d1d0 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java @@ -7,9 +7,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class NamedBeanPropertyNotFoundTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NamedFoo.class) .addAsResource(new StringAsset("{inject:foo.list.ping}"), "templates/fooping.html")) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java index 61030a0310643..869ff7c3300e1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java @@ -9,9 +9,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class NamedBeanValidationFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NamedFoo.class) .addAsResource(new StringAsset("{#each inject:foo.list}{it.ping}{/each}}"), "templates/fooping.html")) .assertException(t -> { diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java index 7a8123e66ab51..24f02a260572f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java @@ -9,9 +9,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class NamedBeanValidationSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NamedFoo.class) .addAsResource( new StringAsset( diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java index a9f2c1e22e93d..726ba98f226dd 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class LoopTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{#for i in total}{i}:{/for}"), "templates/loop1.html")); @Inject diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java index 2f6097300387f..29a45520e4061 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class PropertyNotFoundNoopTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html") .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=noop" + "\nquarkus.qute.strict-rendering=false"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java index 67875fd334fd8..c08674edb0a4e 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class PropertyNotFoundOutputOriginalTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html") .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=output-original" + "\nquarkus.qute.strict-rendering=false"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java index 1c46a8802763a..ef6354e0abfa0 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class PropertyNotFoundThrowExceptionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html") .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=throw-exception" + "\nquarkus.qute.strict-rendering=false"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java index 5d39dd6a7bb58..b7265d7377a46 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DoNotRemoveStandaloneLinesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{#for i in total}\n" + "{i}:\n" + "{/for}"), "templates/loop.html") diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java index af3921405ed9b..357d6377c8162 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class WrongTemplatesDirectoryTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("Hello!"), "Templates/bing.html")) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java index 3b98378521524..8e5418cf3e648 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class UserTagIncludeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{name}"), "templates/tags/hello.txt") .addAsResource(new StringAsset("{#include base}{#item}{#hello name=name /}{/item}{/include}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java index 731b85ae8a379..b84169e658311 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class UserTagNameCollisionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("Hello from tag template!"), "templates/tags/hello.txt") .addAsResource(new StringAsset("Hello from regular template!"), "templates/hello.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java index cfc2a743066ea..b018d5fa88038 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class UserTagTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("{it}"), "templates/tags/hello.txt") .addAsResource(new StringAsset("{#hello name /}"), "templates/foo.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java index e51d0f7bcd7cc..a6fd2b8a729f3 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CheckedTemplateArrayParamTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Templates.class) .addAsResource(new StringAsset("Hello {myArray[1]}! ::{myArray.take(1).size}"), "templates/CheckedTemplateArrayParamTest/arrays.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java index 57e136b1fbb9a..a0c39486d0f75 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CheckedTemplateBasePathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Monks.class) .addAsResource(new StringAsset("Hello {name}!"), "templates/foo/monk.txt") .addAsResource(new StringAsset("Hello {name}!"), "templates/Monks/monk.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java index c7124e4ae8053..c5798333ea07d 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class CheckedTemplateConflictTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Templates.class) .addAsResource(new StringAsset("Hello {name}!"), "templates/CheckedTemplateConflictTest/monk.txt")) .setExpectedException(TemplateException.class); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateDoNotRequireTypeSafeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateDoNotRequireTypeSafeTest.java index 7d611526a330e..2fdddf96cc912 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateDoNotRequireTypeSafeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateDoNotRequireTypeSafeTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CheckedTemplateDoNotRequireTypeSafeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Templates.class) .addAsResource(new StringAsset("Hello {name}!{any}"), "templates/CheckedTemplateDoNotRequireTypeSafeTest/hola.txt")); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java index 987e951b1a44f..7c58af9f9cd85 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java @@ -7,9 +7,7 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class CheckedTemplateRequireTypeSafeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Templates.class, Fool.class) .addAsResource(new StringAsset( "Hello {name}!" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java index 691e5e391ca8c..ecfef3167b262 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultMethodValidationSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, MovieExtensions.class) .addAsResource(new StringAsset( "{@io.quarkus.qute.deployment.typesafe.DefaultMethodValidationSuccessTest$Name name}Hello {name.fullName()}::{name.fullName}!"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationFailureTest.java index df9f119c87a13..b6dd6a97474c4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationFailureTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class InterfaceValidationFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InterfaceValidationSuccessTest.Metrics.class, InterfaceValidationSuccessTest.Count.class, InterfaceValidationSuccessTest.Wrapper.class) .addAsResource(new StringAsset( diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java index 6806e4af0fe53..2488ba7ff9928 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class InterfaceValidationSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Metrics.class, Count.class, Wrapper.class, NumericWrapper.class) .addAsResource(new StringAsset("{@java.util.List list}" + "{list.empty}:{list.toString}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java index 325aea8e1104e..6fad66fbd1355 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class LoopValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Machine.class, MachineStatus.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}" + "{#for name in machine.getNames(42)}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java index 04dcaf553901a..4626412a40190 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class NestedVirtualMethodSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, MovieExtensions.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{movie.findServices(movie.name,movie.toNumber(movie.getName))}"), diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java index f4f41cf09f591..1443726a01d8b 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ObjectValidationSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, MovieExtensions.class) .addAsResource(new StringAsset("{@java.lang.Object obj}" + "{@java.lang.Object anotherObj}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java index 82c81d4fd9d1c..af3870bc3826b 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java @@ -2,9 +2,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ParamDeclarationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Movie.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{movie.mainCharacters.size}: {#for character in movie.mainCharacters}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationWrongClassTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationWrongClassTest.java index 4b7c974f365eb..7cc0605a151ef 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationWrongClassTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationWrongClassTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ParamDeclarationWrongClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Foo.class) .addAsResource(new StringAsset("{@org.acme.Foo foo}" + "{foo.name}"), "templates/foo.html")) diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java index 928a1fba8411d..d2086e28976df 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class TypeCheckExcludesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, Machine.class, MachineStatus.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{@io.quarkus.qute.deployment.typesafe.Machine machine}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java index 5cf168dfc7b85..df8ca71ecd23d 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class TypeSafeJavaLangTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class) .addAsResource(new StringAsset("{@String movie}" + "{@java.util.List movies}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java index 4c6e331908fdd..8dced899e9a82 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class TypeSafeLetTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{#let service=movie.findService('foo')}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java index a5f6b382fafd7..05aa170096300 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class TypeSafeLoopFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(Foo.class) .addAsResource(new StringAsset("{@java.util.List list}" + "{#for foo in list}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java index 7842dbe7b069d..f9b0eb66115f9 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java @@ -8,9 +8,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class TypeSafeLoopTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class, MyFooList.class, Item.class, Extensions.class) .addAsResource(new StringAsset("{@java.util.List list}" + "{@io.quarkus.qute.deployment.MyFooList fooList}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java index 1f1dff97d1765..4d6f189b40069 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ValidationFailuresTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, MovieExtensions.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{@java.lang.Long age}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java index c1cfa4ee322a4..f76920b3b54bd 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java @@ -6,9 +6,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class ValidationSuccessTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Movie.class, MovieExtensions.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}" + "{@java.lang.Long age}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java index 64fc549fa6e63..b2b12e361b91a 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class WhenValidationFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Machine.class, MachineStatus.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}" + "{#when machine.status}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java index 4fba10f635b5d..559395bff163e 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class WhenValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Machine.class, MachineStatus.class) .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}" + "{#when machine.status}" diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java index 33a6100f4d530..4b3b1deeff97e 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class VarargsMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class) .addAsResource(new StringAsset("{foo.getStr}:{foo.getStr('foo','bar','baz')}"), "templates/foo.txt") diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java index e7b5cd0671cc6..b35e84f7b7e1e 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java @@ -17,8 +17,6 @@ import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Processor; @@ -39,7 +37,7 @@ public class RegistrationForReflectionTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .addBuildChainCustomizer(buildCustomizer()); @Test diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java index 37a955792864b..486b01b6529a7 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java @@ -14,8 +14,6 @@ import javax.inject.Inject; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ class HttpSinkBackpressureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ToUpperCaseSerializer.class, Dto.class, HttpEmitterWithOverflow.class, HttpEndpoint.class)) .withConfigurationResource("http-sink-backpressure-test-application.properties"); diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java index a815b20a64d67..d8ecb3bea69de 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java @@ -18,8 +18,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -43,7 +41,7 @@ class HttpSinkTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HttpEmitter.class, ToUpperCaseSerializer.class, HttpEndpoint.class, Dto.class)) .withConfigurationResource("http-sink-test-application.properties"); diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java index 19906ebbe3fea..6176409be916b 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java @@ -19,8 +19,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -38,7 +36,7 @@ class HttpSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Consumer.class, VertxFriendlyLock.class)) .withConfigurationResource("http-source-test-application.properties"); diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java index dccfc269e0ae2..7a34a6d1e1860 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java @@ -10,8 +10,6 @@ import org.eclipse.microprofile.reactive.messaging.Message; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ class WebSocketSinkTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebSocketEndpoint.class, WebSocketEmitter.class, ToUpperCaseSerializer.class)) .withConfigurationResource("websocket-sink-test-application.properties"); diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java index c858f6853d60e..efa2abe187f85 100644 --- a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java +++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java @@ -13,8 +13,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -35,7 +33,7 @@ class WebSocketSourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Consumer.class, WebSocketClient.class, VertxFriendlyLock.class)) .withConfigurationResource("websocket-source-test-application.properties"); diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTest.java index 77473b651e8e5..ea27de66cfe3e 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CredentialsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(CustomCredentialsProvider.class) .addClass(CredentialsTestResource.class) .addAsResource("application-credentials.properties", "application.properties")); diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DataSourceHealthCheckExclusionTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DataSourceHealthCheckExclusionTest.java index 2745937d22e7d..51e162003699e 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DataSourceHealthCheckExclusionTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DataSourceHealthCheckExclusionTest.java @@ -1,8 +1,6 @@ package io.quarkus.reactive.mssql.client; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DataSourceHealthCheckExclusionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .withConfigurationResource("application-datasources-with-health.properties"); @Test diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java index 01ee67f1871a1..90d2b1ba5d055 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MSSQLPoolProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-default-datasource.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingBareMSSQLClient.class) .addClasses(BeanUsingMutinyMSSQLClient.class)); diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java index 59bdc47d14fc9..44f38157f406c 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultipleDataSourcesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-multiple-datasources.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingDefaultDataSource.class) .addClass(BeanUsingHibernateDataSource.class)); diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/ReactiveMSSQLReloadTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/ReactiveMSSQLReloadTest.java index b930cc9b0d2ee..b185fd68bf8b8 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/ReactiveMSSQLReloadTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/ReactiveMSSQLReloadTest.java @@ -1,9 +1,7 @@ package io.quarkus.reactive.mssql.client; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ReactiveMSSQLReloadTest { @RegisterExtension public static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DevModeResource.class) .add(new StringAsset("quarkus.datasource.db-kind=mssql\n" + "quarkus.datasource.reactive.url=vertx-reactive:sqlserver://localhost:3314/reload_test"), diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTest.java index 5956efb897b3a..2e496278b7ffd 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CredentialsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(CustomCredentialsProvider.class) .addClass(CredentialsTestResource.class) .addAsResource("application-credentials.properties", "application.properties")); diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DataSourceHealthCheckExclusionTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DataSourceHealthCheckExclusionTest.java index b08e1db8b7b44..15f801a782c06 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DataSourceHealthCheckExclusionTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DataSourceHealthCheckExclusionTest.java @@ -1,8 +1,6 @@ package io.quarkus.reactive.mysql.client; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DataSourceHealthCheckExclusionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .withConfigurationResource("application-datasources-with-health.properties"); @Test diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java index f4ac20b89c8ef..f6c8162b33b86 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultipleDataSourcesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-multiple-datasources.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingDefaultDataSource.class) .addClass(BeanUsingHibernateDataSource.class)); diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java index 4f91cf639d98d..47ec1121c0df7 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MySQLPoolProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingBareMySQLClient.class) .addClasses(BeanUsingMutinyMySQLClient.class)); diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/ReactiveMySQLReloadTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/ReactiveMySQLReloadTest.java index 323f3b2482b06..862b258acccbc 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/ReactiveMySQLReloadTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/ReactiveMySQLReloadTest.java @@ -1,9 +1,7 @@ package io.quarkus.reactive.mysql.client; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ReactiveMySQLReloadTest { @RegisterExtension public static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DevModeResource.class) .add(new StringAsset("quarkus.datasource.db-kind=mysql\n" + "quarkus.datasource.reactive.url=vertx-reactive:mysql://localhost:6033/reload_test"), diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTest.java index 82aebf204f04e..894017b4a6057 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CredentialsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(CustomCredentialsProvider.class) .addClass(CredentialsTestResource.class) .addAsResource("application-credentials.properties", "application.properties")); diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DataSourceHealthCheckExclusionTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DataSourceHealthCheckExclusionTest.java index 09ad8bb8f7d02..b0c34d51240b6 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DataSourceHealthCheckExclusionTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DataSourceHealthCheckExclusionTest.java @@ -1,8 +1,6 @@ package io.quarkus.reactive.pg.client; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DataSourceHealthCheckExclusionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .withConfigurationResource("application-datasources-with-health.properties"); @Test diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java index 795da4acb0c7e..cfac91e8dfccb 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultipleDataSourcesTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-multiple-datasources.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingDefaultDataSource.class) .addClass(BeanUsingHibernateDataSource.class)); diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java index 756c3990af623..d234cfa5d7855 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java @@ -6,8 +6,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class PgPoolProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-default-datasource.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingBarePgClient.class) .addClass(BeanUsingMutinyPgClient.class)); diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/ReactivePgReloadTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/ReactivePgReloadTest.java index adfab0f331459..e5c9775124f39 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/ReactivePgReloadTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/ReactivePgReloadTest.java @@ -1,9 +1,7 @@ package io.quarkus.reactive.pg.client; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ReactivePgReloadTest { @RegisterExtension public static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DevModeResource.class) .add(new StringAsset("quarkus.datasource.db-kind=postgresql\n" + "quarkus.datasource.reactive.url=vertx-reactive:postgres://localhost:2345/reload_test"), diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java index 47f5b89ad6e3b..bc85f76c62c87 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java @@ -4,8 +4,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ConflictingRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java index 5b85bb80a1b39..c7dab49919b1e 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java @@ -10,8 +10,6 @@ import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class DependentRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java index 161a816bf3604..65b44c1156198 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java @@ -20,9 +20,7 @@ import java.io.IOException; import java.util.UUID; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class DisabledUploadsTest { private static final String UPLOADS_DIR = "target/disabled-uploads-" + UUID.randomUUID().toString(); @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class) .addAsResource(new StringAsset( "quarkus.http.body.handle-file-uploads = false\n" // diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SecureSocketWithKeyStoreTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SecureSocketWithKeyStoreTestCase.java index 7209782a2015c..bcd12420ef81a 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SecureSocketWithKeyStoreTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SecureSocketWithKeyStoreTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class SecureSocketWithKeyStoreTestCase { @RegisterExtension static QuarkusUnitTest runner = QuarkusUnitTest.withSecuredConnection() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestRoute.class) .addAsResource("application-keystore.properties", "application.properties") .addAsResource("keystore.jks")); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ServerLimitsConfigTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ServerLimitsConfigTestCase.java index 5c0a812834526..7343bc85b95cd 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ServerLimitsConfigTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ServerLimitsConfigTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.vertx.web; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ServerLimitsConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestRoute.class) .addAsResource(new StringAsset("\nquarkus.http.limits.max-header-size=1K" + "\nquarkus.http.limits.max-body-size=2K"), diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java index e7f6531167898..5ae3a5cd56108 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java @@ -16,8 +16,6 @@ import javax.inject.Inject; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class SimpleRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties") .addAsResource("test-users.properties") .addAsResource("test-roles.properties") diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java index 6774fb428bb30..43f51a415f8cd 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java @@ -20,9 +20,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class UploadsDirectoryTest { private static final String UPLOADS_DIR = "target/test-uploads"; @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class) .addAsResource(new StringAsset( "quarkus.http.body.uploads-directory = " + UPLOADS_DIR diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/VertxWebDevModeTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/VertxWebDevModeTestCase.java index a8f94cd07bd30..fb1c031440de5 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/VertxWebDevModeTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/VertxWebDevModeTestCase.java @@ -3,8 +3,6 @@ import java.util.function.Function; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class VertxWebDevModeTestCase { @RegisterExtension static QuarkusDevModeTest runner = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DevModeRoute.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/base/RouteBaseTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/base/RouteBaseTest.java index 2d6547ca7e7b4..9534adfbddbe8 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/base/RouteBaseTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/base/RouteBaseTest.java @@ -4,8 +4,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class RouteBaseTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testPath() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java index fe262dc1d89bf..0631a1e899ad7 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class BlockingRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSDisabledHandlerTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSDisabledHandlerTestCase.java index f428f297b9a14..58960e5fdcbf5 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSDisabledHandlerTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSDisabledHandlerTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.core.IsNull.nullValue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CORSDisabledHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestRoute.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java index acdb3a2a5f369..d5652e506ae16 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.given; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CORSFullConfigHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestRoute.class) .addAsResource("conf/cors-config-full.properties", "application.properties")); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSHandlerTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSHandlerTestCase.java index 179ab0cbccb7d..0ae195073d829 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSHandlerTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSHandlerTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.core.Is.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class CORSHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestRoute.class) .addAsResource("conf/cors-config.properties", "application.properties")); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cs/CompletionStageRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cs/CompletionStageRouteTest.java index c00ff27b26454..b6ddf4865b19a 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cs/CompletionStageRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cs/CompletionStageRouteTest.java @@ -9,8 +9,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class CompletionStageRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testCsRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java index 84c1f19293a83..f36852b6e65c9 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java @@ -4,8 +4,6 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class FailureHandlerPathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java index 09951465f873b..77c9d68cbee61 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java @@ -4,8 +4,6 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class FailureHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java index c73276bbf56f3..162b4d8bb1525 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MultipleThrowableParamsFailureHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java index 2d43bd1b0e3be..6b9f4803b26e1 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ThrowableParamNormalHandlerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Routes.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/InvalidFilterParametersTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/InvalidFilterParametersTest.java index 264151038b6e2..2ab1efbd748bc 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/InvalidFilterParametersTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/InvalidFilterParametersTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidFilterParametersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java index 1b15b98b24b45..233731b1a9f35 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java @@ -7,8 +7,6 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class UserFilterRequestContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FilterAndRoute.class, RequestFoo.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java index 2b88a5ca8bbc6..bc8baeac2f577 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java @@ -7,8 +7,6 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class UserFilterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyFilters.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/JsonMultiRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/JsonMultiRouteTest.java index 46f22dece90d2..a1c9a5b8e77f3 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/JsonMultiRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/JsonMultiRouteTest.java @@ -7,8 +7,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class JsonMultiRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testMultiRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java index d870a6e45aeb3..8be11dc569ba4 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MultiRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testMultiRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java index febc1f021494f..7406073041c10 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class NdjsonMultiRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testNdjsonMultiRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawMutinyTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawMutinyTest.java index 49f10ebbefc25..6927f695842a7 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawMutinyTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawMutinyTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RawMutinyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawUniTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawUniTest.java index ec0ce16958c92..0f9d749d1e8e4 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawUniTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/RawUniTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RawUniTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java index 9cfdbb2ea6195..be5be59dff350 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class SSEMultiRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testSSEMultiRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java index 8cb553a645a2a..1f93be9ee97b7 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java @@ -13,8 +13,6 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class SyncRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @TestHTTPResource URL url; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java index 5b4819f433384..0d26c6a8c89fb 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class UniRouteTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Test public void testUniRoute() { diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java index 60add339eaa78..a99b9da2dc348 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidPathParameterNameTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidRouteMethodParametersTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidRouteMethodParametersTest.java index da7b10360dae3..48df641672a5f 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidRouteMethodParametersTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidRouteMethodParametersTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidRouteMethodParametersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java index 21aec7fce7ef2..1028975c20a17 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java @@ -10,8 +10,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class RouteMethodParametersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java index 19acf89dcb20c..fae87fb715f30 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class VoidInvalidParameterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class)) .setExpectedException(IllegalStateException.class); diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java index 6b01203b2d2cd..ff91979871583 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java @@ -15,8 +15,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class RequestContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class, Ping.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java index 99c88b953ff6a..c8b8d673aa4a2 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java @@ -9,8 +9,6 @@ import javax.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class MultiValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java index 9dd5d07b0bb4d..e8fec8ed60228 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java @@ -14,8 +14,6 @@ import javax.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class SyncValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class)); @Test diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java index 6faa7d1776091..1cda21aed79c6 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java @@ -14,8 +14,6 @@ import javax.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class UniValidationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyRoutes.class)); @Test diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsHotReloadTest.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsHotReloadTest.java index 3970ab819494e..7221f6450fbcf 100644 --- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsHotReloadTest.java +++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsHotReloadTest.java @@ -1,7 +1,5 @@ package io.quarkus.mutiny.reactive.operators.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ReactiveStreamsOperatorsHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(io.quarkus.mutiny.reactive.operators.deployment.MyTestResource.class)); @Test diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java index ada83187446bb..8b92b641b0209 100644 --- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java +++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ class ReactiveStreamsOperatorsUsageTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingReactiveStreamsOperators.class)); @Inject diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsHotReloadTest.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsHotReloadTest.java index 866348a318d62..2a46d25aea18b 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsHotReloadTest.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsHotReloadTest.java @@ -1,7 +1,5 @@ package io.quarkus.smallrye.reactivestreamoperators.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ReactiveStreamsOperatorsHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyTestResource.class)); @Test diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java index 0038488b91d68..ae942ebf21e30 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ class ReactiveStreamsOperatorsUsageTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingReactiveStreamsOperators.class)); @Inject diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/JacksonRestClientTest.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/JacksonRestClientTest.java index 2592ce4a05d6f..f0a74c4750ce7 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/JacksonRestClientTest.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/JacksonRestClientTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class JacksonRestClientTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ZonedDateTimeObjectMapperCustomizer.class, DateDto.class, HelloResource.class, RestInterface.class, ClientResource.class)); diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/JaxbRestClientTest.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/JaxbRestClientTest.java index f665f95352afb..c385936fff8a0 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/JaxbRestClientTest.java +++ b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/JaxbRestClientTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class JaxbRestClientTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Book.class, HelloResource.class, RestInterface.class, diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/JsonbRestClientTest.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/JsonbRestClientTest.java index 2317d1bcd331f..055a26ec1042a 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/JsonbRestClientTest.java +++ b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/JsonbRestClientTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class JsonbRestClientTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ZonedDateTimeJsonbConfigCustomizer.class, DateDto.class, HelloResource.class, RestInterface.class, ClientResource.class)); diff --git a/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java b/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java index 62cd2533b4875..97870bc3dda55 100644 --- a/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java +++ b/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java @@ -10,8 +10,6 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MutinyRestClientTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MutinyRestClientTest.class, Client.class, TestEndpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java index 7ea84d4ce082e..ca19c8d2163b5 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java @@ -7,8 +7,6 @@ import javax.inject.Singleton; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MPRestClientsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, EchoClient.class, EchoClientWithConfigKey.class, ShortNameEchoClient.class)) .withConfigurationResource("mp-restclients-test-application.properties"); diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java index c6e220f13df0c..ac6f5479b54f3 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java @@ -11,8 +11,6 @@ import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class QuarkusConfigurationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, EchoClientWithConfigKey.class, MyResponseFilter.class, MyHostnameVerifier.class)) .withConfigurationResource("restclient-config-test-application.properties"); diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java index 80e03a26a34c2..2feece9c9dc3a 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java @@ -3,8 +3,6 @@ import javax.inject.Singleton; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class QuarkusRestClientsTest extends MPRestClientsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, EchoClient.class, EchoClientWithConfigKey.class, ShortNameEchoClient.class)) .withConfigurationResource("quarkus-restclients-test-application.properties"); diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java index 2e5efe16dcb41..771424be233bd 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java @@ -10,9 +10,7 @@ import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ static StringAsset createStringAsset() { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(createStringAsset(), "application.properties") .addClasses(RestClientExceptionOriginalBehaviorTest.class, DownstreamServiceClient.class, FrontendService.class, diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java index 5f5b7ce24a0ef..440be6aa8f901 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java @@ -8,9 +8,7 @@ import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class RestClientExceptionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource( new StringAsset( "io.quarkus.restclient.exception.DownstreamServiceClient/mp-rest/url=${test.url}/downstream"), diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java index 3a8eab8cbdc7c..f5b84e4b53a40 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java @@ -17,8 +17,6 @@ import org.eclipse.microprofile.faulttolerance.FallbackHandler; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class AsyncRestClientFallbackTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AsyncRestClientFallbackTest.class, Client.class, MyFallback.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java index ddb40114532aa..c5deda240356d 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java @@ -13,8 +13,6 @@ import org.eclipse.microprofile.faulttolerance.FallbackHandler; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class RestClientFallbackTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RestClientFallbackTest.class, Client.class, MyFallback.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java index 697dad951e8dc..527b26229c2cf 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java @@ -21,8 +21,6 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class RestClientInterceptorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RestClientInterceptorTest.class, Client.class, Foo.class, FooInterceptor.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java index 0d219666c8ef1..ec81ff197d87a 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java @@ -3,9 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class RegisterClientHeadersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, EchoClient.class, MyHeadersFactory.class) .addAsResource( new StringAsset("io.quarkus.restclient.registerclientheaders.EchoClient/mp-rest/url=${test.url}"), diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java index 94a8ade42f8cf..35a7fdfc9a311 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java @@ -20,8 +20,6 @@ import javax.ws.rs.ext.Provider; import org.jboss.resteasy.specimpl.ResteasyUriInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -34,7 +32,7 @@ public class ProviderClientRegistrationTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProviderClientRegistrationTest.class, ClientBean.class, HelloFooProvider.class)); static HttpServer server; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java index 222790712c5ec..3e00dbd3da8e1 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java @@ -7,9 +7,7 @@ import javax.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class RegisterProviderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, EchoClient.class, MyFilter.class, MethodsCollector.class, MyRequestBean.class) .addAsResource(new StringAsset("io.quarkus.restclient.registerprovider.EchoClient/mp-rest/url=${test.url}"), diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewTest.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewTest.java index 6287f4aa8791d..6bc8b57f5d284 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewTest.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewTest.java @@ -4,8 +4,6 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class JsonViewTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(JsonViewResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/MultipleTimeModuleTest.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/MultipleTimeModuleTest.java index 0910dd37ddcea..1986208eeff09 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/MultipleTimeModuleTest.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/MultipleTimeModuleTest.java @@ -3,8 +3,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MultipleTimeModuleTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TimeCustomizer.class, DateDto.class, HelloResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java index 11c2a566fdaf2..b6936716d87e8 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class NoMediaTypeTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloNoMediaTypeResource.class, Message.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java index 93a0dc7e177c6..30830267a2453 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java @@ -7,8 +7,6 @@ import javax.ws.rs.core.MediaType; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class ConsumesXMLTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Bar.class, FooResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java index bb04058c16475..29e6a7279a6fa 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java @@ -13,8 +13,6 @@ import javax.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class ProducesXMLTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Bar.class, FooResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java index 5e3959b1f7084..289375e946f98 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java +++ b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class NoMediaTypeTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloNoMediaTypeResource.class, Message.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/VertxSerializerRegistrationTest.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/VertxSerializerRegistrationTest.java index 31649c5d196f6..0dae22cb5a0f8 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/VertxSerializerRegistrationTest.java +++ b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/VertxSerializerRegistrationTest.java @@ -3,8 +3,6 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class VertxSerializerRegistrationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ResourceSendingJsonObjects.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java index 9b3258301ed7d..67bd740903360 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java @@ -5,8 +5,6 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class InvalidEncodingTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FeedbackBody.class, FeedbackResource.class)) .withConfigurationResource("application-charset-us-ascii.properties"); diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java index b7e0032d724fd..32703bd0a3e61 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java @@ -5,8 +5,6 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class MultipartEncodingTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FeedbackBody.class, FeedbackResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java index 46013efdd7444..4386bfc6257e4 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java @@ -4,8 +4,6 @@ import javax.ws.rs.core.MediaType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class PartTypeMultipartTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PartTypeDto.class, PartTypeEnum.class, PartTypeResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java index ac799aeac8b6e..c6a531e374a30 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java @@ -9,8 +9,6 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +25,7 @@ public class RestEasyMutinyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MutinyResource.class, MutinyInjector.class, Async.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/RestEasyMutinyWithJsonTest.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/RestEasyMutinyWithJsonTest.java index c639f12deacc7..1c67205a174b9 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/RestEasyMutinyWithJsonTest.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/RestEasyMutinyWithJsonTest.java @@ -1,7 +1,5 @@ package io.quarkus.resteasy.mutiny.test.vertx; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RestEasyMutinyWithJsonTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ResourceProducingJsonObject.class, MutinyInjector.class)); @Test diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java index 2c529e32c2bfb..c573ccf98b34d 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MessageBundleDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AppMessages.class, AppMessageHelloResource.class) .addAsResource(new StringAsset( "{msg:hello_name('Georg')}"), diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java index 997b205f6a83d..5969a74bab1b0 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MessageBundleLocaleFromVariantTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AppMessages.class, AppMessageHelloResource.class) .addAsResource(new StringAsset( "{msg:hello_name('Georg')}"), diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java index f6cf3a3dbbaeb..8782d741df2e3 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class MissingTemplateTest { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MissingTemplateResource.class) .addAsResource("templates/MissingTemplateResource/hello.txt")) .setExpectedException(TemplateException.class); diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TemplateResponseFilterTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TemplateResponseFilterTest.java index a7d616aa83b48..f5585a0958890 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TemplateResponseFilterTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TemplateResponseFilterTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.when; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class TemplateResponseFilterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class) .addClass(Templates.class) .addAsResource("templates/toplevel.txt") diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java index 4ac89bb764303..a86b0ab134c3a 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class TypeErrorTest { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class) .addAsResource("templates/HelloResource/hello.txt") .addAsResource("templates/HelloResource/typeError.txt") diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java index 6dc60928a3d21..d37c54b25b85d 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class TypeErrorTest3 { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TypeErrorResource.class) .addAsResource("templates/TypeErrorResource/typeError3.txt")) .assertException(t -> { diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java index fe1beab155dfb..b8ec5cfb8f5bd 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class VariantTemplateTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ItemResource.class, Item.class) .addAsResource(new StringAsset("Item {item.name}: {item.price}"), "templates/ItemResource/item.txt") .addAsResource(new StringAsset("Item {item.name}: {item.price}"), diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java index b9ce2fec70075..7c8591fad9369 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java @@ -4,8 +4,6 @@ import javax.ws.rs.core.HttpHeaders; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CacheControlFeatureTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CacheResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ClasspathResourceTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ClasspathResourceTestCase.java index a5fe00f1e8b4d..8396947a9d218 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ClasspathResourceTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ClasspathResourceTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ClasspathResourceTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class) .addAsManifestResource(new StringAsset("hello"), "resources/other/hello.txt") .addAsManifestResource(new StringAsset("index"), "resources/index.html") diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResourceTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResourceTestCase.java index 6d5686fa59108..010e04dade9f8 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResourceTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResourceTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ConstructorInjectionResourceTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConstructorInjectionResource.class, SingletonConstructorInjectionResource.class, Service.class)); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java index 4ebd5eb1a8c63..915abb35ab7eb 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ContentLengthTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ContentLengthResource.class)) .overrideConfigKey("quarkus.resteasy.vertx.response-buffer-size", "100"); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java index 978a9ee8b4093..2b2a15bf2486d 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java @@ -5,8 +5,6 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.SecurityContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ContextTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CookieTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CookieTest.java index 824849fa6ba57..f3abed7493b74 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CookieTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CookieTest.java @@ -2,8 +2,6 @@ import java.util.HashMap; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CookieTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SetCookieResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java index 1e8fb9931b25e..9529ef06021b1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java @@ -7,8 +7,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class CustomExceptionMapperTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class, CustomExceptionMapper.class, MessageService.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java index bdbd1338aadb9..a3c314c2d116f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java @@ -11,8 +11,6 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class ExceptionReturnStatusAndBodyTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExceptionReturnStatusAndBodyResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java index b4d2a6ee1df87..73b8e79c45cea 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java @@ -4,9 +4,7 @@ import javax.ws.rs.Path; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ForwardedEnabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class) .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" + "quarkus.http.proxy.enable-forwarded-host=true\n"), diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java index 34a487eb75237..07879611f7763 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java @@ -6,8 +6,6 @@ import org.apache.http.params.CoreConnectionPNames; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class IncompletePostTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PostEndpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonProviderTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonProviderTestCase.java index 9c4e9a34870b3..14dbbb7faf235 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonProviderTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonProviderTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class JsonProviderTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(JsonResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxRequestSizeTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxRequestSizeTestCase.java index a593abe769a9b..fb22c02013330 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxRequestSizeTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxRequestSizeTestCase.java @@ -6,9 +6,7 @@ import java.nio.charset.StandardCharsets; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MaxRequestSizeTestCase { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MaxBodySizeResource.class) .addAsResource(new StringAsset("quarkus.http.limits.max-body-size=10"), "application.properties")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTestCase.java index 112fa7d182b54..aa3cf7d9dddc2 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTestCase.java @@ -3,9 +3,7 @@ import static org.hamcrest.CoreMatchers.containsString; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NotFoundExceptionMapperHttpRootTestCase { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class) .addAsResource(new StringAsset("quarkus.http.root-path=/abc"), "application.properties") .addAsResource(new StringAsset("index content"), META_INF_RESOURCES + "index.html")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTrailingSlashTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTrailingSlashTestCase.java index 3fe1263e2381b..09e45709f8f7f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTrailingSlashTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperHttpRootTrailingSlashTestCase.java @@ -3,9 +3,7 @@ import static org.hamcrest.CoreMatchers.containsString; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NotFoundExceptionMapperHttpRootTrailingSlashTestCase { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class) .addAsResource(new StringAsset("quarkus.http.root-path=/abc/"), "application.properties") .addAsResource(new StringAsset("index content"), META_INF_RESOURCES + "index.html")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperTestCase.java index a078c8ef4b899..8feb5436eed29 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NotFoundExceptionMapperTestCase.java @@ -4,9 +4,7 @@ import static org.hamcrest.CoreMatchers.not; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class NotFoundExceptionMapperTestCase { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class) .addAsResource(new StringAsset("index content"), META_INF_RESOURCES + "index.html")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java index 460af28534fc0..3b98d31d4befe 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java @@ -12,8 +12,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ class NullHeaderTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NullFilter.class, NullResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java index 24c53732cef0e..c39e881921278 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java @@ -7,8 +7,6 @@ import javax.ws.rs.Path; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class PathInterfaceImplementorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AlphaResource.class, AlphaResourceImpl.class, TestService.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ReadTimeoutTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ReadTimeoutTestCase.java index fa0fc692db41e..6b172f79597a7 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ReadTimeoutTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ReadTimeoutTestCase.java @@ -7,9 +7,7 @@ import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ReadTimeoutTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.http.read-timeout=0.5S"), "application.properties") .addClasses(PostEndpoint.class)); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyCORSTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyCORSTestCase.java index 0e620cf1e30fb..335629911df6f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyCORSTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyCORSTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class RestEasyCORSTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class) .addAsResource("cors-config.properties", "application.properties")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java index 5ad185a667019..03faa6b6c6bca 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java @@ -5,8 +5,6 @@ import java.util.function.Function; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class RestEasyDevModeTestCase { @RegisterExtension public static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(PostResource.class) .addClass(GreetingResource.class) .addClass(InterfaceResource.class) diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyRootResourceTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyRootResourceTestCase.java index 901b00951f9bd..31dd85f4b5c6e 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyRootResourceTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyRootResourceTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class RestEasyRootResourceTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java index 7295bcfd62af9..c3250307e34e7 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java @@ -7,8 +7,6 @@ import java.util.concurrent.TimeUnit; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class VertxIOHangTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InputStreamResource.class)); @TestHTTPResource diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOTest.java index ec77853c3f3f5..b6dc4fec4cd40 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOTest.java @@ -1,7 +1,5 @@ package io.quarkus.resteasy.test.asyncio; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class AsyncIOTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AsyncIOResource.class)) .withConfigurationResource("application-asyncio.properties"); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOUndertowTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOUndertowTest.java index 5259bbfdac25d..6e384e9b885a5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOUndertowTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOUndertowTest.java @@ -2,8 +2,6 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class AsyncIOUndertowTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AsyncIOResource.class)) .withConfigurationResource("application-asyncio.properties") .setForcedDependencies( diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/BeanGenerationTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/BeanGenerationTest.java index fba7e8729fc89..161ba3e4395e5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/BeanGenerationTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/BeanGenerationTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class BeanGenerationTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(PublicHello.class.getPackage()) .addClasses(Greeting.class, MorningGreeting.class, GreetingEndpoint.class)); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java index bdb0c72bee9c2..8c8f22f025d6c 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java @@ -13,9 +13,7 @@ import javax.ws.rs.ext.Provider; import org.jboss.resteasy.spi.HttpRequest; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class ConfigMappingWithProviderTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MappingResource.class) .addClass(MappingFilter.class) .addClass(Mapping.class) diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/NoResourceTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/NoResourceTest.java index 694d359bfd7cb..027898c1180ea 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/NoResourceTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/NoResourceTest.java @@ -1,7 +1,5 @@ package io.quarkus.resteasy.test.files; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class NoResourceTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesHttpRootTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesHttpRootTest.java index 0a2eb25bfd934..50956915d8707 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesHttpRootTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesHttpRootTest.java @@ -4,9 +4,7 @@ import java.io.File; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class StaticFileWithResourcesHttpRootTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RootResource.class) .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties") .addAsResource(new File("src/test/resources/lorem.txt"), "META-INF/resources/lorem.txt") diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java index 2f57a58886723..b97854e6c72a3 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java @@ -16,8 +16,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class StaticFileWithResourcesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RootResource.class) .addAsResource(new File("src/test/resources/lorem.txt"), "META-INF/resources/lorem.txt") .addAsResource(new File("src/test/resources/index.html"), "META-INF/resources/web/index.html")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithoutResourcesTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithoutResourcesTest.java index a80cd5edaeb4a..cfadb11245c5d 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithoutResourcesTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithoutResourcesTest.java @@ -4,8 +4,6 @@ import java.io.File; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class StaticFileWithoutResourcesTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new File("src/test/resources/lorem.txt"), "META-INF/resources/lorem.txt") .addAsResource(new File("src/test/resources/index.html"), "META-INF/resources/index.html")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticResourceDeletionBeforeFirstRequestTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticResourceDeletionBeforeFirstRequestTest.java index 80732803efbb6..2cfe92ebfd1e4 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticResourceDeletionBeforeFirstRequestTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticResourceDeletionBeforeFirstRequestTest.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test.files; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class StaticResourceDeletionBeforeFirstRequestTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("static resource content"), META_INF_RESOURCES_STATIC_RESOURCE_TXT)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java index 25dbc35de5784..9a70cb8e367c3 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test.gzip; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class GZipResourceTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(GZipResource.class)) .overrideConfigKey("quarkus.resteasy.gzip.enabled", "true"); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java index b409190a81b2d..97177885feb9b 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java @@ -6,8 +6,6 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class MultipartResourceTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MultipartResource.class)); @Test @@ -36,4 +34,4 @@ public void testHelloEndpoint() { .body(is("[test:value]")); } -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java index 7119705b9ae3c..91043cba4458e 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java @@ -6,9 +6,7 @@ import javax.ws.rs.core.Application; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ApplicationPathHttpRootTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloApp.class, BaseApplication.class) .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java index 81aea381fc28e..fb6372ecd5fb3 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java @@ -6,8 +6,6 @@ import javax.ws.rs.core.Application; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ApplicationPathTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloApp.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java index e00eb8b9058a0..9cd3eabd0d14f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java @@ -20,8 +20,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ class ApplicationTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( IResourceTest.class, ResourceInheritedInterfaceTest.class, AResourceTest.class, ResourceInheritedClassTest.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java index 067427b0fcaf8..921f141cc2f7d 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java @@ -20,8 +20,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -39,7 +37,7 @@ class BuildProfileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class, ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java index 91019d8f7d593..beca4c5acdca5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class UserRouteTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootResource.class, MyRoute.class)); @Inject diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java index 90f70eabacfc1..7caa4e394b281 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultRolesAllowedJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedStarJaxRsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedStarJaxRsTest.java index e49aa523599bf..4e0fd8c7dd808 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedStarJaxRsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedStarJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultRolesAllowedStarJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java index 47e7e37a53e09..ff96a91bc99b5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DenyAllJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java index 479030d5798de..2d1f6628d0a8f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class LazyAuthRolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, UserResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java index 10dbf823eca5c..e514f4fb5176f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, UserResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedJaxRsTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedJaxRsTestCase.java index 351e919cee77d..5782f908cc2db 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedJaxRsTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.*; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, UserResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java index 747b4db109bbc..e54f9c8959507 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java @@ -11,8 +11,6 @@ import javax.ws.rs.sse.InboundSseEvent; import javax.ws.rs.sse.SseEventSource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class SseTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SseResource.class)); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorHttpRootTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorHttpRootTest.java index 74f2f962146ef..9823f760cbd79 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorHttpRootTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorHttpRootTest.java @@ -1,9 +1,7 @@ package io.quarkus.resteasy.test.subresource; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class SubresourceLocatorHttpRootTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PingResource.class, PingsResource.class, MyService.class, SuperPingResource.class) .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties")); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorTest.java index 9926a2851cca4..dbd7831c6e756 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SubresourceLocatorTest.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.test.subresource; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class SubresourceLocatorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PingResource.class, PingsResource.class, MyService.class, SuperPingResource.class)); @Test diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java index 30677a5122903..a8baa6b800d97 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java @@ -21,8 +21,6 @@ import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,7 +37,7 @@ public class AsyncRestClientFilterTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Endpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java index e212f0c9a0801..b58c399113030 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java @@ -13,8 +13,6 @@ import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,7 +28,7 @@ public class ClientResponseFilterTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Endpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java index 93b7ded9df70a..fbad3411d4303 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java @@ -12,8 +12,6 @@ import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -30,7 +28,7 @@ public class FailureTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Endpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java index 946b9c709353c..3c9480c670ab9 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java @@ -7,8 +7,6 @@ import javax.ws.rs.client.ClientBuilder; import org.jboss.resteasy.reactive.client.impl.UniInvoker; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -25,7 +23,7 @@ public class UniInvokerTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Endpoint.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java index 9ec397a1acf0a..514c9267b4cbf 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java @@ -7,8 +7,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class EmptyInputTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class, Greeting.class)); + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class, Greeting.class)); @Test public void emptyBlocking() { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java index 0466205c38657..bca32019b44e9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java @@ -22,8 +22,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class SimpleXmlTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Person.class, ModelWithoutAnnotation.class, SimpleXmlResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java index e5e89bb1730b5..c06e49f2305aa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java @@ -28,8 +28,6 @@ import org.jboss.resteasy.reactive.RestSseElementType; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -42,7 +40,7 @@ public class SseResourceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SseResource.class, Message.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java index f0e76b4f1946d..31df8d75355c6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java @@ -18,8 +18,6 @@ import javax.ws.rs.sse.SseEventSource; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class SseTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SseResource.class, Message.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java index b5ed6b73ca37f..8232d1fe82a3b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java @@ -8,8 +8,6 @@ import javax.ws.rs.core.Link; import javax.ws.rs.core.UriBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class RestLinksInjectionTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AbstractEntity.class, TestRecord.class, TestResource.class)); @TestHTTPResource("records") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java index ebfd456b94ac4..052063bb3b6e1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MessageBundleDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AppMessages.class, AppMessageHelloResource.class) .addAsResource(new StringAsset( "{msg:hello_name('Georg')}"), diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java index c17fda7ce455b..068d1c882bdf1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.fail; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class MissingTemplateTest { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MissingTemplateResource.class) .addAsResource("templates/MissingTemplateResource/hello.txt")) .setExpectedException(TemplateException.class); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java index 8adab770a90f2..4f1df75d7bd6a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.when; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class TemplateResponseFilterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class) .addClass(Templates.class) .addAsResource("templates/toplevel.txt") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java index f390ac8086912..cbaf3ab513024 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java @@ -2,9 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class TypeErrorTest { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class) .addAsResource("templates/HelloResource/hello.txt") .addAsResource("templates/HelloResource/typeError.txt") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java index 3cb7eb7267ac0..80b9c5d9a01ed 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java @@ -1,7 +1,5 @@ package io.quarkus.resteasy.reactive.qute.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.wildfly.common.Assert; @@ -12,7 +10,7 @@ public class TypeErrorTest3 { @RegisterExtension static final QuarkusUnitTest configError = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TypeErrorResource.class) .addAsResource("templates/TypeErrorResource/typeError3.txt")) .assertException(t -> { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java index d455a7becb0ab..c60ce2222b587 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class VariantTemplateTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ItemResource.class, Item.class) .addAsResource(new StringAsset("Item {name}: {price}"), "templates/item.txt") .addAsResource(new StringAsset("Item {name}: {price}"), diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java index 3c6fb6894ae97..7422abdd34ec1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java @@ -13,8 +13,6 @@ import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ class ContentTypeHeaderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SomeClient.class, Endpoint.class)); @TestHTTPResource("/foo") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java index 9e82fd178fec5..175a16954f767 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java @@ -8,8 +8,6 @@ import javax.ws.rs.Path; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class GeneratedJaxRsResourceTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(HelloResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(HelloResource.class)) .addBuildChainCustomizer(buildCustomizer()); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java index 65203cbf2a7ca..ba10b38bb47a5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java @@ -12,8 +12,6 @@ import org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class ResponseHeaderTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestResource.class)); + .withApplicationRoot((jar) -> jar.addClasses(TestResource.class)); @Test public void testReturnUni() { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java index 8f7f829a0f0fe..4e37ee7a38a35 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java @@ -13,9 +13,7 @@ import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.RestForm; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class InvalidEncodingTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FeedbackBody.class, FeedbackResource.class) .addAsResource(new StringAsset( "quarkus.resteasy-reactive.multipart.input-part.default-charset=us-ascii"), diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java index 3f880abb457f2..db26ad30c9832 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.path; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RelativeRestPathTestCase { .withConfigurationResource("empty.properties") .overrideConfigKey("quarkus.resteasy-reactive.path", "foo") .overrideConfigKey("quarkus.http.root-path", "/app") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java index 72814a37331e0..d314de6263c0e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java @@ -4,8 +4,6 @@ import javax.ws.rs.core.Application; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class RestApplicationPathTestCase { .withConfigurationResource("empty.properties") .overrideConfigKey("quarkus.resteasy-reactive.path", "/foo") .overrideConfigKey("quarkus.http.root-path", "/app") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, BarApp.class, BaseApplication.class)); /** diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java index 66579e73e7c41..17db9a14ae933 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.path; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RestPathTestCase { .withConfigurationResource("empty.properties") .overrideConfigKey("quarkus.resteasy-reactive.path", "/foo") .overrideConfigKey("quarkus.http.root-path", "/app") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java index 5ec061cc21030..7410817ebaea0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java @@ -12,8 +12,6 @@ import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.PathPart; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class FileTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FileResource.class, WithWriterInterceptor.class, WriterInterceptor.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileTestCase.java index 1ac47d7ccdf1b..c05edcc03d604 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.resteasy.reactive.server.test.providers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class InvalidFileTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidFileResource.class, WithWriterInterceptor.class, WriterInterceptor.class)) .assertException(t -> { while (t.getCause() != null) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java index 67200144cbe74..de539d169c823 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java @@ -12,8 +12,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ class NullHeaderTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NullFilter.class, NullResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedJaxRsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedJaxRsTest.java index aefb58b25fc44..15e8d971f7bad 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedJaxRsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultRolesAllowedJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedStarJaxRsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedStarJaxRsTest.java index a0761c6a9ec1e..dcad10e88e0ce 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedStarJaxRsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DefaultRolesAllowedStarJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DefaultRolesAllowedStarJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java index 1ed546f18cef3..501808bab4b4f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java @@ -3,9 +3,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DenyAllJaxRsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PermitAllResource.class, UnsecuredResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java index 05d04683d6858..4b7baebdb2438 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java @@ -4,9 +4,7 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class LazyAuthRolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, RolesAllowedBlockingResource.class, UserResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java index 8654e008e8bd8..3a0fc805518a8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java @@ -4,9 +4,7 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, UserResource.class, RolesAllowedBlockingResource.class, TestIdentityProvider.class, TestIdentityController.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java index 9f46e69e9d9e1..c4f23ed4397f0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java @@ -14,8 +14,6 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.Provider; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,7 +27,7 @@ public class RolesAllowedJaxRsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedResource.class, UserResource.class, RolesAllowedBlockingResource.class, SerializationEntity.class, SerializationRolesResource.class, TestIdentityProvider.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java index 3d2bfe6faebe5..16db7d24dde92 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java @@ -18,8 +18,6 @@ import javax.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.providers.serialisers.ServerDefaultTextPlainBodyHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class SecurityWithMethodGenericsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestIdentityProvider.class, TestIdentityController.class, BaseResource.class, AuthenticatedResource.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java index ea65f4df68d5c..3d7b3be0844ba 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java @@ -20,8 +20,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ class ApplicationTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class, ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java index 758b78ec6037e..fc85caf6675f0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java @@ -20,8 +20,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -39,7 +37,7 @@ class BuildProfileTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class, ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class, diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java index 74d5187a5f9b7..c45fc5348e202 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java @@ -7,8 +7,6 @@ import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class InterfaceWithImplTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Greeting.class, GreetingImpl.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java index 4addbe7ad3790..2124f1f3cc5f0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java @@ -14,8 +14,6 @@ import javax.ws.rs.ext.Provider; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class LocalDateCustomParamConverterProviderTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, CustomLocalDateParamConverterProvider.class, CustomLocalDateParamConverter.class)); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java index 5f7fced579066..40aa121072a95 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java @@ -8,8 +8,6 @@ import javax.ws.rs.QueryParam; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class LocalDateParamTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java index 3fb6ae3effba1..957f14806e1d7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java @@ -7,8 +7,6 @@ import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class RawListQueryParamTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java index 5965b6ab8a5ee..ef843a52c456a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java @@ -7,8 +7,6 @@ import javax.ws.rs.Path; import org.jboss.resteasy.reactive.ResponseStatus; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ResponseStatusTest { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestResource.class)); + .withApplicationRoot((jar) -> jar.addClasses(TestResource.class)); @Test public void testReturnUni() { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java index ca3de29b2cb5f..36df4075e7606 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java @@ -17,8 +17,6 @@ import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; @@ -45,7 +43,7 @@ public class StreamTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StreamResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java index 8ee15d769d0c0..5b3e3e6c0a94b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java @@ -20,8 +20,6 @@ import org.jboss.resteasy.reactive.server.model.ServerResourceMethod; import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -58,7 +56,7 @@ public List scan(MethodInfo method, ClassInfo actualEndp }).produces(MethodScannerBuildItem.class).build(); } }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(HelloResource.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java index 023dbe18fd719..938cd2da93dea 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java @@ -22,8 +22,6 @@ import org.jboss.jandex.MethodInfo; import org.jboss.resteasy.reactive.common.processor.transformation.AnnotationsTransformer; import org.jboss.resteasy.reactive.common.processor.transformation.Transformation; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -87,7 +85,7 @@ public void transform(TransformationContext transformationContext) { }).produces(AnnotationsTransformerBuildItem.class).build(); } }) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, MyGet.class, MyQuery.class)); @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java index a52b78c8d2fb2..30e702c402583 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java @@ -3,8 +3,6 @@ import java.net.URI; import java.util.concurrent.CompletableFuture; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class WebSocketTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebSocketResource.class)); @Test diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java index 5ff2441e990ec..df985eb8e0bbc 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java @@ -16,8 +16,6 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +32,7 @@ public class BadRequestNotPropagatedTestCase { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @TestHTTPResource URL url; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java index 9b2bbfebad574..70473305b438e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java @@ -16,8 +16,6 @@ import javax.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class MultiSseTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @TestHTTPResource URI uri; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java index b190184464404..f1e471cabde99 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java @@ -17,9 +17,7 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class AsyncHeaderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class, Resource.class) .addAsResource( new StringAsset(setUrlForClass(Client.class)), diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java index 0256fd40771a3..db7f244848d94 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class BasicRestClientTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloClient.class, HelloResource.class, TestBean.class, HelloClient2.class)) .withConfigurationResource("basic-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java index cf5d1ec7a6bfc..faf741481caae 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ClassNameScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, HelloClientWithBaseUri.class)) .withConfigurationResource("classname-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java index 79215c1db3717..397b811dc060e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java @@ -21,8 +21,6 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -37,7 +35,7 @@ public class ClientAndServerSharingResponseTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Endpoint.class, HeadersService.class)); @Test diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java index a4e0369407cad..3bb4f304f773e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ConfigKeyScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient2.class)) .withConfigurationResource("configkey-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java index aaab518a3ffc4..1b8541f3f7079 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java @@ -11,8 +11,6 @@ import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class ConfigurationTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloClientWithBaseUri.class, EchoResource.class)) .withConfigurationResource("configuration-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java index 16a635c27ecca..a519aa5e8ea53 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class LegacyConfigurationTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloClientWithBaseUri.class, EchoResource.class)) .withConfigurationResource("legacy-configuration-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java index e8af8cb57643d..013e31fe1bab1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class MpClassNameScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, HelloClientWithBaseUri.class)) .withConfigurationResource("mp-classname-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java index bf861fcc1439f..8747b61018efa 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MpConfigKeyScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient2.class)) .withConfigurationResource("mp-configkey-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java index 293f6466e061a..01c1d213e3f9b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class MpGlobalScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient2.class)) .withConfigurationResource("mp-global-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java index a7bf033ae44ed..2cbc100586460 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java @@ -17,8 +17,6 @@ import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.multipart.FileUpload; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class MultipartFilenameTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Resource.class, FormData.class, Client.class, ClientForm.class)) .withConfigurationResource("mp-global-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/NoPathInTheAppTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/NoPathInTheAppTest.java index 0c215651754db..4e0790b5aff0a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/NoPathInTheAppTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/NoPathInTheAppTest.java @@ -6,8 +6,6 @@ import java.net.URI; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,7 +20,7 @@ public class NoPathInTheAppTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PlaylistService.class)); private WireMockServer server; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java index ae7162c5eda3c..ce127912ea66c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java @@ -9,8 +9,6 @@ import javax.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ShortNameScopeOverrideTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EchoResource.class, HelloClientWithBaseUri.class)) .withConfigurationResource("shortname-scope-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java index 970ce74e52d1a..762eabdbbc0e5 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ErrorMappingTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Dto.class, Client.class, Resource.class).addAsResource( new StringAsset(setUrlForClass(Client.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java index eaba83a700fe0..a572c8ab46bc4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java @@ -14,9 +14,7 @@ import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ResponseExceptionMapperTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class, Resource.class, MyExceptionMapper.class).addAsResource( new StringAsset(setUrlForClass(Client.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java index a9e9439b05809..935c55248111f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java @@ -13,8 +13,6 @@ import javax.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class FormParamTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FormClient.class, SubFormClient.class, Resource.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java index 2a46b22922e5b..aae84d4a33e12 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java @@ -18,9 +18,7 @@ import org.eclipse.microprofile.faulttolerance.FallbackHandler; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class AsyncRestClientFallbackTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestEndpoint.class, Client.class, MyFallback.class) .addAsResource(new StringAsset(setUrlForClass(Client.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java index da3dfd95e1b8f..96c8f0d7642a7 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java @@ -13,9 +13,7 @@ import org.eclipse.microprofile.faulttolerance.FallbackHandler; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class RestClientFallbackTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestEndpoint.class, Client.class, MyFallback.class) .addAsResource(new StringAsset(setUrlForClass(Client.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java index 360eefb016c0b..7100449f72ca3 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java @@ -13,9 +13,7 @@ import org.eclipse.microprofile.faulttolerance.FallbackHandler; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class UniRestClientFallbackTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestEndpoint.class, Client.class, MyFallback.class) .addAsResource(new StringAsset(setUrlForClass(Client.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java index 6a3035988b107..1aa17325c4037 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java @@ -12,9 +12,7 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class ClientHeaderParamFromPropertyTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Client.class) + .withApplicationRoot((jar) -> jar.addClasses(Client.class) .addAsResource( new StringAsset("my.property-value=" + HEADER_VALUE), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java index 35fc2b9ae41d6..f96ef8a1ec577 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java @@ -10,8 +10,6 @@ import javax.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class CookieTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Resource.class)); + .withApplicationRoot((jar) -> jar.addClasses(Resource.class)); @TestHTTPResource URI baseUri; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java index 6b715952d6757..7a59673907a8c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java @@ -10,8 +10,6 @@ import javax.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class HeaderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Resource.class)); + .withApplicationRoot((jar) -> jar.addClasses(Resource.class)); @TestHTTPResource URI baseUri; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/RestClientReactiveBlockingTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/RestClientReactiveBlockingTest.java index bc4593c73438d..e611b302eca2a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/RestClientReactiveBlockingTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/RestClientReactiveBlockingTest.java @@ -4,9 +4,7 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RestClientReactiveBlockingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addPackage(TestClient.class.getPackage()) .addAsResource(new StringAsset(setUrlForClass(TestClient.class)), "application.properties")); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java index 97922399e96c9..446574aa8840f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java @@ -9,9 +9,7 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class ProviderDisabledAutodiscoveryTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient2.class, HelloClient.class, GlobalRequestFilter.class, GlobalResponseFilter.class) .addAsResource( diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java index 2bcb717b51af0..0925819afc6ac 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java @@ -6,9 +6,7 @@ import javax.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ProviderPriorityTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient.class, HelloClient2.class, diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java index 8470d770a40d0..769819a1de649 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java @@ -9,9 +9,7 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ProviderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloResource.class, HelloClient2.class, HelloClient.class, GlobalRequestFilter.class, GlobalResponseFilter.class, GlobalRequestFilterConstrainedToServer.class, GlobalFeature.class) diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java index 5f494ea76a96c..69cd0aef08a92 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java @@ -8,8 +8,6 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class RedirectTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RedirectingResourceClient.class, RedirectingResource.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java index 09b619f21c47d..e09df332d96db 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java @@ -10,8 +10,6 @@ import javax.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,7 +24,7 @@ public class TrustAllTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class)) .withConfigurationResource("trust-all-test-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java index 7a90089a494c3..140bc222410d1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkDevModeTest.java @@ -8,8 +8,6 @@ import java.io.File; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,7 +40,7 @@ public static void shutDown() { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PassThroughResource.class, HelloResource.class, HelloClient.class) .addAsResource( new File("src/test/resources/stork-dev-application.properties"), diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java index 71ee21427eab7..722b1dcfe462e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java @@ -7,8 +7,6 @@ import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class StorkIntegrationTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloClient2.class, HelloResource.class)) .withConfigurationResource("stork-application.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkResponseTimeLoadBalancerTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkResponseTimeLoadBalancerTest.java index cf02dbafc4544..507ca9eb31b1a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkResponseTimeLoadBalancerTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkResponseTimeLoadBalancerTest.java @@ -8,8 +8,6 @@ import java.util.Set; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,7 +27,7 @@ public class StorkResponseTimeLoadBalancerTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HelloClient2.class, HelloResource.class)) .withConfigurationResource("stork-stat-lb.properties"); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java index 586e096a48228..56d2ace39bb9a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java @@ -18,8 +18,6 @@ import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class SubResourceTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RootClient.class, SubClient.class, Resource.class)); @TestHTTPResource diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java index c236c8928460e..1c71a14260c12 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java @@ -16,8 +16,6 @@ import javax.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class BuilderReadTimeoutTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class, Resource.class)); @Test diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java index 4e9df6788b66f..8ae48ae9b94b9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java @@ -15,9 +15,7 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class RegisterReadTimeoutTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Client.class, Resource.class) .addAsResource(new StringAsset( "client/mp-rest/readTimeout=1000\nclient/mp-rest/url=http://${quarkus.http.host}:${quarkus.http.test-port}"), diff --git a/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java b/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java index 4ff4900073538..9153f51561516 100644 --- a/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java +++ b/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java @@ -3,9 +3,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class SimpleScheduledMethodDefaultPackageTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobsDefaultPackage.class) .addAsResource(new StringAsset("simpleJobs.cron=0/1 * * * * ?\nsimpleJobs.every=1s"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionProceedTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionProceedTest.java index 952a5d3a950ab..c578ff404dff3 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionProceedTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionProceedTest.java @@ -5,8 +5,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ConcurrentExecutionProceedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java index 5ee890709c1f8..5f8f57938dd54 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java @@ -10,8 +10,6 @@ import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class ConcurrentExecutionSkipTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java index f04cd3eff6a4b..c6179cee519ba 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java @@ -12,8 +12,6 @@ import javax.enterprise.event.Observes; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class ConditionalExecutionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java index 74c6e880208bd..510183c55e3b3 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java @@ -6,9 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DisabledScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("DisabledScheduledMethodTest.interval=off"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java index 94a045d2230db..19448ba283b36 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java @@ -4,9 +4,7 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DisabledSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("quarkus.scheduler.enabled=false"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java index 02304039ba5d7..63e6839746e6c 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java @@ -1,8 +1,6 @@ package io.quarkus.scheduler.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DuplicateIdentityExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DuplicateIdentityExpressionTest.InvalidBean.class) .addAsResource(new StringAsset("my.identity=my_name"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java index 1924207bf7609..91011e4b3df72 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java @@ -4,8 +4,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DuplicateJobIdentityTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java index f20795967eecd..ab5ad0e5c7068 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java @@ -4,8 +4,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class InvalidConditionalExecutionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class, Some.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java index b0736e25e98fa..c9e1027e33c98 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidCronExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java index e42bfb30cc65a..da5bfbd5c239b 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidDelayedExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java index 94297c4d59048..0419b71c4394d 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidEveryExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidEveryExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java index d5fa812e114c4..9b302860d719b 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class InvalidScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithInvalidScheduledMethod.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigCronExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigCronExpressionTest.java index 24e7542bcfb24..be151e836310e 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigCronExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigCronExpressionTest.java @@ -2,8 +2,6 @@ import java.util.NoSuchElementException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MissingConfigCronExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(NoSuchElementException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MissingConfigCronExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java index c11bf8ce1e2e2..ccb5ff7bbbc5f 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java @@ -2,8 +2,6 @@ import java.util.NoSuchElementException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class MissingConfigIdentityExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(NoSuchElementException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MissingConfigIdentityExpressionTest.InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java index 8f18af3e2b49e..c0d6484dc5050 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java @@ -2,8 +2,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class NoExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java index 97521f105b22d..c7d0fd30bdde7 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java @@ -9,9 +9,7 @@ import javax.enterprise.event.Observes; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class PausedMethodExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedMethodExpressionTest.Jobs.class) .addAsResource(new StringAsset("scheduler.identity=myIdentity"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java index 8dc4f8f9c3df8..a2d0ed643a2cf 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class PausedMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedMethodTest.Jobs.class)); private static final String IDENTITY = "myScheduled"; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java index e170fe3b0e95d..de9d1f41805ce 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class PausedResumedMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedResumedMethodTest.Jobs.class)); private static final String IDENTITY = "myScheduled"; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java index e69653840b23d..fbbb63df766f9 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class PausedSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PausedSchedulerTest.Jobs.class)); @Inject diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java index 4040b85ae8a4d..f3ae792d6e8be 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java @@ -7,9 +7,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class PropertyDefaultValueSchedulerTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("PropertyDefaultValueSchedulerTest.default=" + EXPECTED_IDENTITY), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestScheduledMethodTest.java index 6bd816330e416..3801105de5747 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestScheduledMethodTest.java @@ -4,8 +4,6 @@ import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class RequestScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(RequestContextJobs.class)); + .withApplicationRoot((jar) -> jar.addClasses(RequestContextJobs.class)); @Test public void testRequestContextScheduledJobs() throws InterruptedException { diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleDelayedTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleDelayedTest.java index 6a5803a143faf..5f2d88f6cb7a2 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleDelayedTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleDelayedTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SimpleDelayedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("jobs.delay=1s"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java index ddea8fe6a8ab1..845e2de59cdbe 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SimpleIdentityTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("jobs.identity=every_1s_another_name"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleScheduledMethodTest.java index c39c0bf967fdc..e92fb50777f9f 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleScheduledMethodTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SimpleScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleJobs.class) .addAsResource(new StringAsset("simpleJobs.cron=0/1 * * * * ?\nsimpleJobs.every=1s"), "application.properties")); diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java index bca6940c38ef4..5e5c8ee92f19b 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java @@ -1,8 +1,6 @@ package io.quarkus.scheduler.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DevConsoleRunScheduledTaskTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(NeverRunTask.class)); + .withApplicationRoot((jar) -> jar.addClasses(NeverRunTask.class)); @Test public void testInvokeScheduledTask() { diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java index ff9cbae918e5c..6e6a558fbf31a 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java @@ -12,9 +12,7 @@ import javax.inject.Inject; import org.awaitility.Awaitility; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class MicrometerTimedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset("quarkus.scheduler.metrics.enabled=true"), "application.properties")); diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BcryptPasswordMapperTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BcryptPasswordMapperTest.java index 48463dc1c7686..4808c491b3d46 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BcryptPasswordMapperTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BcryptPasswordMapperTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class BcryptPasswordMapperTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(BCryptUserEntity.class) .addAsResource("bcrypt-password-mapper/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomIdentityProviderConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomIdentityProviderConfigurationTest.java index 30d18f3018be9..f5285bde50821 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomIdentityProviderConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomIdentityProviderConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class CustomIdentityProviderConfigurationTest extends JpaSecurityRealmTes @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(PlainUserEntity.class) .addClass(UserEntityIdentityProvider.class) diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java index f98dc3c28b7be..1909d71544667 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class CustomPasswordMapperTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClasses(CustomPasswordUserEntity.class, CustomPasswordProvider.class) .addAsResource("custom-password-mapper/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalConfigurationTest.java index b9e413268358c..7372fdce0e517 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MinimalConfigurationTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(MinimalUserEntity.class) .addAsResource("minimal-config/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleEntitiesConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleEntitiesConfigurationTest.java index 5b6f3953cc4cb..b68fea0f05153 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleEntitiesConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleEntitiesConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MultipleEntitiesConfigurationTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(ExternalRolesUserEntity.class) .addClass(RoleEntity.class) diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionConfigurationTest.java index ed4921e56c1a6..d08e7ad889be5 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MultipleRolesInCollectionConfigurationTest extends JpaSecurityRealm @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(MultipleRolesInCollectionUserEntity.class) .addAsResource("multiple-roles-in-collection/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesTest.java index 1be557d13a91f..c26be7bdfa6b1 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class MultipleRolesTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(MultipleRolesUserEntity.class) .addAsResource("multiple-roles/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdConfigurationTest.java index 635f7b5cc4825..26fd8f1b29c14 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class NaturalIdConfigurationTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(NaturalIdUserEntity.class) .addAsResource("minimal-config/import.sql", "import.sql") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheEntitiesConfigurationTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheEntitiesConfigurationTest.java index e4ac5a1007b94..f171e6cc85ff2 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheEntitiesConfigurationTest.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheEntitiesConfigurationTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.jpa; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusUnitTest; @@ -10,7 +8,7 @@ public class PanacheEntitiesConfigurationTest extends JpaSecurityRealmTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addClass(PanacheUserEntity.class) .addClass(PanacheRoleEntity.class) diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedDifferentBouncycastleProviderTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedDifferentBouncycastleProviderTest.java index b9cec2fe31e2a..8b46de0999650 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedDifferentBouncycastleProviderTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedDifferentBouncycastleProviderTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class DuplicatedDifferentBouncycastleProviderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-duplicated-different-providers.properties", "application.properties")); @Test diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedTheSameBouncycastleProviderTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedTheSameBouncycastleProviderTest.java index 75f7b6dbce23c..dabe2fdc3190a 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedTheSameBouncycastleProviderTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/DuplicatedTheSameBouncycastleProviderTest.java @@ -1,7 +1,5 @@ package io.quarkus.security.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -10,7 +8,7 @@ public class DuplicatedTheSameBouncycastleProviderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-duplicated-the-same-providers.properties", "application.properties")); @Test diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java index 757223d2b5be3..9b3cba18f3c8c 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.function.Executable; @@ -49,7 +47,7 @@ public class CDIAccessDefaultTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithSecuredMethods.class, IdentityMock.class, AuthData.class, diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java index 9971c52925e30..4f34cbf3d212b 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -48,7 +46,7 @@ public class CDIAccessDenyUnannotatedTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithNoSecurityAnnotations.class, BeanWithSecurityAnnotations.class, BeanWithSecurityAnnotationsSubBean.class, diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java index b6fd0fb794fa2..a13317ae10281 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class SecurityAnnotationOnFinalMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithSecuredFinalMethod.class, IdentityMock.class, AuthData.class, SecurityTestUtils.class)); diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java index 20261cf62c265..9cfc7b8baa152 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java @@ -5,9 +5,7 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithSecuredFinalMethod.class, IdentityMock.class, AuthData.class, SecurityTestUtils.class) .addAsResource(new StringAsset( diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java index b93d0b1b160e8..06d4bb3cf3bab 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class AllClearedConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("mp.context.ThreadContext.propagated", ""); @Inject diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java index 25f9615d385ab..299069b620bb0 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class AllUnchangedConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("mp.context.ThreadContext.unchanged", "Remaining") .overrideConfigKey("mp.context.ThreadContext.propagated", ""); diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java index f24efdd7ec747..5ed8978d4caed 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class NoConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject SmallRyeThreadContext ctx; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/FaultToleranceTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/FaultToleranceTest.java index 571cb9df3cd03..de4076edae045 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/FaultToleranceTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/FaultToleranceTest.java @@ -15,8 +15,6 @@ import org.eclipse.microprofile.faulttolerance.exceptions.BulkheadException; import org.eclipse.microprofile.faulttolerance.exceptions.CircuitBreakerOpenException; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class FaultToleranceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FallbackBean.class, BulkheadBean.class, TimeoutBean.class, RetryBean.class, CircuitBreakerBean.class, AsynchronousBean.class)); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingAsyncTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingAsyncTest.java index 21beee60c2d44..f3c7670c89f4a 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingAsyncTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingAsyncTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class BlockingAsyncTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(BlockingHelloService.class)); + .withApplicationRoot((jar) -> jar.addClasses(BlockingHelloService.class)); @Inject BlockingHelloService service; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java index 9904ec64ce31c..ab0145fbe33de 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class BlockingNonBlockingOnClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BlockingNonBlockingOnClassService.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java index 383c523220138..6b7cd8564de68 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class BlockingNonBlockingOnMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BlockingNonBlockingOnMethodService.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingAsyncTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingAsyncTest.java index 000f48dec661d..014ab997aa255 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingAsyncTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingAsyncTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class NonblockingAsyncTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(NonblockingHelloService.class)); + .withApplicationRoot((jar) -> jar.addClasses(NonblockingHelloService.class)); @Inject NonblockingHelloService service; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java index 1abbd135cd600..1abf6f690d336 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java @@ -13,8 +13,6 @@ import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.faulttolerance.Asynchronous; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class FaultToleranceContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MyAppService.class, MyReqService.class)); + .withApplicationRoot((jar) -> jar.addClasses(MyAppService.class, MyReqService.class)); @Inject MyAppService appService; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatAsyncTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatAsyncTest.java index 1d44a741f056f..72eb1ea589e67 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatAsyncTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatAsyncTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class NoncompatAsyncTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(NoncompatHelloService.class)); + .withApplicationRoot((jar) -> jar.addClasses(NoncompatHelloService.class)); @Inject NoncompatHelloService service; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java index b85529847c352..4beaa7ea7efe9 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MutinyFaultToleranceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MutinyHelloService.class)); + .withApplicationRoot((jar) -> jar.addClasses(MutinyHelloService.class)); @Inject MutinyHelloService service; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java index c931842c7c657..c0c90ac9229c7 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CircuitBreakerNameInheritanceTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SubCircuitBreakerService.class, SuperCircuitBreakerService.class)); @Inject diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java index 56a78d2873665..9dbd7a493db49 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class DuplicateCircuitBreakerNameTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CircuitBreakerService1.class, CircuitBreakerService2.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java index 0f3a6bc35582f..d7a7f4ffeb13c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ClassAndMethodBackoffTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ClassAndMethodBackoffService.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java index 1d20c9acadd3c..6003921736505 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RetryOnClassBackoffOnMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RetryOnClassBackoffOnMethodService.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java index 135991aa5b26a..b4c9e742fab3c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RetryOnMethodBackoffOnClassTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RetryOnMethodBackoffOnClassService.class)) .assertException(e -> { assertEquals(DefinitionException.class, e.getClass()); diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java index 4c6e9cdb39f96..dd864e66b9b24 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class TwoBackoffsOnMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TwoBackoffsOnMethodService.class)) .assertException(e -> { assertEquals(DeploymentException.class, e.getClass()); diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java index d08d2edb96b2c..7d691b1fb2f38 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java @@ -11,10 +11,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class DynamicGraphQLClientInjectionTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, Person.class) .addAsResource(new StringAsset("people-client/mp-graphql/url=" + url + "\n" + "people-client/mp-graphql/header/My-Header=My-Value"), diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java index e896d0688a0d2..0c0124cd6f651 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java @@ -11,10 +11,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class DynamicGraphQLClientInjectionWithQuarkusConfigTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, Person.class) .addAsResource(new StringAsset("quarkus.smallrye-graphql-client.people.url=" + url + "\n" + "quarkus.smallrye-graphql-client.people.header.My-Header=My-Value"), diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientMissingUrlTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientMissingUrlTest.java index 84de853cba812..c0eb75ccd635e 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientMissingUrlTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientMissingUrlTest.java @@ -6,9 +6,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DynamicGraphQLClientMissingUrlTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); @Inject diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientProgrammaticUsageTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientProgrammaticUsageTest.java index f3867af2190ea..908efe65ca79b 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientProgrammaticUsageTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientProgrammaticUsageTest.java @@ -8,9 +8,7 @@ import java.time.Duration; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class DynamicGraphQLClientProgrammaticUsageTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, Person.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java index d92c272ff8155..e74330e1ab181 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java @@ -6,10 +6,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class TypesafeGraphQLClientFQNameTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApiWithNoConfigKey.class, Person.class) .addAsResource( new StringAsset( diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java index a132d5b327656..784254cf209eb 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java @@ -6,10 +6,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class TypesafeGraphQLClientInjectionTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApi.class, Person.class) .addAsResource(new StringAsset("typesafeclient/mp-graphql/url=" + url + "\n" + "typesafeclient/mp-graphql/header/My-Header=My-Value"), diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java index 982786578d94c..696cb438f38bb 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java @@ -6,10 +6,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class TypesafeGraphQLClientInjectionWithQuarkusConfigTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApi.class, Person.class) .addAsResource(new StringAsset("quarkus.smallrye-graphql-client.typesafeclient.url=" + url + "\n" + "quarkus.smallrye-graphql-client.typesafeclient.header.My-Header=My-Value"), diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientMissingUrlTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientMissingUrlTest.java index 8e24356637fdc..c241d27f5c2c8 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientMissingUrlTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientMissingUrlTest.java @@ -5,9 +5,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class TypesafeGraphQLClientMissingUrlTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApi.class, Person.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientProgrammaticUsageTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientProgrammaticUsageTest.java index e89d61b23403b..c06279e6eb031 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientProgrammaticUsageTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientProgrammaticUsageTest.java @@ -5,9 +5,7 @@ import java.net.URL; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class TypesafeGraphQLClientProgrammaticUsageTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApi.class, Person.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java index 91056ba3b71b6..f4e51f36eda6f 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java @@ -6,10 +6,8 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class TypesafeGraphQLClientShortcutTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestingGraphQLApi.class, TestingGraphQLClientApiWithNoConfigKey.class, Person.class) .addAsResource( new StringAsset( diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java index 5ff4ffaf6a170..ea4a4b78b6c89 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java @@ -17,10 +17,8 @@ import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class CompletionStageTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BookGraphQLApi.class, Book.class) .addAsResource(new StringAsset(getPropertyAsString()), "application.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); @@ -152,4 +150,4 @@ public Author(String name, String bornName, LocalDate birthDate, String birthPla this.birthPlace = birthPlace; } } -} \ No newline at end of file +} diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java index fed77846f4f16..0cffe3ddc95c1 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java @@ -17,9 +17,7 @@ import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class GraphQLCDIContextPropagationTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestPojo.class, ResourceThatNeedsCdiContextPropagation.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLConfigMappingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLConfigMappingTest.java index fd96774f5b4d9..d1eafa6e97d86 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLConfigMappingTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLConfigMappingTest.java @@ -7,10 +7,8 @@ import org.hamcrest.CoreMatchers; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class GraphQLConfigMappingTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java index 4ddaba5bceeab..55bbd9b4be0bc 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java @@ -16,10 +16,8 @@ import org.eclipse.microprofile.graphql.Name; import org.eclipse.microprofile.graphql.Query; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class GraphQLGroupedTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BookGraphQLApi.class, Book.class) .addAsResource(new StringAsset(getPropertyAsString()), "application.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java index cb78b7ce3c426..984f664356533 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java @@ -4,10 +4,8 @@ import java.util.Map; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class GraphQLNamingTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java index 7465817bed3f5..8a271af3026c9 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java @@ -6,10 +6,8 @@ import org.hamcrest.CoreMatchers; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class GraphQLOverHttpTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(GraphQLOverHttpApi.class, User.class) .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLSchemaUnavailableTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLSchemaUnavailableTest.java index a4083dd72c2f4..22213c2817cb1 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLSchemaUnavailableTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLSchemaUnavailableTest.java @@ -4,10 +4,8 @@ import java.util.Map; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class GraphQLSchemaUnavailableTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java index d380916f6c978..0da708f9f8335 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java @@ -8,10 +8,8 @@ import org.hamcrest.CoreMatchers; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class GraphQLTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java index 038f001cb3f23..98358f39a5f47 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.graphql.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class GraphQLTracingDisabledTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset("quarkus.jaeger.enabled=false"), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java index 7226e834ffa84..06ddc3594e9ed 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java @@ -3,10 +3,8 @@ import java.util.List; import java.util.stream.Collectors; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,7 +19,7 @@ public class GraphQLTracingTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset("quarkus.jaeger.disable-tracer-registration=true"), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java index 8b25292acd725..37fc6783124be 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java @@ -4,10 +4,8 @@ import org.hamcrest.CoreMatchers; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class HotReloadTest extends AbstractGraphQLTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset(getPropertyAsString()), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java index 9cc2cd88553dd..53c68790e57da 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java @@ -6,9 +6,7 @@ import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class InjectRoutingContextTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(InjectRoutingContext.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java index 2f9a10a1b853b..931f3eb99c13d 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java @@ -8,9 +8,7 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.SimpleTimer; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class MetricsDisabledTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java index ded5ad6dd4a54..e6de14b15fa56 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java @@ -11,10 +11,8 @@ import org.eclipse.microprofile.metrics.SimpleTimer; import org.eclipse.microprofile.metrics.Tag; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class MetricsTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class, BusinessException.class) .addAsResource(new StringAsset("quarkus.smallrye-graphql.metrics.enabled=true"), "application.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java index 39b1242991d59..133bd22950568 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java @@ -6,9 +6,7 @@ import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class RequestContextTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(RequestContextApi.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java index 06f39ebc103d3..6811a5fdbe264 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java @@ -14,9 +14,7 @@ import org.eclipse.microprofile.graphql.Name; import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class SecurityTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SecuredApi.class, Foo.class) .addAsResource("application-secured.properties", "application.properties") .addAsResource("users.properties") diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java index 2f3acec11fbdc..4834896c65ed6 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java @@ -19,8 +19,6 @@ import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class SmallRyeGraphQLContextTestCase extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Dummy.class, ContextPropagationResource.class)); @Test diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java index 4ede87250851a..6375602409431 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java @@ -15,10 +15,8 @@ import org.eclipse.microprofile.graphql.Query; import org.eclipse.microprofile.graphql.Source; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class UniTest extends AbstractGraphQLTest { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BookGraphQLApi.class, Book.class) .addAsResource(new StringAsset(getPropertyAsString()), "application.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); @@ -150,4 +148,4 @@ public Author(String name, String bornName, LocalDate birthDate, String birthPla this.birthPlace = birthPlace; } } -} \ No newline at end of file +} diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/CustomConfigTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/CustomConfigTest.java index c841dc1122d1f..6ee8251b25d56 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/CustomConfigTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/CustomConfigTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CustomConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-graphql.ui.root-path=/custom"), "application.properties")); @Test diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/DisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/DisabledTest.java index 099c90086ed72..9bae677c26af4 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/DisabledTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/DisabledTest.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.graphql.deployment.ui; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-graphql.ui.enable=false"), "application.properties")); @Test diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/ErroneousConfigTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/ErroneousConfigTest.java index 78eca1f2eed3a..5bb9aaf3f679b 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/ErroneousConfigTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ui/ErroneousConfigTest.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.graphql.deployment.ui; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-graphql.ui.root-path=/\n"), "application.properties")); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java index 907cb2713e8b4..1a87c4b42980e 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java @@ -10,9 +10,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.Readiness; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class AsyncDispatchedThreadTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(LivenessHealthCheckCapturingThread.class, ReadinessHealthCheckCapturingThread.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java index 5cf80bf9bbe7b..31b15e6fffd8d 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.Readiness; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DispatchedThreadTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(LivenessHealthCheckCapturingThread.class, ReadinessHealthCheckCapturingThread.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java index 37a33ba11ce46..1c4633f495b77 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java @@ -8,9 +8,7 @@ import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.Readiness; import org.eclipse.microprofile.health.Startup; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class ExpectedBeansUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FailingHealthCheck.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); @Inject diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java index 544288c94be5f..2ce753abfa5ed 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class FailingUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(FailingHealthCheck.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); @Inject diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java index 0b514dac45afb..5fbd13544333e 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java @@ -15,8 +15,6 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class HealthCheckContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .overrideConfigKey("quarkus.smallrye-health.context-propagation", "true") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RequestScopedBean.class, ContextualHC.class)); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java index c7befa8178085..eba8b446b35bd 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java @@ -18,8 +18,6 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class HealthCheckDefaultScopeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NoScopeCheck.class, NoScopeStereotypeWithoutScopeCheck.class, MyStereotype.class)); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java index 17444fd7bd9b2..32213d99ece1f 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java @@ -12,8 +12,6 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class HealthCheckProducerDefaultScopeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(HealthCheckProducers.class)); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java index ab9615ee53067..dd69013e68ddd 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java @@ -1,10 +1,8 @@ package io.quarkus.smallrye.health.test; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class HealthOpenAPITest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BasicHealthCheck.class, OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.health.openapi.included=true\n" + "quarkus.smallrye-openapi.store-schema-directory=target"), "application.properties") diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java index 91475a28d6276..e36810590dda3 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java @@ -3,9 +3,7 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class HealthUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BasicHealthCheck.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/StartedHealthCheckTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/StartedHealthCheckTest.java index 0dd0e53420b74..01008c1f9b3f3 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/StartedHealthCheckTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/StartedHealthCheckTest.java @@ -7,8 +7,6 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Startup; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class StartedHealthCheckTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StartupHC.class)); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java index 678a956f96527..a138ceb7caaa3 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java @@ -6,8 +6,6 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class WellnessHealthCheckTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WellnessHC.class)); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java index 4068bb4e3adba..2e4ccba0698af 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CustomConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-health.ui.root-path=/custom"), "application.properties")); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java index 76aad0f943cda..8084e6a57b3f7 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.health.test.ui; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-health.ui.enable=false"), "application.properties")); @Test diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java index 56270d525a7d1..2f5426f780c83 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.health.test.ui; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-health.ui.root-path=/\n"), "application.properties")); @Test diff --git a/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java b/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java index 7e1bb4a788e6b..3f527f62de6a7 100644 --- a/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java +++ b/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jose4j.jwt.JwtClaims; import org.jose4j.jwt.consumer.JwtConsumerBuilder; import org.junit.jupiter.api.Test; @@ -18,7 +16,7 @@ public class JwtBuildUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") .addAsResource("application.properties")); diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java index bd918c3a84702..710ed17056df7 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class DefaultGroupsCustomFactoryUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("privateKey.pem") .addAsResource("TokenUserGroup.json") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java index a9b76c4d224a6..1e4fd1ca314ea 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class DefaultGroupsSignEncryptUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java index c4a809b3c3d2a..769502d976dae 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class DefaultGroupsUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java index 100dbc7429499..89e324cd49549 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java @@ -11,8 +11,6 @@ import javax.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,7 +34,7 @@ public class JwtAuthUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java index 466420afa2459..3028764f010e8 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class JwtCookieDevModeTestCase { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java index ec7b0b9c3e723..bb9fb3d525efc 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class JwtCookieUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java index a260cff4d5498..a7fde74b16f75 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java @@ -9,8 +9,6 @@ import javax.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,7 +40,7 @@ public class PrimitiveInjectionUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java index 4a0638ac3c145..cb41e3f1b7d06 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java @@ -9,8 +9,6 @@ import javax.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -33,7 +31,7 @@ public class PrincipalInjectionUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java index 748fa08416cd7..c172bd369ce27 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java @@ -9,8 +9,6 @@ import javax.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,7 +37,7 @@ public class RequiredClaimsUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java index 7cb168c4cd48e..08ecc9a0e1954 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java @@ -3,8 +3,6 @@ import java.net.HttpURLConnection; import java.util.HashMap; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,7 +27,7 @@ public class RolesAllowedUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java index b1bc6c72857b8..a64485e0e278f 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java @@ -7,8 +7,6 @@ import javax.json.JsonObject; import javax.json.JsonReader; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class ScopingUnitTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("privateKey.pem") diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java index 159acd41839e9..9a3e3de21e8be 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java @@ -1,7 +1,5 @@ package io.quarkus.jwt.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class SmallRyeJwtDisabledTest { }; @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("publicKey.pem") .addAsResource("smallryeJwtDisabled.properties", "application.properties")); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java index 2dca7443f4535..36546ecdd6736 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java @@ -5,8 +5,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class DefaultPackageMetricsTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CountedClassDefaultPackage.class)); @Inject diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java index d61bf14b88d90..ff35b785ec8cb 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java @@ -11,8 +11,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -45,7 +43,7 @@ public Boolean doesMetricExist(@PathParam("scope") String scope, @PathParam("nam @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DevModeMetricRegistryTest.class, MetricsResource.class)); @Test diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java index 5a9a0736694a7..03415f56c1567 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java @@ -17,8 +17,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.Counted; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -56,7 +54,7 @@ public Long getCounterValue(@PathParam("name") String name) { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource( new File("src/test/resources/config/jaxrs-metrics.properties"), "application.properties") diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java index 3500ab66e48f2..fc1d7851f55b8 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java @@ -11,9 +11,7 @@ import org.eclipse.microprofile.metrics.SimpleTimer; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class JaxRsMetricsTestCase { @RegisterExtension static QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-metrics.jaxrs.enabled=true"), "application.properties") .addClasses(MetricsResource.class)); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java index 36ebd4d119578..cfd77b83cdf6f 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java @@ -7,8 +7,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.Counted; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,7 +22,7 @@ public class DefaultMethodTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(A.class, B.class, Y.class, C.class, D.class, ClashA.class, I.class, ClashB.class)); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java index 7da1dac9906ab..eb3fceff5433b 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java @@ -7,8 +7,6 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class StereotypeCountedClassTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CountedClass.class, CountMe.class)); @Inject diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionDisabledTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionDisabledTestCase.java index 684c31ddb24ff..ed4ca24b415ac 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionDisabledTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionDisabledTestCase.java @@ -5,9 +5,7 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.not; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class MetricsFromExtensionDisabledTestCase extends MetricsFromExtensionTe @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MetricResource.class) .addAsResource(new StringAsset("quarkus.smallrye-metrics.extensions.enabled=false"), "application.properties")) diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java index 45e39d4969d6e..de319da52a27c 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java @@ -10,8 +10,6 @@ import org.hamcrest.Matchers; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class MetricsFromExtensionTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MetricResource.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java index 340e41b855c08..2349682de3fac 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java @@ -10,8 +10,6 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.SimpleTimer; import org.eclipse.microprofile.metrics.annotation.RegistryType; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class MetricsFromMetricsFactoryTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(MeasureThis.class)); @Inject diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java index 70be9b1bd0822..51b4fb533ff87 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java @@ -1,7 +1,5 @@ package io.quarkus.smallrye.metrics.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class MetricsHandlerPathTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .overrideConfigKey("quarkus.http.root-path", "/custom") .overrideConfigKey("quarkus.http.non-application-root-path", "/framework"); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java index 56203bcd2a861..c42d1dcd4f21f 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MicrometerMetricsCompatibilityModeTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.smallrye-metrics.micrometer.compatibility=true"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/DisplayOpenAPiEndpointInNotFoundExceptionPageTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/DisplayOpenAPiEndpointInNotFoundExceptionPageTest.java index 067805560288a..1a63e4b94c630 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/DisplayOpenAPiEndpointInNotFoundExceptionPageTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/DisplayOpenAPiEndpointInNotFoundExceptionPageTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DisplayOpenAPiEndpointInNotFoundExceptionPageTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyResource.class) .addAsResource(new StringAsset( "quarkus.smallrye-openapi.path=" + OPEN_API_PATH + "\nquarkus.swagger-ui.path=" + SWAGGER_UI_PATH), diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java index 8b8071d3172dc..07cebcc325d02 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java @@ -3,8 +3,6 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiHotReloadTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyResource.class)); @Test diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoSecurityRequirementTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoSecurityRequirementTestCase.java index 83fdfc4b740d9..20f1506af4100 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoSecurityRequirementTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoSecurityRequirementTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class AutoSecurityRequirementTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ResourceBean.class, OpenApiResourceSecuredAtClassLevel.class, OpenApiResourceSecuredAtMethodLevel.class, OpenApiResourceSecuredAtMethodLevel2.class) .addAsResource( diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagTestCase.java index ada6157131c0d..e9cf43e4e92ab 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class AutoTagTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResourceWithNoTag.class)); @Test diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java index 9df6f3b6bcb48..863760fbab688 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class BasicSecurityWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource( new StringAsset("quarkus.smallrye-openapi.security-scheme=basic\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java index 2ef2e276a701d..2ab37c84c37be 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ConfigMappingTest.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ConfigMappingTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DefaultContentTypeResource.class, Greeting.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.open-api-version=3.0.3\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java index 5d0913a294ecb..31858d0cfbddc 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DefaultContentTypeTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DefaultContentTypeResource.class, Greeting.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=target"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java index 13606bdc01a88..dd28b47f0c71c 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class JWTSecurityWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource( new StringAsset("quarkus.smallrye-openapi.security-scheme=jwt\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java index adf5afa60cad4..e5de3451f5414 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class OIDCSecurityWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource( new StringAsset("quarkus.smallrye-openapi.security-scheme=oidc\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java index 0e9e218c82ed1..6c47adc1b1dc0 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class Oauth2ImplicitSecurityWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource( new StringAsset("quarkus.smallrye-openapi.security-scheme=oauth2Implicit\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java index 364c50e384cee..d3e7b87978a2e 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiDefaultPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=target"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDynamicFilterTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDynamicFilterTestCase.java index 4b98464d2908e..aad8238814afe 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDynamicFilterTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDynamicFilterTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiDynamicFilterTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class, MyDynamicOASFilter.class) .addAsResource( new StringAsset("mp.openapi.filter=io.quarkus.smallrye.openapi.test.jaxrs.MyDynamicOASFilter\n" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java index c5903ab613a4e..b2b896eddd90f 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiHttpRootDefaultPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java index 3ea5304666de2..2763f38183781 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiPathWithSegmentsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java index a8a34f7c2b17f..f88c290fbd8f0 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiPathWithoutSegmentsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java index 45f8bf4c5ac67..7147e3dd8fe06 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiRuntimeFilterTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class, MyOASFilter.class) .addAsResource(new StringAsset("mp.openapi.filter=io.quarkus.smallrye.openapi.test.jaxrs.MyOASFilter\n" + "my.openapi.version=3.1.0"), diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStaticModelsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStaticModelsTestCase.java index 841163e249dc8..cce7e72fa6ead 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStaticModelsTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStaticModelsTestCase.java @@ -3,9 +3,7 @@ import java.io.IOException; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class OpenApiStaticModelsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsManifestResource("test-openapi.yaml", "openapi/model1.yaml") .addAsManifestResource("test-openapi2.yaml", "openapi/model2.yaml") diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java index 532d419da52ec..981eb6f155ad5 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java @@ -5,9 +5,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class OpenApiStoreSchemaTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class, NamingOASFilter.class) .addAsResource(new StringAsset("mp.openapi.filter=io.quarkus.smallrye.openapi.test.jaxrs.NamingOASFilter\n" + "quarkus.smallrye-openapi.store-schema-directory=" + directory), diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java index 62296ddbeeb15..c2d4fcb3f04f2 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsManifestResource("test-openapi.yaml", "openapi.yaml") .addAsResource(new StringAsset("mp.openapi.scan.disable=true" diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java index de9b3db73778d..30aaf20833815 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiWithResteasyPathHttpRootDefaultPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.http.root-path=/http-root-path\n" + "quarkus.resteasy.path=/resteasy-path"), diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java index 43b4ebb6626d4..a8b113c025c7f 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiWithResteasyPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.resteasy.path=/foo/bar"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java index eeb12e9dc260f..c2fe9550ae4e0 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SwaggerAndOpenAPIWithCommonPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiResource.class, ResourceBean.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=swagger"), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java index 5825bfdd7a6af..258a9781194ea 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.vertx; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiDefaultPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class)); @Test @@ -36,4 +34,4 @@ public void testOpenApiPathAccessResource() { .body("info.title", Matchers.equalTo("Generated API")) .body("paths", Matchers.hasKey("/resource")); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java index 5a9b04d055d76..337370cca6f79 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.vertx; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiHttpRootDefaultPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties")); @@ -38,4 +36,4 @@ public void testOpenApiPathAccessResource() { .body("info.title", Matchers.equalTo("Generated API")) .body("paths", Matchers.hasKey("/foo/resource")); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java index b742edd7581c5..6be17b9271e3b 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.vertx; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiPathWithSegmentsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH), "application.properties")); @@ -34,4 +32,4 @@ public void testOpenApiPathAccessResource() { .when().get("/q/" + OPEN_API_PATH) .then().header("Content-Type", "application/json;charset=UTF-8"); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java index ff26a8fd929c5..8f8a2e144c308 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.smallrye.openapi.test.vertx; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiPathWithoutSegmentsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH), "application.properties")); @@ -34,4 +32,4 @@ public void testOpenApiPathAccessResource() { .when().get("/q/" + OPEN_API_PATH) .then().header("Content-Type", "application/json;charset=UTF-8"); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java index 470e21cf13921..0c1dd29d61dca 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java @@ -4,9 +4,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OpenApiStoreSchemaTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=" + directory), "application.properties")); diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java index d39013cf37770..fb82389b87667 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.openapi.test.vertx; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class OpenApiWithConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiRoute.class) .addAsManifestResource("test-openapi.yaml", "openapi.yaml") .addAsResource(new StringAsset("mp.openapi.scan.disable=true\nmp.openapi.servers=https://api.acme.org/"), @@ -35,4 +33,4 @@ public void testOpenAPI() { .body("paths", Matchers.hasKey("/openapi")) .body("paths", Matchers.not(Matchers.hasKey("/resource"))); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java index 20fc632d57b2b..948afa3c94cd8 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class SwaggerAndOpenAPIWithCommonPrefixTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(OpenApiRoute.class) .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=swagger"), "application.properties")); @@ -28,4 +26,4 @@ public void shouldWorkEvenWithCommonPrefix() { RestAssured.when().get("/q/swagger").then().statusCode(200) .body(containsString("/resource"), containsString("QUERY_PARAM_1")); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java index e18e2aade51bb..bc06afbff985a 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java @@ -7,9 +7,7 @@ import java.util.concurrent.TimeUnit; import org.awaitility.Awaitility; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -28,7 +26,7 @@ public class TracingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(TestResource.class) .addClass(Service.class) .addClass(RestService.class) diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/AmqpDevModeTest.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/AmqpDevModeTest.java index 1b606fc00be91..da3be1cec44fc 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/AmqpDevModeTest.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/AmqpDevModeTest.java @@ -5,8 +5,6 @@ import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManagerFactory; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -23,7 +21,7 @@ public class AmqpDevModeTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ConsumingBean.class, ProducingBean.class, TestResource.class, AnonymousAmqpBroker.class, ProtonProtocolManagerFactory.class) .addAsResource("broker.xml") diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/AmqpDevModeNoHttpTest.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/AmqpDevModeNoHttpTest.java index db0f8b1ef0e42..4a5db192ce303 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/AmqpDevModeNoHttpTest.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/AmqpDevModeNoHttpTest.java @@ -10,8 +10,6 @@ import java.util.stream.Collectors; import org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManagerFactory; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -23,7 +21,7 @@ public class AmqpDevModeNoHttpTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Producer.class, Consumer.class, AnonymousAmqpBroker.class, ProtonProtocolManagerFactory.class) .addAsResource("broker.xml") diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java index c9465b45f50b1..e7eaacd4010a5 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ChainTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SomeSource.class, MySink.class, SomeProcessor.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java index e81e59b3ca3a4..a895d1b7172dc 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java @@ -12,8 +12,6 @@ import javax.ws.rs.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Incoming; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class DefaultScopeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NoScope.class, NoScopeButResource.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java index 18998f5ea6c7b..469b16e42df7d 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ReactiveMessagingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class, ChannelConsumer.class, EmitterExample.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java index c8de1738624f4..19ed893c12c31 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Publisher; @@ -24,7 +22,7 @@ public class SmallRyeBlockingSubscriberTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProduceIn.class, IncomingUsingSmallRyeBlocking.class) .addAsResource( new File("src/test/resources/config/worker-config.properties"), @@ -54,4 +52,4 @@ public Publisher produce() { } } -} \ No newline at end of file +} diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java index 20498de6dcebe..399947bf48dc4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class BlockingPublisherTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanReturningPayloads.class, BeanReturningMessages.class, InfiniteSubscriber.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java index 4a35dc83004b4..d2949c0ad6afe 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Publisher; @@ -26,7 +24,7 @@ public class BlockingSubscriberTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProduceIn.class, IncomingCustomUnorderedBlockingBean.class, IncomingCustomTwoBlockingBean.class) .addAsResource( new File("src/test/resources/config/worker-config.properties"), diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java index 35beb3691f16a..97763d064b500 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java @@ -11,8 +11,6 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Subscriber; @@ -24,7 +22,7 @@ public class BlockingValidationErrorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanReturningASubscriberOfMessages.class)) .setExpectedException(DefinitionException.class); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java index efdfcd79103f3..3dad8f8cbc8ec 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java @@ -6,8 +6,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class BlockingWithoutOutgoingOnIncomingErrorTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithBlocking.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java index 5c04c7028123d..9808c63eba0b1 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class SmallRyeBlockingPublisherTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanReturningPayloadsUsingSmallRyeBlocking.class, BeanReturningMessagesUsingSmallRyeBlocking.class, InfiniteSubscriber.class)); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java index 3c8205de90c41..54bddca3ae6ae 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Publisher; @@ -24,7 +22,7 @@ public class SmallRyeBlockingSubscriberTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProduceIn.class, IncomingUsingSmallRyeBlocking.class) .addAsResource( new File("src/test/resources/config/worker-config.properties"), diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java index 8b901ae61d998..30723109a06d9 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DeprecatedInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleBean.class, DeprecatedChannelConsumer.class, DeprecatedEmitterExample.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java index cfdfd83f0504e..090e064145dac 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class EmitterWithBroadcastAndSubscriberTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EmitterWithBroadcastAndSubscriberExample.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java index 1bf08e163836e..4ea634bc0beee 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class EmitterWithBroadcastTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(EmitterWithBroadcastExample.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java index eb719a44f7a83..60dd90f028a53 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class EmitterWithOverflowAndBroadcastTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ChannelEmitterWithOverflowAndBroadcast.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java index b155570f43c21..24156b8895418 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class EmitterWithOverflowTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ChannelEmitterWithOverflow.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java index c613ce19d714a..04a888bbda74c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java @@ -12,8 +12,6 @@ import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class MutinyEmitterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MutinyEmitterExample.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java index 56dd8d146ba28..ae1f718a0c6a4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java @@ -12,8 +12,6 @@ import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class MutinyEmitterWithConstructorInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MutinyEmitterExampleWithConstructorInjection.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java index 6b7e7e76ad4ed..512c6f63bbf42 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java @@ -12,8 +12,6 @@ import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class MutinyEmitterWithParameterInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MutinyEmitterExampleWithParameterInjection.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java index 666daa72b965f..73799043255bf 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java @@ -10,8 +10,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class ConnectorConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DumbConnector.class, BeanUsingDummyConnector.class)) .overrideConfigKey("mp.messaging.incoming.a.values", "bonjour") .overrideConfigKey("mp.messaging.incoming.a.connector", "dummy"); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java index 0253821a7243a..e79fc5e66bd46 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java @@ -11,8 +11,6 @@ import javax.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ConnectorProfileConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(DumbConnector.class, BeanUsingDummyConnector.class) .addAsResource( new File("src/test/resources/config/dummy-connector-with-profile.properties"), diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java index 0d21803894fc7..e27ba242254f3 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java @@ -14,8 +14,6 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class ConverterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Person.class, MyAppUsingConverter.class, MyPersonConverter.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/ConfigurationLiveReloadTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/ConfigurationLiveReloadTest.java index 55c3b28257990..346be78a92bdd 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/ConfigurationLiveReloadTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/ConfigurationLiveReloadTest.java @@ -5,8 +5,6 @@ import java.io.File; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ConfigurationLiveReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyProcessor.class, HttpFrontend.class, DumbConnector.class) .addAsResource( new File("src/test/resources/config/dummy-connector-conf.properties"), diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java index ce6319971880b..69f45a61cdbda 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class MultiTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MultiIntBean.class, MultiStringBean.class, StringProducer.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java index 8d1d3ae5e8fcc..49ad142bce891 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class UniTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(StringProducer.class, UniBean.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java index 65d4612519656..238a124f9d0e0 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java @@ -11,8 +11,6 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Publisher; @@ -24,7 +22,7 @@ public class IncomingsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProducerOnA.class, ProducerOnB.class, MyBeanUsingMultipleIncomings.class)); @Inject diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java index 3453d1a88a7be..cf1a03c0a9ac4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java @@ -19,8 +19,6 @@ import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class ProcessorSignatureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanProducingAProcessorOfMessage.class, BeanProducingAProcessorOfPayload.class, BeanProducingAProcessorBuilderOfMessage.class, diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java index 4ac42134c2d5d..6fa6c8333ba72 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java @@ -19,8 +19,6 @@ import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class PublisherSignatureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanProducingAPublisherOfMessage.class, BeanProducingAPublisherOfPayload.class, BeanProducingAPublisherBuilderOfMessage.class, diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java index 2d6a85615f89c..568066240bc1c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java @@ -15,8 +15,6 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.reactivestreams.Subscriber; @@ -31,7 +29,7 @@ public class SubscriberSignatureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanUsingSubscriberOfPayload.class, BeanUsingSubscriberOfMessage.class, BeanUsingConsumerMethod.class, diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java index 6fe07bf3b61d9..7b42f4eb6fa99 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java @@ -17,8 +17,6 @@ import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class TransformerSignatureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( BeanWithPublisherOfMessages.class, BeanWithPublisherBuilderOfMessages.class, diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java index ee214ad1a5595..38aaca792001c 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.CoreMatchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class RepositoryReloadTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application.properties") .addAsResource("import_books.sql", "import.sql") .addClasses(Book.class, BookRepository.class, BookResource.class)); diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java index 13b96b3c94edd..6895f61bd66eb 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java @@ -8,8 +8,6 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ class DefaultCrudResourceTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AbstractEntity.class, Record.class, DefaultRecordsRepository.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java index 782e2e379eecd..2545315da06cd 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java @@ -8,8 +8,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ModifiedCrudResourceTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AbstractEntity.class, Record.class, ModifiedRecordsRepository.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java index 3eead5a4feed6..2abb353b9964b 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java @@ -18,8 +18,6 @@ import javax.ws.rs.core.Link; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ class DefaultPagedResourceTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AbstractEntity.class, Record.class, DefaultRecordsRepository.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java index 9a09f2445a430..44bc84d8f9ac6 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java @@ -8,8 +8,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class ModifiedPagedResourceTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AbstractEntity.class, Record.class, ModifiedRecordsRepository.class) .addAsResource("application.properties") .addAsResource("import.sql")); diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java index 7cc809aa9008c..bcb35ee7e1c76 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java @@ -2,8 +2,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class BeanNameTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Bean.class)); @Inject diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java index caaa176bb41cb..fd2756615d1ba 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java @@ -3,8 +3,6 @@ import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class BeanWithoutConfigurationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Service.class, SomeConfiguration.class, Consumer.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpelTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpelTest.java index ddc555105ac83..c8f38d4fb5411 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpelTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpelTest.java @@ -6,8 +6,6 @@ import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Value; @@ -19,7 +17,7 @@ public class SpelTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SomeService.class)) + .withApplicationRoot((jar) -> jar.addClasses(SomeService.class)) .assertException(e -> { assertEquals(IllegalArgumentException.class, e.getClass()); assertTrue(e.getMessage().contains("#{'${values.list}'.split(',')}")); diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java index d776bcd8b4f97..b6c80add50e21 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java @@ -5,8 +5,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.scheduling.annotation.Scheduled; @@ -18,7 +16,7 @@ public class InvalidCronExpressionTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(InvalidBean.class)); @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java index a601e5fb04eb5..83b246833be32 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java @@ -7,8 +7,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.scheduling.annotation.Scheduled; @@ -19,7 +17,7 @@ public class RepeatedScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ScheduledBean.class)); @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/ScheduledMethodNoBeanTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/ScheduledMethodNoBeanTest.java index e0dfc4210eef9..1218a0e0a7847 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/ScheduledMethodNoBeanTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/ScheduledMethodNoBeanTest.java @@ -5,8 +5,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.scheduling.annotation.Scheduled; @@ -17,7 +15,7 @@ public class ScheduledMethodNoBeanTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NoBean.class)); @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java index 98a9499f09a6f..1bc0e21e6fcf7 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java @@ -7,9 +7,7 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.scheduling.annotation.Scheduled; @@ -20,7 +18,7 @@ public class SpringDelayedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Jobs.class) .addAsResource(new StringAsset( "springScheduledSimpleJobs.fixedRate=1000\nspringScheduledSimpleJobs.initialDelay=1000"), diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodTest.java index 6df8ea46cc10b..e3fb16bb59c9e 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodTest.java @@ -5,9 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SpringScheduledMethodTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SpringScheduledMethodsBean.class) .addAsResource( new StringAsset( diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java index 4df5375f51489..4cc5593b00bd5 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java @@ -2,8 +2,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class UnsupportedFixedDelayParamTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalArgumentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnsupportedFixedDelayParamTest.InvalidBean.class)); @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java index efd2c9afb471d..ea02f1498cc79 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java @@ -2,8 +2,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class UnsupportedFixedDelayStringParamTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalArgumentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnsupportedFixedDelayStringParamTest.InvalidBean.class)); @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java index 502078b536761..ba8ce7cbb7e23 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java @@ -2,8 +2,6 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class UnsupportedInitialDelayForCronTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalArgumentException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UnsupportedInitialDelayForCronTest.InvalidBean.class)); @Test diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/AnnotationChangeReloadTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/AnnotationChangeReloadTest.java index eb5b0a2f24209..d6e60b69db5fd 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/AnnotationChangeReloadTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/AnnotationChangeReloadTest.java @@ -1,7 +1,5 @@ package io.quarkus.spring.security.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class AnnotationChangeReloadTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Roles.class, Person.class, SpringComponent.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java index c4196dd80cf6d..eace7340fbbd9 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -32,7 +30,7 @@ public class BeanMethodCheckTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( Person.class, PersonChecker.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java index b334421232fcc..02f30bc97a1ec 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class MetaAnnotationsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( IsUser.class, IsUserOrAdmin.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java index 911440b8f6bda..a455095564a4c 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java @@ -3,8 +3,6 @@ import javax.annotation.security.PermitAll; import javax.enterprise.context.ApplicationScoped; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class SecurityAnnotationMixingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SomeBean.class)) .setExpectedException(IllegalArgumentException.class); diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java index cf28449277163..49137a03df6aa 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class SpringPreAuthorizeClassAnnotatedTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Roles.class, Person.class, ComponentWithClassAnnotation.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java index e618b81d3ea5a..d6cc9bb869cba 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class SpringPreAuthorizeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Roles.class, Person.class, SpringComponent.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java index 2f8e9d2bcd3a8..c27f58dc84335 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class SpringPreAuthorizeWithExpressionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses( BeanWithAndOrExpressions.class, IdentityMock.class, diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java index 518139a556f05..ff3d0b6ade1f4 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java @@ -7,8 +7,6 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,7 +34,7 @@ public class SpringSecuredAnnotatedTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanWithSpringSecurityMethodAnnotations.class, BeanWithSpringSecurityAnnotations.class, SpringSecuredSubClass.class, diff --git a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ControllerReloadTest.java b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ControllerReloadTest.java index 265b8a77e6a18..082788dfd682e 100644 --- a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ControllerReloadTest.java +++ b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ControllerReloadTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class ControllerReloadTest { @RegisterExtension static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleSpringController.class)); @Test diff --git a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java index 4d2f69ec83189..a4dbaae988b09 100644 --- a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java +++ b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.logging.LogRecord; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +19,7 @@ public class MissingRestControllerTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NonAnnotatedController.class, ProperController.class)) .setApplicationName("missing-rest-controller") .setApplicationVersion("0.1-SNAPSHOT") diff --git a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java index 6b0fae6cf2985..75d20a7917603 100644 --- a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java +++ b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.http.HttpStatus; @@ -21,7 +19,7 @@ public class ResponseStatusAndExceptionHandlerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExceptionController.class, RestExceptionHandler.class)); @Test diff --git a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/SimpleSpringControllerTest.java b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/SimpleSpringControllerTest.java index f72cf6642f2a1..92c45b2453d3c 100644 --- a/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/SimpleSpringControllerTest.java +++ b/extensions/spring-web/resteasy-classic/tests/src/test/java/io/quarkus/spring/web/test/SimpleSpringControllerTest.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class SimpleSpringControllerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SimpleSpringController.class)); @Test diff --git a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/BasicMappingTest.java b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/BasicMappingTest.java index 6bacc2170e5f5..33d78e98fcd9b 100644 --- a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/BasicMappingTest.java +++ b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/BasicMappingTest.java @@ -4,8 +4,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class BasicMappingTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SomeClass.class, Greeting.class, TestController.class, ResponseEntityController.class, ResponseStatusController.class, GreetingControllerWithNoRequestMapping.class)); diff --git a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java index 20c3c8a9cb104..02bc4c08ec683 100644 --- a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java +++ b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/ResponseStatusAndExceptionHandlerTest.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.when; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.http.HttpStatus; @@ -20,7 +18,7 @@ public class ResponseStatusAndExceptionHandlerTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ExceptionController.class, RestExceptionHandler.class)); @Test diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomConfigTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomConfigTest.java index 7f29285cbddf0..969b3ec2ca4f5 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomConfigTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomConfigTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CustomConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.swagger-ui.path=/custom"), "application.properties")); @Test diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java index b1b228bc7288a..873d0a672e6d9 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CustomHttpRootTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties")); @Test diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java index dea20f36c7f1d..c5322aba54d1b 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java @@ -1,8 +1,6 @@ package io.quarkus.swaggerui.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class DisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.swagger-ui.enable=false"), "application.properties")); @Test diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java index a0ce42d541ba4..17caa5d17d95f 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java @@ -1,8 +1,6 @@ package io.quarkus.swaggerui.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.swagger-ui.path=/\n"), "application.properties")); @Test diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java index d658819488b7c..f4f3973434088 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java @@ -1,8 +1,6 @@ package io.quarkus.swaggerui.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousConfigTest2 { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.swagger-ui.path=/api\n" + "quarkus.smallrye-openapi.path=/api\n"), "application.properties")); diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java index a3184dca45b20..51e27b6e256dd 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class NoConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void shouldUseDefaultConfig() { diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java index 9e17818fe728b..0b450d11d3f59 100644 --- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java +++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java @@ -6,9 +6,7 @@ import java.io.StringWriter; import java.util.Properties; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class SwaggerOptionsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")); @Test diff --git a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java index 6a0a029978e20..5b59c11260217 100644 --- a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java +++ b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java @@ -5,8 +5,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class TikaProcessorDevModeTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("tika-config.xml") .addAsResource("application-dev-mode.properties", "application.properties")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParamsTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParamsTestCase.java index 57161d47ca19b..09c59cfe01278 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParamsTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParamsTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.undertow.test; import org.hamcrest.CoreMatchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class AnnotatedServletInitParamsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AnnotatedServletInitParam.class, AnnotatedFilterInitParam.class)); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletTestCase.java index bfd450a37f0c1..f0296eb0ac19b 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class AnnotatedServletTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(AnnotatedServlet.class)); /** diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationServletTestCase.java index 87829bdd1ed57..f54c543726f69 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationServletTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationServletTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class AnnotationServletTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestServlet.class, TestServletSubclass.class, TestGreeter.class)); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationWithWebXmlTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationWithWebXmlTestCase.java index d972c572e3f9b..aa6d657e931fb 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationWithWebXmlTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotationWithWebXmlTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -47,7 +45,7 @@ public class AnnotationWithWebXmlTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlServlet.class, TestServlet.class, WebXmlFilter.class, AnnotatedFilter.class, WebXmlListener.class, AnnotatedListener.class, TestGreeter.class) diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java index 4db6c2fb7d792..054f7af68b6d4 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ContextPathTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestServlet.class, TestGreeter.class) .addAsResource(new StringAsset("index"), "META-INF/resources/index.html") .addAsResource(new StringAsset("quarkus.servlet.context-path=" + CONTEXT_PATH), "application.properties")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServletTestCase.java index 4474d8712a1a5..dd20eef510421 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServletTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServletTestCase.java @@ -3,8 +3,6 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.startsWith; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErrorServletTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ErrorServlet.class)); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java index 27748f1e78ca0..5a870cabaa39c 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class LazyAuthRolesAllowedServletTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedAnnotationServlet.class, RolesAllowedBeanServlet.class, UserServlet.class, TestIdentityProvider.class, TestIdentityController.class) diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java index 00ed5a091f162..112c7edee7fa3 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java @@ -5,9 +5,7 @@ import java.util.Map; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class MaxParametersTestCase { @RegisterExtension static QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TestServlet.class, TestGreeter.class) .addAsResource(new StringAsset("quarkus.servlet.max-parameters=10"), "application.properties")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java index 89b04b381aba6..1bdb49eb58398 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java @@ -16,8 +16,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -31,7 +29,7 @@ public class MultipartConfigTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MultipartServlet.class)) .addBuildChainCustomizer(b -> { b.addBuildStep(new BuildStep() { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedServletTestCase.java index 4df15b85dbdde..7b70111d12686 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedServletTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedServletTestCase.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class RolesAllowedServletTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RolesAllowedAnnotationServlet.class, RolesAllowedBeanServlet.class, UserServlet.class, TestIdentityProvider.class, TestIdentityController.class)); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java index a5afd782c96e9..3ead44e33b8df 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java @@ -4,8 +4,6 @@ import javax.servlet.ServletContainerInitializer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ServletContainerInitializerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsServiceProvider(ServletContainerInitializer.class, TestSCI.class) .addClasses(SCIInterface.class, SCIImplementation.class, TestSCI.class, SCIAnnotation.class, AnnotatedSCIClass.class)); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java index 8979ed4feb8ea..9be39e69b46e8 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java @@ -3,8 +3,6 @@ import javax.inject.Inject; import javax.servlet.ServletContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ServletContextInjectionTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Inject ServletContext servletContext; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java index e9d6afb617192..f0d792fced3df 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java @@ -4,8 +4,6 @@ import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ServletDestroyTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PreDestroyServlet.class)) .setAllowTestClassOutsideDeployment(true) .setAfterUndeployListener(() -> { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletEmptyWebXmlTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletEmptyWebXmlTestCase.java index e5946088ff973..b92d01a5b43df 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletEmptyWebXmlTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletEmptyWebXmlTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.undertow.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class ServletEmptyWebXmlTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlServlet.class) .addAsManifestResource(new StringAsset(WEB_XML), "web.xml")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletSecurityTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletSecurityTestCase.java index 37498eed35733..eb468fbbac314 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletSecurityTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletSecurityTestCase.java @@ -1,7 +1,5 @@ package io.quarkus.undertow.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class ServletSecurityTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SecuredAnnotationServlet.class, TestIdentityController.class, TestIdentityProvider.class)); @BeforeAll diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlMergingTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlMergingTestCase.java index 212f3e10804cd..e28f0c78e590d 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlMergingTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlMergingTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -58,7 +56,7 @@ public class ServletWebFragmentXmlMergingTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlServlet.class, WebXmlFilter.class) .addAsManifestResource(new StringAsset(WEB_FRAGMENT_XML), "web-fragment.xml") .addAsManifestResource(new StringAsset(WEB_XML), "web.xml")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlTestCase.java index 61621b36b4365..67ac10db22560 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebFragmentXmlTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -38,7 +36,7 @@ public class ServletWebFragmentXmlTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlServlet.class) .addAsManifestResource(new StringAsset(WEB_FRAGMENT_XML), "web-fragment.xml")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlInitParamsTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlInitParamsTestCase.java index 3eb8c959716eb..5ecbcc4f64736 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlInitParamsTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlInitParamsTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.CoreMatchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -70,7 +68,7 @@ public class ServletWebXmlInitParamsTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlInitParamsServlet.class, WebXmlInitParamsFilter.class) .addAsManifestResource(new StringAsset(WEB_XML), "web.xml")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlSecurityTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlSecurityTestCase.java index 3eb2baf4b9668..4042f4b714e65 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlSecurityTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlSecurityTestCase.java @@ -1,8 +1,6 @@ package io.quarkus.undertow.test; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -43,7 +41,7 @@ public class ServletWebXmlSecurityTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(SecuredServlet.class, TestIdentityProvider.class, TestIdentityController.class) .addAsManifestResource(new StringAsset(WEB_XML), "web.xml")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlTestCase.java index a960bf964f346..30b0e7c7122d6 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletWebXmlTestCase.java @@ -2,10 +2,8 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class ServletWebXmlTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(WebXmlServlet.class) .addAsManifestResource(new StringAsset(WEB_XML), "web.xml") .addAsManifestResource(EmptyAsset.INSTANCE, "resources/test.wasm")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java index 36c12f1efdbae..025650926f8d5 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java @@ -10,9 +10,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class UndertowHandlersConfTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(RedirectedServlet.class) .addAsManifestResource(new StringAsset("path-prefix('/foo') -> rewrite('/bar')"), "undertow-handlers.conf")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java index 6e837e3b0144f..5ce5aa93047f5 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class WebFilterWithNoUrlPatternTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(NoUrlPatternWebFilter.class, NamedServlet.class)); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java index f7454e5516b4e..b4572cdf458fd 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java @@ -5,8 +5,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ServletBuiltinBeanTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestServlet.class, + .withApplicationRoot((jar) -> jar.addClasses(TestServlet.class, ServletBuiltinBeanInjectingBean.class, Counter.class)); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java index 56fa33a9f74cc..22dada98aa513 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java @@ -9,8 +9,6 @@ import java.util.function.Consumer; import java.util.function.Function; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; @@ -37,7 +35,7 @@ public class Http2ServerPushTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ServerPushServlet.class, MessageServlet.class) .addAsResource(new File("src/test/resources/ssl-jks.conf"), "application.properties") .addAsResource(new File("src/test/resources/server-keystore.jks"), "server-keystore.jks")); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionContextTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionContextTestCase.java index d3586e99fae4d..949133763a83a 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionContextTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionContextTestCase.java @@ -5,8 +5,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SessionContextTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestServlet.class, Foo.class)); + .withApplicationRoot((jar) -> jar.addClasses(TestServlet.class, Foo.class)); @Test public void testServlet() { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/ReadTimeoutTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/ReadTimeoutTestCase.java index 1f40dc2d8910c..3133e734c32bf 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/ReadTimeoutTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/ReadTimeoutTestCase.java @@ -13,8 +13,6 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,7 +25,7 @@ public class ReadTimeoutTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() .overrideConfigKey("quarkus.http.read-timeout", "0.5S") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(TimeoutTestServlet.class)); private String host; diff --git a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ErroneousConfigTest.java b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ErroneousConfigTest.java index 23fa0e18ddbc7..0d694e002769d 100644 --- a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ErroneousConfigTest.java +++ b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ErroneousConfigTest.java @@ -1,8 +1,6 @@ package io.quarkus.vertx.graphql.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class ErroneousConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationException.class) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.vertx-graphql.ui.path=/\n"), "application.properties")); @Test diff --git a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromCustomPathTest.java b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromCustomPathTest.java index feddb7f11b575..e0ec22b431c33 100644 --- a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromCustomPathTest.java +++ b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromCustomPathTest.java @@ -1,8 +1,6 @@ package io.quarkus.vertx.graphql.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class ServingUIFromCustomPathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.vertx-graphql.ui.path=/custom\n"), "application.properties")); @Test diff --git a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromDefaultPathTest.java b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromDefaultPathTest.java index ea97b7ab1c862..d7d8f2b2459b4 100644 --- a/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromDefaultPathTest.java +++ b/extensions/vertx-graphql/deployment/src/test/java/io/quarkus/vertx/graphql/deployment/ServingUIFromDefaultPathTest.java @@ -1,7 +1,5 @@ package io.quarkus.vertx.graphql.deployment; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class ServingUIFromDefaultPathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void shouldServeVertxGraphqlUiFromDefaultPath() { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java index c41f8441dc8c2..197dce0691096 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java @@ -4,8 +4,6 @@ import java.net.URI; import java.nio.charset.StandardCharsets; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class BadRequestTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @TestHTTPResource URI uri; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java index 29ab204a67472..801627806cfda 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java @@ -7,9 +7,7 @@ import javax.enterprise.event.Observes; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class CompressionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(BeanRegisteringRouteUsingObserves.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java index 8a6582fc7095c..c9f997b6694eb 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java @@ -3,9 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ConfigureForwardedHeadersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ForwardedHandlerInitializer.class) .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" + "quarkus.http.proxy.enable-forwarded-host=true\n" + diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java index 7d9f0806a5c20..5caefddacfa33 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java @@ -11,9 +11,7 @@ import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class ConnectionLimitsTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(BeanRegisteringRouteUsingObserves.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java index 312f664daebad..8fab0733e8aee 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java @@ -10,9 +10,7 @@ import javax.enterprise.event.Observes; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class DecompressionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(CompressionTest.BeanRegisteringRouteUsingObserves.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java index e798a81646b0a..38d86121b32a8 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java @@ -11,8 +11,6 @@ import javax.enterprise.event.Observes; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -26,7 +24,7 @@ public class DisableHttpPortTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/disable-http.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/server-key.pem"), "server-key.pem") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java index 7d55203cbdc0a..41b7eaa6e9f26 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java @@ -3,9 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ForwardedHeaderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ForwardedHandlerInitializer.class) .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" + "quarkus.http.proxy.allow-forwarded=true"), diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java index 3cc78596070cb..8758914bd6125 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java @@ -3,9 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class ForwardedPrefixHeaderTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ForwardedHandlerInitializer.class) .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" + "quarkus.http.proxy.enable-forwarded-prefix=true\n"), diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java index 0c1837c745803..bf70b20f36c1a 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java @@ -6,9 +6,7 @@ import javax.inject.Singleton; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class NonApplicationAndRootPathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(MyObserver.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java index a880025236e0d..3fb3cb8cc186c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java @@ -10,9 +10,7 @@ import javax.inject.Singleton; import org.awaitility.Awaitility; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -39,7 +37,7 @@ public class NonApplicationEscapeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(MyObserver.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java index 77b3ba2192792..9470296d1eba0 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java @@ -6,9 +6,7 @@ import javax.inject.Singleton; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class NonApplicationRootPathSiblingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(MyObserver.class)) .addBuildChainCustomizer(buildCustomizer()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java index 48dcb1ec16185..916c98b5f1932 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java @@ -9,9 +9,7 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class RandomPortTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.http.test-port=0"), "application.properties")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java index 3529edf0baec2..cab8c3c78f11b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java @@ -6,9 +6,7 @@ import javax.enterprise.event.Observes; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class RootPathTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset(APP_PROPS), "application.properties") .addClasses(BeanRegisteringRouteUsingObserves.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java index 623efb2fed0f5..7f04ae3e0cd1c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java @@ -9,8 +9,6 @@ import javax.enterprise.event.Observes; import org.hamcrest.Matcher; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class UnhandledExceptionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRouteThatThrowsException.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java index 389ce9e89c7e6..f61c486cd98bf 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java @@ -7,8 +7,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class UserRouteRegistrationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRouteUsingObserves.class, BeanRegisteringRouteUsingObservesWithMutinyRouter.class, BeanRegisteringRouteUsingInject.class, diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSDisabledHandlerTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSDisabledHandlerTestCase.java index 13fda04b5dd4d..0701727581063 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSDisabledHandlerTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSDisabledHandlerTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.core.IsNull.nullValue; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CORSDisabledHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRoute.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSFullConfigHandlerTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSFullConfigHandlerTestCase.java index 52ef90c93094d..026cdf6d0bb2c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSFullConfigHandlerTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSFullConfigHandlerTestCase.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.given; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class CORSFullConfigHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRoute.class) .addAsResource("conf/cors-config-full.properties", "application.properties")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestCase.java index 04470865616cf..d099842238f66 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestCase.java @@ -3,8 +3,6 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.core.Is.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class CORSHandlerTestCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRoute.class) .addAsResource("conf/cors-config.properties", "application.properties")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java index 47fc49f3f9f31..a89ee9697275b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java @@ -2,8 +2,6 @@ import static io.restassured.RestAssured.given; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ class CORSHandlerTestWildcardOriginCase { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanRegisteringRoute.class) .addAsResource("conf/cors-config-wildcard-origins.properties", "application.properties")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java index aaa5fc6129c03..7583b859445c5 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java @@ -1,7 +1,5 @@ package io.quarkus.vertx.http.devconsole; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class DevConsoleConfigEditorBodyHandlerTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(BodyHandlerBean.class)); + .withApplicationRoot((jar) -> jar.addClass(BodyHandlerBean.class)); @Test public void testChangeHttpRoute() { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java index 43a487f063f72..bfa4de214ebcf 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java @@ -1,7 +1,5 @@ package io.quarkus.vertx.http.devconsole; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -12,7 +10,7 @@ public class DevConsoleConfigEditorTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testChangeHttpRoute() { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/FixConfigOnErrorTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/FixConfigOnErrorTest.java index d4dd93b604011..10638ed8401d4 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/FixConfigOnErrorTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/FixConfigOnErrorTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusDevModeTest; @@ -14,7 +12,7 @@ public class FixConfigOnErrorTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() .setAllowFailedStart(true) - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(ConfigBean.class)); + .withApplicationRoot((jar) -> jar.addClass(ConfigBean.class)); public void testFailedStartup() { RestAssured.with() diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java index f9d1410b820e1..57e60c4c87194 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java @@ -8,8 +8,6 @@ import javax.inject.Inject; import javax.inject.Named; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class ArcEndpointTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileProblemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileProblemTest.java index 60e53bd5f7ab2..017094411af6a 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileProblemTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileProblemTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class CompileProblemTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CompileErrorEndpoint.class, CompileCorrectlyEndpoint.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java index 7a768ea96149b..22f2533ac8da0 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java @@ -1,8 +1,6 @@ package io.quarkus.vertx.http.devmode; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class LiveReloadArtifactTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.class-loading.reloadable-artifacts=io.vertx:vertx-web-client\n"), "application.properties") .addClasses(LiveReloadEndpoint.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java index f970ce0d2766f..aafdddc46d9f6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java @@ -1,8 +1,6 @@ package io.quarkus.vertx.http.devmode; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class ParentFirstArtifactTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("quarkus.class-loading.parent-first-artifacts=io.vertx:vertx-web-client\n"), "application.properties") .addClasses(ParentFirstEndpoint.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java index 7e08dae1d7f5a..1326a7744e4e2 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class UserFilterTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class, UserFilterTest.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithFilterTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithFilterTest.java index f0e7859fbadcf..e5bfb068a807d 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithFilterTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithFilterTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.core.Is.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class HotReloadWithFilterTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(DevBean.class) .addClass(DevFilter.class)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithRouteTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithRouteTest.java index cc7411e6695e5..d3e760de8ed01 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithRouteTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/HotReloadWithRouteTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.core.Is.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class HotReloadWithRouteTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(DevBean.class)); + .withApplicationRoot((jar) -> jar.addClass(DevBean.class)); private static final String USER_FILE = "DevBean.java"; @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxInjectionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxInjectionTest.java index 194dbb538884c..f91b3ce0410ff 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxInjectionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxInjectionTest.java @@ -2,8 +2,6 @@ import static org.hamcrest.CoreMatchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class VertxInjectionTest { @RegisterExtension final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(VertxEventBusConsumer.class, VertxEventBusProducer.class)); @Test diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java index e76c08779b3c1..07ef39c6279fb 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; @@ -40,7 +38,7 @@ public class Http2Test { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/ssl-jks.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/server-keystore.jks"), "server-keystore.jks")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java index 0178f788ccd83..9eab123124de3 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java @@ -5,8 +5,6 @@ import javax.enterprise.event.Observes; import javax.inject.Singleton; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class RouterEventTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(RouteProducer.class)); + .withApplicationRoot((jar) -> jar.addClasses(RouteProducer.class)); @Test public void testRoute() { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java index 8d528f304b58e..264f809c6a846 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.equalTo; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,7 @@ public class DisabledPermissionTestCase { "quarkus.http.auth.permission.test5.policy=authenticated\n"; @RegisterExtension - static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + static QuarkusUnitTest test = new QuarkusUnitTest().withApplicationRoot((jar) -> jar .addClasses( TestIdentityController.class, TestIdentityProvider.class, diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java index f722f16cc575b..fd694937243f2 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class MtlsRequestBasicAuthTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, TestIdentityController.class) .addAsResource("conf/mtls/mtls-basic-jks.conf", "application.properties") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java index 50da1c7295a51..57f229e1abaa1 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class MtlsRequestTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/mtls/mtls-no-auth-jks.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/mtls/server-keystore.jks"), "server-keystore.jks") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java index 6a9a2b3b3b5be..0313c17600769 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class MtlsRequiredTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/mtls/mtls-jks.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/mtls/server-keystore.jks"), "server-keystore.jks") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java index bcd8f2527995d..c7e96846065eb 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java @@ -9,8 +9,6 @@ import javax.enterprise.event.Observes; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,7 +26,7 @@ public class SslServerWithJksTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/ssl-jks.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/server-keystore.jks"), "server-keystore.jks")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java index 5cf9f63c0983c..e876ceb90ff38 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java @@ -9,8 +9,6 @@ import javax.enterprise.event.Observes; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,7 +26,7 @@ public class SslServerWithP12Test { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/ssl-pkcs12.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/server-keystore.p12"), "server-keystore.pkcs12")); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java index 53af09cbf4d18..85a09758d2c1c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java @@ -9,8 +9,6 @@ import javax.enterprise.event.Observes; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -32,7 +30,7 @@ public class SslServerWithPemTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class) .addAsResource(new File("src/test/resources/conf/ssl-pem.conf"), "application.properties") .addAsResource(new File("src/test/resources/conf/server-key.pem"), "server-key.pem") diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java index fb80a50822d90..6af7ed791bc9b 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java @@ -4,8 +4,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class VertxInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBeanUsingVertx.class)); @Test diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java index 8bf298964002c..54e945fc186f6 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java @@ -11,8 +11,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,7 +29,7 @@ public class MessageConsumerContextTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MessageConsumers.class)); + .withApplicationRoot((jar) -> jar.addClasses(MessageConsumers.class)); @Inject MessageConsumers messageConsumers; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java index 915097d4adb13..938df4ab9ee51 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java @@ -12,8 +12,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class MessageConsumerFailureTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Inject SimpleBean simpleBean; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java index 7106ff2f66c60..5bcc0e2fbf3ac 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java @@ -16,8 +16,6 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,7 +31,7 @@ public class MessageConsumerMethodTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class, Transformer.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class, Transformer.class)); @Inject SimpleBean simpleBean; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java index c09f420eb1a2b..85a6da915da98 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java @@ -15,8 +15,6 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class RequestContextTerminationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class)); + .withApplicationRoot((jar) -> jar.addClasses(SimpleBean.class)); @Inject EventBus eventBus; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java index 33976bd7f3118..5f97590be5f25 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java @@ -5,8 +5,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class VerticleWithClassNameDeploymentTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanDeployingAVerticleFromClass.class, MyVerticle.class)); @Test diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java index 37b0aa7481b0c..374b933901c67 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java @@ -5,8 +5,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class VerticleWithInstanceDeploymentTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanDeployingAVerticleFromInstance.class, MyVerticle.class)); @Test diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java index c7bb3baae2f04..29638bf251a58 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java @@ -7,8 +7,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class VertxCommonProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new File("src/test/resources/lorem.txt"), "files/lorem.txt") .addClasses(BeanUsingBareVertx.class)); diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java index 4e4fea3b93b36..3961b2dcd7aa4 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java @@ -4,8 +4,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class VertxInjectionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyBean.class)); @Test diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java index 729428eb0487f..9c77a212b4a55 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java @@ -3,8 +3,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class VertxLoggingTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(BeanThatLog.class)); @Inject diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java index b870e649d42e7..4ae371e668a60 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java @@ -8,8 +8,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class VertxProducerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new File("src/test/resources/lorem.txt"), "files/lorem.txt") .addClasses(BeanUsingBareVertx.class) .addClasses(BeanUsingMutinyVertx.class)); diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java index 1557cc6270f16..4a1b487443e96 100644 --- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java +++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java @@ -3,9 +3,7 @@ import static org.hamcrest.core.Is.is; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class WebJarLocatorDevModeTest { @RegisterExtension static QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(PostResource.class) .addAsResource(new StringAsset("Hello!"), META_INF_RESOURCES + "/index.html") .addAsResource(new StringAsset("Test"), META_INF_RESOURCES + "/some/path/test.txt")); diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java index 4bc2403e84532..35acba03ae861 100644 --- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java +++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java @@ -4,9 +4,7 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class WebJarLocatorTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource(new StringAsset("Hello!"), META_INF_RESOURCES + "/index.html") .addAsResource(new StringAsset("Test"), META_INF_RESOURCES + "/some/path/test.txt")) .setForcedDependencies(Arrays.asList(new AppArtifact("org.webjars", "jquery", "3.5.1"), diff --git a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java index 31f75197dc047..03294b5921651 100644 --- a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java +++ b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java @@ -4,8 +4,6 @@ import java.util.Arrays; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class MultipleContainerImageExtensionTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("multiple-container-image") .setApplicationVersion("0.1-SNAPSHOT") .setExpectedException(IllegalStateException.class) diff --git a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java index f1764c2066362..4d06ed73dbae3 100644 --- a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java +++ b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java @@ -4,8 +4,6 @@ import java.util.Collections; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class SingleContainerImageExtensionTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("single-container-image") .setApplicationVersion("0.1-SNAPSHOT") .setForcedDependencies( diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java index 4ee30ed9a320b..0af2b40ae71e9 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java @@ -5,8 +5,6 @@ import javax.inject.Named; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class DevConsoleArcSmokeTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(Foo.class)); @Test diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java index fba09a816b8a2..1ecfb64229cb0 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java @@ -3,8 +3,6 @@ import javax.inject.Singleton; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DevConsoleCacheSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(MyBean.class)); + .withApplicationRoot((jar) -> jar.addClass(MyBean.class)); @Test public void testCaches() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleConfigSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleConfigSmokeTest.java index a76ba7a3f4abf..8fb041bbd77a0 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleConfigSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleConfigSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DevConsoleConfigSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testConfigEditor() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleContainerImageSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleContainerImageSmokeTest.java index b00f2a86c5fe5..b76ca7f566fc9 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleContainerImageSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleContainerImageSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DevConsoleContainerImageSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testCaches() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleGrpcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleGrpcSmokeTest.java index 5ef32caa2036e..bc168dbd84d07 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleGrpcSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleGrpcSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class DevConsoleGrpcSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addPackage(Greeter.class.getPackage()) + .withApplicationRoot((jar) -> jar.addPackage(Greeter.class.getPackage()) .addClass(TestGreeter.class)) .setCodeGenSources("proto"); diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateOrmSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateOrmSmokeTest.java index 9e7118b734620..76b518aa6f50f 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateOrmSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleHibernateOrmSmokeTest.java @@ -1,9 +1,7 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DevConsoleHibernateOrmSmokeTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addAsResource( + .withApplicationRoot((jar) -> jar.addAsResource( new StringAsset("quarkus.datasource.db-kind=h2\n" + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n"), "application.properties") diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java index 1d8c511494150..1df9041178ae1 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DevConsoleOidcSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testOidcProviderTemplate() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java index 4ba3409a830f0..95c43e38d21b5 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java @@ -1,9 +1,7 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DevConsoleQuteSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addAsResource(new StringAsset( + .withApplicationRoot((jar) -> jar.addAsResource(new StringAsset( "{hello}"), "templates/hello.txt")); diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java index 2eaa736753d34..e83ebe3881e63 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java @@ -1,9 +1,7 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class DevConsoleReactiveMessagingSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MyProcessor.class, DummyConnector.class) + .withApplicationRoot((jar) -> jar.addClasses(MyProcessor.class, DummyConnector.class) .addAsResource( new StringAsset( "mp.messaging.incoming.input.connector=dummy\n" diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleResteastyReactiveSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleResteastyReactiveSmokeTest.java index 9ad1ed8c23c26..fd1613ba27291 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleResteastyReactiveSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleResteastyReactiveSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DevConsoleResteastyReactiveSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(MyResource.class)); + .withApplicationRoot((jar) -> jar.addClass(MyResource.class)); @Test public void testTemplates() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSchedulerSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSchedulerSmokeTest.java index 0b9b006e81d14..e55451435f00a 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSchedulerSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSchedulerSmokeTest.java @@ -3,8 +3,6 @@ import java.util.concurrent.TimeUnit; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,7 +18,7 @@ public class DevConsoleSchedulerSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(Jobs.class)); + .withApplicationRoot((jar) -> jar.addClass(Jobs.class)); @Test public void testScheduler() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSmokeTest.java index 6dcdcc2a4d2cf..b143b86491884 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleSmokeTest.java @@ -1,8 +1,6 @@ package io.quarkus.test.devconsole; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class DevConsoleSmokeTest { @RegisterExtension static final QuarkusDevModeTest config = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void testDevConsoleNotBroken() { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainDevModeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainDevModeTest.java index 0cafa79ba9876..e06aece58b216 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainDevModeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainDevModeTest.java @@ -5,9 +5,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NoSrcMainDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NoSrcMainResource.class) .addAsResource(new StringAsset("test.message = Hello from NoSrcMainDevModeTest"), "application.properties")); diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainUnitTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainUnitTest.java index 6cd15d9565b61..c54e16be4f86b 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainUnitTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainUnitTest.java @@ -5,9 +5,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class NoSrcMainUnitTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(NoSrcMainResource.class) .addAsResource(new StringAsset("test.message = Hello from NoSrcMainUnitTest\n" + "quarkus.oidc.tenant-enabled=false"), diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesDevModeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesDevModeTest.java index cb876905f9ab5..9bd310ec7badf 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesDevModeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesDevModeTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -33,7 +31,7 @@ public class AdditionalWatchedResourcesDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(AdditionalWatchedResourcesResource.class) .addAsResource(new StringAsset(INITIAL), RES_WATCHED) .addAsResource(new StringAsset(INITIAL), RES_WATCHED_SUBPATH) diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java index f8b1d68011518..06c2752684d2c 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java @@ -7,8 +7,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class ConsumeUuidEventHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(UuidMessageConsumer.class, BeanDeployingAVerticleFromInstance.class)); private static final String SAMPLE_UUID = "38400000-8cf0-11bd-b23e-10b96e4ef00d"; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java index 9727b181916fb..595d107b438d6 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java @@ -6,8 +6,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class MutinyVerticleClassnameHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyMutinyVerticle.class, BeanDeployingAVerticleFromInstance.class)); @Test diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java index 6988d46444042..37ed36b3ecec5 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java @@ -6,8 +6,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class MutinyVerticleInstanceHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyMutinyVerticle.class, BeanDeployingAVerticleFromInstance.class)); @Test diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java index 2bb4c974285f5..d3fceb2cdaa0f 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java @@ -6,8 +6,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class VerticleClassnameHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyVerticle.class, BeanDeployingAVerticleFromInstance.class)); @Test diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java index f54cb5bf4b38c..40eb5642ff1cd 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java @@ -6,8 +6,6 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class VerticleInstanceHotReloadTest { @RegisterExtension static final QuarkusDevModeTest test = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(MyVerticle.class, BeanDeployingAVerticleFromInstance.class)); @Test diff --git a/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java index e85f039245be9..2c675ad226445 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java @@ -1,7 +1,5 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -15,7 +13,7 @@ public class DefaultPackageWithFastJarPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PackagelessCat.class, TestResources.class)) .setApplicationName("default-package") .setApplicationVersion(Version.getVersion()) diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java index a03dabfd089e5..9ac4997a4cf39 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java @@ -3,8 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class DDLGenerationPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PageItem.class, TestResources.class, NoPagingTestEndpoint.class)) .setApplicationName("ddl-generation") .setApplicationVersion(Version.getVersion()) diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java index 919fea2f0d646..c02d570568b44 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class NoPagingPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PageItem.class, TestResources.class, NoPagingTestEndpoint.class)) .setApplicationName("no-paging-test") .setApplicationVersion(Version.getVersion()) diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java b/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java index 512b83dc4e49c..c122a485dc43c 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java @@ -1,7 +1,5 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class DefaultPackageWithFastJarPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PackagelessCat.class)) .setApplicationName("default-package") .setApplicationVersion(Version.getVersion()) diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java index 483aad47b9174..e8948644066e7 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class NoPagingPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(PageItem.class, NoPagingTestEndpoint.class)) .setApplicationName("no-paging-test") .setApplicationVersion(Version.getVersion()) diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java index 81cd82376b350..4f1a94cff8e4c 100644 --- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java +++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java @@ -3,8 +3,6 @@ import java.io.IOException; import org.assertj.core.api.Assertions; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -16,7 +14,7 @@ public class AbsentConfigMapPropertiesPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(ConfigMapProperties.class)) + .withApplicationRoot((jar) -> jar.addClasses(ConfigMapProperties.class)) .setApplicationName("k8s-configMaps") .withConfigurationResource("application-demo.properties") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicKubernetesTest.java b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicKubernetesTest.java index 3a4450954f6ae..e4b45ba7a2f93 100644 --- a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicKubernetesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicKubernetesTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class BasicKubernetesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(DummyProcessor.class)) + .withApplicationRoot((jar) -> jar.addClasses(DummyProcessor.class)) .setApplicationName("basic") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("basic-kubernetes.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicMinikubeTest.java b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicMinikubeTest.java index 41d24d358aee4..01071a7802970 100644 --- a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicMinikubeTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicMinikubeTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class BasicMinikubeTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(DummyProcessor.class)) + .withApplicationRoot((jar) -> jar.addClasses(DummyProcessor.class)) .setApplicationName("minikube-with-defaults") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("basic-minikube.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicOpenshiftTest.java b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicOpenshiftTest.java index d907871ba898e..0fdfc42ce718f 100644 --- a/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicOpenshiftTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/src/test/java/io/quarkus/it/kubernetes/kafka/BasicOpenshiftTest.java @@ -10,8 +10,6 @@ import java.util.Map; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class BasicOpenshiftTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(DummyProcessor.class)) + .withApplicationRoot((jar) -> jar.addClasses(DummyProcessor.class)) .setApplicationName("basic-openshift") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("basic-openshift.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java index 0e118b979ea56..b58b30dea14ac 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java @@ -9,8 +9,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class BasicKubernetesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("basic") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java index ce0b9d038049b..8deab735f79f7 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java @@ -10,8 +10,6 @@ import java.util.Map; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class BasicOpenshiftTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("basic-openshift") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/GeneratedKubernetesResourcesBuildItemTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/GeneratedKubernetesResourcesBuildItemTest.java index 13a08e3538c99..3eb9eec0dd3d6 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/GeneratedKubernetesResourcesBuildItemTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/GeneratedKubernetesResourcesBuildItemTest.java @@ -11,8 +11,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class GeneratedKubernetesResourcesBuildItemTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("basic") .setApplicationVersion("0.1-SNAPSHOT") .addBuildChainCustomizerEntries(new QuarkusProdModeTest.BuildChainCustomizerEntry( diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeClusterLocalTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeClusterLocalTest.java index 51b8546f8d4fc..9c121fe528a68 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeClusterLocalTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeClusterLocalTest.java @@ -10,8 +10,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KnativeClusterLocalTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-cluster-local").setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-cluster-local.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeContainerImageTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeContainerImageTest.java index 4627b5b9aa087..159e2bf9e4f80 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeContainerImageTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeContainerImageTest.java @@ -9,8 +9,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class KnativeContainerImageTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-with-container-image").setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-container-image.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java index b342e213977d2..a434af4161bac 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KnativeGlobalContainerConcurrency { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-global-container-concurrency") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-global-container-concurrency.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java index ea86126af6310..93b5c4ccf7e3a 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KnativeGlobalRequestsPerSecond { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-global-requests-per-second") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-global-requests-per-second.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java index 2a520be893770..4151203aca322 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KnativeScaleBoundsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-scale-bounds") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-scale-bounds.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java index 0ff3b7fb1b470..c26b05814049c 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KnativeScaleToZeroTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-scale-to-zero") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-scale-to-zero.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java index 47ca9c79fd283..b5dcac88d083d 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KnativeTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java index 345f90b7f3dcf..a7a836f007a9e 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KnativeWithApplicationPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-with-application-properties") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-application.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java index cf2a6c4178057..f4493f1f4b9e4 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class KnativeWithHealthTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-health") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-health.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithSecretConfigTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithSecretConfigTest.java index b8779fe149a92..283d6aa25023b 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithSecretConfigTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithSecretConfigTest.java @@ -8,8 +8,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class KnativeWithSecretConfigTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-with-secret-config") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-secret-config.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java index 0ec0a8fb28bbe..a50876f02bb65 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KnativeWithTrafficSplitting { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-with-traffic-splitting") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-traffic-splitting.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java index 5668c54709938..2a3bbeb99a632 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java @@ -7,8 +7,6 @@ import java.util.List; import org.assertj.core.api.Condition; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KnativeWithVolumesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("knative-with-volumes-properties") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("knative-with-volumes.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java index fec7ad13c3208..9a72036b71223 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class KubernetesAndMinikubeWithApplicationPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-and-minikube") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-and-minikube-with-application.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java index 5e3df9c4d9517..074d66f21d58b 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class KubernetesConfigWithSecretsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-config-with-secrets") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-config-with-secrets.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java index e378c5dbe21b6..39ca3987d3017 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesInitContainersTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-init-containers") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-init-containers.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesServiceMappingTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesServiceMappingTest.java index 45eb27d41bbe1..d447e58b13b62 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesServiceMappingTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesServiceMappingTest.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class KubernetesServiceMappingTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-service-mapping") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-service-mapping.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java index b26d269d7ded2..3156b4763d6bf 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java @@ -9,8 +9,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class KubernetesWithApplicationPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-application-properties") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-application.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithArgumentsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithArgumentsTest.java index 252fb80b6eb9c..6436bf15ab767 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithArgumentsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithArgumentsTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithArgumentsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-arguments") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-arguments.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCommandTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCommandTest.java index e685e52b80489..a15c310513adb 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCommandTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCommandTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithCommandTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-command") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-command.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java index c0aa34fc37b3c..123a5b01636d4 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithConfigMapCustomModeTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("configmap-custom-mode") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-configmap-custom-mode.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java index c644f6ecd2c76..387f6678483a8 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithConfigMapTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("configmap") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-configmap.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java index b164dd7d2599d..f081849a83ba6 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class KubernetesWithConflictingEnvFromResourceTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationVersion("0.1-SNAPSHOT") .assertBuildException(e -> assertThat(e) .isInstanceOf(RuntimeException.class) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java index e95cdf6f3047e..314f005306215 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java @@ -5,8 +5,6 @@ import java.io.IOException; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class KubernetesWithConflictingEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName(APPLICATION_NAME) .setApplicationVersion("0.1-SNAPSHOT") .assertBuildException(e -> assertThat(e) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCustomResourcesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCustomResourcesTest.java index 8dfd99454f05d..3225ed9258f3e 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCustomResourcesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithCustomResourcesTest.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Map; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithCustomResourcesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("custom-resources") .setApplicationVersion("0.1-SNAPSHOT") .addCustomResourceEntry(Path.of("src", "main", "kubernetes", "kubernetes.yml"), diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java index f2d5885711cdc..7a2273899dde5 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class KubernetesWithDefaultsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-defaults") .setApplicationVersion("0.1-SNAPSHOT"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDeprecatedPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDeprecatedPropertiesTest.java index 1c7df58a01263..c06d3ada91c48 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDeprecatedPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDeprecatedPropertiesTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KubernetesWithDeprecatedPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-deprecated-properties") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-deprecated.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java index 43fba9baaeb2f..461702c9435b5 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KubernetesWithEnvFromConfigMapTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("env-from-configmap") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-env-from-configmap.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java index 18f752e0e2562..f1dbb6e42141f 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithEnvFromFieldTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("env-from-field") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-env-from-field.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java index 458f7ee317681..68b46b7f1cb38 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class KubernetesWithEnvFromSecretTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("env-from-secret") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-env-from-secret.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java index 27bef2daec67c..1f913d5739acc 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesWithGitlabLikeImageTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("gitlab-like-image-test") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-gitlab-like-image.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java index 4ea49ab62364f..c31e05c615795 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java @@ -7,8 +7,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class KubernetesWithHealthAndJibTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("health-and-jib") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java index 74b39ab42ff36..62e3a6b67c1df 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java @@ -11,8 +11,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -30,7 +28,7 @@ public class KubernetesWithHealthTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("health") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java index 35d7fa08a931c..81353e4282fb8 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java @@ -7,8 +7,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class KubernetesWithHostAliasesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("hostaliases") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-hostaliases.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithIngressTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithIngressTest.java index 61b1eea194d46..8035acd1ce88b 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithIngressTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithIngressTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class KubernetesWithIngressTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-ingress") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-ingress.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java index 509304fcbce44..1f29dbb9fd428 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class KubernetesWithInitContainerResourceLimitsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-init-container-resource-limits") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-init-container-resource-limits.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java index bbba410693d54..a0d3b72011255 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithMetricsCustomAbsoluteTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("metrics") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java index a681d25ffe2f9..914d4c772bb5d 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithMetricsCustomRelativeTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("metrics") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java index e0f24a7a0c2f9..8746955d0090c 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithMetricsNoAnnotationsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("metrics") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java index d3f00d9a771d7..9cdbf73ff8824 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java @@ -9,8 +9,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class KubernetesWithMetricsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("metrics") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java index 306f597bd598f..75a5cda155813 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithMicrometerTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("metrics") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java index 1bbc19354e34b..bda40f4dc76e5 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class KubernetesWithMixedStyleEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName(APPLICATION_NAME) .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-" + APPLICATION_NAME + "-env.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMultiplePortsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMultiplePortsTest.java index 07a7134a00c33..f22eb638671dc 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMultiplePortsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMultiplePortsTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class KubernetesWithMultiplePortsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-multiple-ports") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-multiple-ports.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java index 92a2b25a78f65..6d08b17615546 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesWithNewStyleEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName(APPLICATION_NAME) .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-new-style-env.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java index 920f9a4aef13d..554e7c5f8c61a 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesWithOldStyleEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName(APPLICATION_NAME) .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-old-style-env.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java index 6f00f517d51d1..cabe5acd581af 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithPvcVolumesTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class KubernetesWithPvcVolumesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-pvc-volumes") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-pvc-volumes.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java index 8bb582f59e8e7..515f0ae690952 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KubernetesWithQuarkusAppNameTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-quarkus-app-name") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-quarkus-app-name.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java index 01578ae7cf557..00bb904119d7e 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.Optional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class KubernetesWithRbacAndNamespaceTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-rbac-and-namespace") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-rbac-and-namespace.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java index a1678ea03ad10..91db806ede905 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KubernetesWithResourcesRequirementsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("resources-requirements") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-resources-requirements.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java index cd9b9b5d0dfaf..72292e54c59dc 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class KubernetesWithRootAndHealthTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("root-and-health") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-root-and-health.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithServiceBindingTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithServiceBindingTest.java index fc2fca12392a1..98d2501a8d31d 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithServiceBindingTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithServiceBindingTest.java @@ -8,8 +8,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class KubernetesWithServiceBindingTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-service-binding") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-service-binding.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java index f32a457200ecd..12b0debd2c8dd 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesWithSidecarAndJibTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("sidecar-test") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-sidecar-and-jib.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java index 092644934cb95..10bc80527c635 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class KubernetesWithSidecarAndProbesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-sidecar-and-probes") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-sidecar-and-probes.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSysGroupTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSysGroupTest.java index a489f096de27e..24048cf25a111 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSysGroupTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSysGroupTest.java @@ -7,8 +7,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class KubernetesWithSysGroupTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-sys-group") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("kubernetes-with-sys-group.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java index b518878190fe3..13c69c64fe74e 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.logging.LogRecord; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class KubernetesWithWarningsEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName(APPLICATION_NAME) .setApplicationVersion("0.1-SNAPSHOT") .setLogRecordPredicate(r -> "io.quarkus.kubernetes.deployment.EnvVarValidator".equals(r.getLoggerName()) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java index a366f4341863a..87a5272b565a9 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class MinikubeWithApplicationPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("minikube-with-application-properties") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("minikube-with-application.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java index 4b027bf0f3786..6c0dccd2d8972 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class MinikubeWithDefaultsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("minikube-with-defaults") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("minikube-with-defaults.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java index 33f4d9f110455..6f6ea43fb5c75 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class MinikubeWithMixedStyleEnvTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("minikube-with-mixed-style-env") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("minikube-with-mixed-style-env.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java index 430d5909cb813..6065c821706c5 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java @@ -9,8 +9,6 @@ import java.util.Map; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OpenshiftV3Test { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-v3") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-v3.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java index 96d5ed28fbea5..e839ae13726ef 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java @@ -9,8 +9,6 @@ import java.util.Map; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class OpenshiftV4Test { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-v4") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-v4.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java index fc372c14c3367..6aaea4f2ce17b 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java @@ -8,8 +8,6 @@ import java.util.List; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class OpenshiftWithAppConfigMapTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-app-config-map") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-app-config-map.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java index 4ecaf821202a5..5ea031d9ac43e 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java @@ -8,8 +8,6 @@ import java.util.List; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -28,7 +26,7 @@ public class OpenshiftWithAppSecretTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-app-secret") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-app-secret.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java index ce7a1b2b25047..034efa2e49e37 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java @@ -10,8 +10,6 @@ import java.util.Map; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class OpenshiftWithApplicationPropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-application.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithArgumentsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithArgumentsTest.java index 2bf3fc57ee89d..2f3e776b4b026 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithArgumentsTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithArgumentsTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OpenshiftWithArgumentsTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-arguments") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-arguments.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithCommandTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithCommandTest.java index 4359630c02dcc..b7d95163844d1 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithCommandTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithCommandTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class OpenshiftWithCommandTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-command") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-command.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java index 41123290d6f43..773c3232b0b55 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class OpenshiftWithDeploymentResourceTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-deployment-resource") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-deployment-resource.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java index 12bfe0f7cc749..268f233f3e5c4 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java @@ -7,8 +7,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class OpenshiftWithDockerBuildStrategyTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-s2i").setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-docker-build-strategy.properties") .setForcedDependencies(Collections diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java index cbf2aa897bca1..958a863b1d4ad 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,7 +25,7 @@ public class OpenshiftWithHealthTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-health") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java index 317e3e9a0c4b2..d8b484de9a4e2 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java @@ -8,8 +8,6 @@ import java.util.List; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class OpenshiftWithLegacySidecarAndS2iTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-sidecar-test") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-legacy-sidecar-and-s2i.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java index 985efc3db5558..fb5090d9e5622 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class OpenshiftWithRoutePropertiesTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-route.properties"); diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java index 90f65b6836a60..a7c006400f8d9 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java @@ -9,8 +9,6 @@ import java.util.List; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class OpenshiftWithS2iTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-s2i") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-s2i.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithServiceBindingTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithServiceBindingTest.java index 67bbfca8974df..51470f3cc97c8 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithServiceBindingTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithServiceBindingTest.java @@ -8,8 +8,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class OpenshiftWithServiceBindingTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-with-service-binding") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-service-binding.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java index 5ce3f86a598cb..74d364135f1f7 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java @@ -8,8 +8,6 @@ import java.util.List; import org.assertj.core.api.AbstractObjectAssert; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class OpenshiftWithSidecarAndS2iTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-sidecar-test") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("openshift-with-sidecar-and-s2i.properties") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java index 7b83395869ca4..917c9df93b5c1 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java @@ -10,8 +10,6 @@ import java.util.List; import org.assertj.core.api.Condition; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,7 +27,7 @@ public class OpenshiftWithUberJarTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("openshift-uberjar").setApplicationVersion("0.1-SNAPSHOT").setRun(true) .setLogFileName("k8s.log").withConfigurationResource("openshift-with-uberjar.properties") .setForcedDependencies( diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java index 8ed88c80d969a..3753c454dc6e4 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.List; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +24,7 @@ public class WithKubernetesClientTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-client") .setApplicationVersion("0.1-SNAPSHOT") .setRun(true) diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java index c382c1c259d28..74ee196d40d0b 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java @@ -9,8 +9,6 @@ import java.util.stream.Collectors; import org.jboss.logmanager.formatters.PatternFormatter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class LoggingWithPanacheDevModeTest { @RegisterExtension static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(LoggingEndpoint.class)) + .withApplicationRoot((jar) -> jar.addClasses(LoggingEndpoint.class)) .setLogRecordPredicate(record -> "io.quarkus.logging.LoggingEndpoint".equals(record.getLoggerName())); @Test diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java index 044257cf5fabc..5bdaa69c8b00a 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java @@ -1,7 +1,5 @@ package io.quarkus.logging; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -10,7 +8,7 @@ public class LoggingWithPanacheGeneratedTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(GeneratedBean.class, NoStackTraceTestException.class)) .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE") .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE"); diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java index 52b8d433aa00c..be89775d6068d 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java @@ -9,8 +9,6 @@ import javax.inject.Inject; import org.jboss.logmanager.formatters.PatternFormatter; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -19,7 +17,7 @@ public class LoggingWithPanacheTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(LoggingBean.class, NoStackTraceTestException.class)) .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE") .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE") diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java index 7b4e92a348f2d..6a931d9035d13 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java @@ -11,7 +11,7 @@ public class AddToBomDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java index db18f37a01516..07731cd67a048 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java @@ -12,7 +12,7 @@ class AddToBomTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java index 5890739d62939..7358dac08b6a4 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java @@ -11,7 +11,7 @@ public class ItestDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java index e360eb2280e9b..79ba73bb9e69c 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java @@ -12,7 +12,7 @@ class ItestTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java index c6294029a5d7a..c526006761dcf 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java @@ -11,7 +11,7 @@ public class MinimalExtensionDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java index 3d93606a05ef4..a7f2785b0bd1b 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java @@ -12,7 +12,7 @@ class MinimalExtensionTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java index 9786b73a468d7..5f2be8332e077 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java @@ -11,7 +11,7 @@ public class WithGrandParentDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java index 11a4d78fbd353..b19ef64ec26da 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java @@ -12,7 +12,7 @@ class WithGrandParentTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java index d1a5fb8fc7603..3bd49d558a04b 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java @@ -11,7 +11,7 @@ public class MyExtDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java index 71ed95323e1d2..c5ef573d6783c 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java @@ -12,7 +12,7 @@ class MyExtTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java index d1a5fb8fc7603..3bd49d558a04b 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java @@ -11,7 +11,7 @@ public class MyExtDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java index 71ed95323e1d2..c5ef573d6783c 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java @@ -12,7 +12,7 @@ class MyExtTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java index d1a5fb8fc7603..3bd49d558a04b 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java @@ -11,7 +11,7 @@ public class MyExtDevModeTest { @RegisterExtension static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java index 71ed95323e1d2..c5ef573d6783c 100644 --- a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java +++ b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java @@ -12,7 +12,7 @@ class MyExtTest { @RegisterExtension static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .withEmptyApplication(); @Test public void test() { diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java index 53cc5d185dbba..b07426f42e625 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java @@ -9,8 +9,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class CustomManifestSectionsThinJarTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setApplicationName("Custom-Manifest-Thin") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("projects/custom-manifest-section/custom-manifest-thin.properties"); diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java index 6c5b89d02006d..efcaac9f3f12c 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java @@ -9,8 +9,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -23,7 +21,7 @@ public class CustomManifestSectionsUberJarTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setApplicationName("Custom-Manifest-Uber") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("projects/custom-manifest-section/custom-manifest-uber.properties"); diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsThinJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsThinJarTest.java index 91fca23e03e3e..07d1b9fde58cf 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsThinJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsThinJarTest.java @@ -8,8 +8,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class NoCustomManifestSectionsThinJarTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setApplicationName("No-Custom-Manifest-Thin") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("projects/custom-manifest-section/no-custom-manifest-thin.properties"); diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsUberJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsUberJarTest.java index 82579c037d3ee..1a0831402c162 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsUberJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/NoCustomManifestSectionsUberJarTest.java @@ -8,8 +8,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,7 +19,7 @@ public class NoCustomManifestSectionsUberJarTest { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .withEmptyApplication() .setApplicationName("No-Custom-Manifest-Uber") .setApplicationVersion("0.1-SNAPSHOT") .withConfigurationResource("projects/custom-manifest-section/no-custom-manifest-uber.properties"); diff --git a/integration-tests/packaging/src/test/java/io/quarkus/removedclasses/AbstractRemovedResourceTest.java b/integration-tests/packaging/src/test/java/io/quarkus/removedclasses/AbstractRemovedResourceTest.java index 2be64da4595fa..20e127bd0faaf 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/removedclasses/AbstractRemovedResourceTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/removedclasses/AbstractRemovedResourceTest.java @@ -1,8 +1,6 @@ package io.quarkus.removedclasses; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import io.quarkus.builder.Version; @@ -13,7 +11,7 @@ public abstract class AbstractRemovedResourceTest { protected static QuarkusProdModeTest application(String packageType) { return new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .add(new StringAsset( "quarkus.class-loading.removed-resources.\"io.quarkus\\:quarkus-integration-test-shared-library\"=io/quarkus/it/shared/RemovedResource.class\n" + diff --git a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestUtils.java b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestUtils.java index 7ac0c78afacb3..e78ba63efd584 100644 --- a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestUtils.java +++ b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestUtils.java @@ -1,8 +1,5 @@ package io.quarkus.it.picocli; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; - import io.quarkus.test.QuarkusProdModeTest; class TestUtils { @@ -12,7 +9,7 @@ private TestUtils() { static QuarkusProdModeTest createConfig(String appName, Class... classes) { return new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(classes)) + .withApplicationRoot((jar) -> jar.addClasses(classes)) .setApplicationName(appName).setApplicationVersion("0.1-SNAPSHOT") .setExpectExit(true).setRun(true); } diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java index 60dd521ed3fc6..72734036b49a6 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java @@ -4,8 +4,6 @@ import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class CustomProducersTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(ProducerBean.class)); @Inject diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java index e6fba96a5de8f..b93db4ad9801b 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java @@ -8,8 +8,6 @@ import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +33,7 @@ public class SimpleContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application.properties")); diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java index d2f026b4fb1f8..56ae0760cc2cd 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java @@ -8,8 +8,6 @@ import org.eclipse.microprofile.context.ThreadContext; import org.eclipse.microprofile.context.spi.ThreadContextProvider; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -24,7 +22,7 @@ public class CustomContextTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(CustomContextTest.class, CustomContext.class, CustomContextProvider.class) .addAsServiceProvider(ThreadContextProvider.class, CustomContextProvider.class)); diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java index 8b82efc6677b3..9114bca6431a3 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java @@ -8,8 +8,6 @@ import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,7 +32,7 @@ public class MutinyContextPropagationTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(testClasses) .addAsResource("application.properties")); diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java index d3d6e10e806e9..074f3152d02ed 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.logging.LogRecord; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -18,7 +16,7 @@ public class PropertyWarningsPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(FruitResource.class)) + .withApplicationRoot((jar) -> jar.addClasses(FruitResource.class)) .setApplicationName("property-warnings") .setApplicationVersion("0.1-SNAPSHOT") .setLogRecordPredicate(r -> "io.quarkus.spring.data.deployment.SpringDataJPAProcessor".equals(r.getLoggerName())) diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java index 40c3137555f4b..55b6613ee7954 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiDefaultPathPMT.java @@ -1,8 +1,6 @@ package io.quarkus.it.spring.web.openapi; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiDefaultPathPMT { @RegisterExtension static QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties")) diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithSegmentsPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithSegmentsPMT.java index 813e0793e5c15..1657743e2aedf 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithSegmentsPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithSegmentsPMT.java @@ -1,7 +1,5 @@ package io.quarkus.it.spring.web.openapi; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class OpenApiPathWithSegmentsPMT { @RegisterExtension static QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties")) diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithoutSegmentsPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithoutSegmentsPMT.java index 3675ea5a21d6e..311ff06e0b283 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithoutSegmentsPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiPathWithoutSegmentsPMT.java @@ -1,7 +1,5 @@ package io.quarkus.it.spring.web.openapi; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -13,7 +11,7 @@ public class OpenApiPathWithoutSegmentsPMT { @RegisterExtension static QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties")) diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiStoreSchemaPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiStoreSchemaPMT.java index f4861f8a02a25..287676c16093e 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiStoreSchemaPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiStoreSchemaPMT.java @@ -4,8 +4,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,7 +20,7 @@ public class OpenApiStoreSchemaPMT { @RegisterExtension static QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties")) diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiWithConfigPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiWithConfigPMT.java index 929d54fb73e9c..5e960c1ce93e1 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiWithConfigPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/OpenApiWithConfigPMT.java @@ -1,8 +1,6 @@ package io.quarkus.it.spring.web.openapi; import org.hamcrest.Matchers; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -14,7 +12,7 @@ public class OpenApiWithConfigPMT { @RegisterExtension static QuarkusProdModeTest runner = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClasses(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties") diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/SwaggerAndOpenAPIWithCommonPrefixPMT.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/SwaggerAndOpenAPIWithCommonPrefixPMT.java index 56463b45a47bd..30a59a4cfacaa 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/SwaggerAndOpenAPIWithCommonPrefixPMT.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/openapi/SwaggerAndOpenAPIWithCommonPrefixPMT.java @@ -2,8 +2,6 @@ import static org.hamcrest.Matchers.containsString; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -17,7 +15,7 @@ public class SwaggerAndOpenAPIWithCommonPrefixPMT { @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addClass(OpenApiController.class) .addAsResource("test-roles.properties") .addAsResource("test-users.properties")) diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java index 6b952e7ba5812..5d3d966008016 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -26,7 +24,7 @@ public class VaultAppRoleITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-approle.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleWrapITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleWrapITCase.java index 1c49841c112ce..f54decf180fbb 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleWrapITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleWrapITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -26,7 +24,7 @@ public class VaultAppRoleWrapITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-approle-wrap.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAuthITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAuthITCase.java index 4b3a3587ef5b6..d81ac42806d63 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAuthITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAuthITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -28,7 +26,7 @@ public class VaultAuthITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultClientTokenWrapITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultClientTokenWrapITCase.java index 230416e61fe4d..16eb1c22adfa9 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultClientTokenWrapITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultClientTokenWrapITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -26,7 +24,7 @@ public class VaultClientTokenWrapITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-client-token-wrap.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java index a1d65d4e626f0..6715027af7c77 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java @@ -4,8 +4,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -20,7 +18,7 @@ public class VaultEnterpriseITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-enterprise.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java index aff4f1ca23358..f31b7e04ceb61 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java @@ -34,8 +34,6 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; @@ -99,7 +97,7 @@ public class VaultITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java index 1579bef6e7032..d7677ad539b1b 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -20,7 +18,7 @@ public class VaultKubernetesITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-kubernetes.properties", "application.properties")); @ConfigProperty(name = "quarkus.vault.authentication.kubernetes.role") diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultMultiPathConfigITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultMultiPathConfigITCase.java index fae6a8b06938f..15f385da9ba80 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultMultiPathConfigITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultMultiPathConfigITCase.java @@ -4,8 +4,6 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -20,7 +18,7 @@ public class VaultMultiPathConfigITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-multi-path.properties", "application.properties")); @Test diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultPKIITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultPKIITCase.java index 7eb823e03eb60..9fc22604e3b5c 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultPKIITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultPKIITCase.java @@ -26,8 +26,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -69,7 +67,7 @@ public class VaultPKIITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-pki.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultSysITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultSysITCase.java index 4e21c4594ef70..a6bab1fc09358 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultSysITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultSysITCase.java @@ -12,8 +12,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -35,7 +33,7 @@ public class VaultSysITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTOTPITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTOTPITCase.java index 59d8e675a9ca7..75901d8347072 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTOTPITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTOTPITCase.java @@ -7,8 +7,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -29,7 +27,7 @@ public class VaultTOTPITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-totp.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java index 5425507ed0084..8e189603d2158 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java @@ -26,8 +26,6 @@ import javax.inject.Inject; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -62,7 +60,7 @@ public class VaultTransitITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault.properties", "application.properties")); public static final String KEY_NAME = "mykey"; diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUnableToConnectITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUnableToConnectITCase.java index 8cb0f6ca6d36c..3fc901d56e0cd 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUnableToConnectITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUnableToConnectITCase.java @@ -3,8 +3,6 @@ import static io.quarkus.credentials.CredentialsProvider.PASSWORD_PROPERTY_NAME; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +23,7 @@ public class VaultUnableToConnectITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-unable-to-connect.properties", "application.properties")); @ConfigProperty(name = PASSWORD_PROPERTY_NAME) diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv1WrapITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv1WrapITCase.java index 9197a9f589adb..10e50c81f45d8 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv1WrapITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv1WrapITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -26,7 +24,7 @@ public class VaultUserpassKvv1WrapITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-userpass-kvv1-wrap.properties", "application.properties")); @Inject diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv2WrapITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv2WrapITCase.java index 65e78d3a27a24..160c8430a3033 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv2WrapITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultUserpassKvv2WrapITCase.java @@ -9,8 +9,6 @@ import javax.inject.Inject; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -26,7 +24,7 @@ public class VaultUserpassKvv2WrapITCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .withApplicationRoot((jar) -> jar .addAsResource("application-vault-userpass-kvv2-wrap.properties", "application.properties")); @Inject diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java index 19a8590b5aec6..7dceea36f57dd 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java @@ -21,8 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.ServiceLoader; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -34,6 +36,7 @@ import java.util.stream.Stream; import org.jboss.logmanager.Logger; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.extension.AfterAllCallback; @@ -135,11 +138,55 @@ public QuarkusDevModeTest setArchiveProducer(Supplier archiveProduc return this; } + /** + * Customize the application root. + * + * @param applicationRootConsumer + * @return self + */ + public QuarkusDevModeTest withApplicationRoot(Consumer applicationRootConsumer) { + Objects.requireNonNull(applicationRootConsumer); + return setArchiveProducer(() -> { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class); + applicationRootConsumer.accept(jar); + return jar; + }); + } + + /** + * Use an empty application for the test + * + * @return self + */ + public QuarkusDevModeTest withEmptyApplication() { + return withApplicationRoot(new Consumer() { + @Override + public void accept(JavaArchive javaArchive) { + + } + }); + } + public QuarkusDevModeTest setTestArchiveProducer(Supplier testArchiveProducer) { this.testArchiveProducer = testArchiveProducer; return this; } + /** + * Customize the application root. + * + * @param applicationRootConsumer + * @return self + */ + public QuarkusDevModeTest withTestArchive(Consumer testArchiveConsumer) { + Objects.requireNonNull(testArchiveConsumer); + return setTestArchiveProducer(() -> { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class); + testArchiveConsumer.accept(jar); + return jar; + }); + } + public QuarkusDevModeTest setCodeGenSources(String... codeGenSources) { this.codeGenSources = Arrays.asList(codeGenSources); return this; diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java index 70db8686ab390..eb6d4563c5bbc 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java @@ -154,6 +154,35 @@ public QuarkusProdModeTest setArchiveProducer(Supplier archiveProdu return this; } + /** + * Customize the application root. + * + * @param applicationRootConsumer + * @return self + */ + public QuarkusProdModeTest withApplicationRoot(Consumer applicationRootConsumer) { + Objects.requireNonNull(applicationRootConsumer); + return setArchiveProducer(() -> { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class); + applicationRootConsumer.accept(jar); + return jar; + }); + } + + /** + * Use an empty application for the test + * + * @return self + */ + public QuarkusProdModeTest withEmptyApplication() { + return withApplicationRoot(new Consumer() { + @Override + public void accept(JavaArchive javaArchive) { + + } + }); + } + public QuarkusProdModeTest addBuildChainCustomizerEntries(BuildChainCustomizerEntry entry) { Objects.requireNonNull(entry); this.buildChainCustomizerEntries.add(entry); diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java index b0994601682aa..8f2af00a34b64 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java @@ -186,9 +186,26 @@ public QuarkusUnitTest setArchiveProducer(Supplier archiveProducer) * @return self */ public QuarkusUnitTest withApplicationRoot(Consumer applicationRootConsumer) { - JavaArchive root = ShrinkWrap.create(JavaArchive.class); - Objects.requireNonNull(applicationRootConsumer).accept(root); - return setArchiveProducer(() -> root); + Objects.requireNonNull(applicationRootConsumer); + return setArchiveProducer(() -> { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class); + applicationRootConsumer.accept(jar); + return jar; + }); + } + + /** + * Use an empty application for the test + * + * @return self + */ + public QuarkusUnitTest withEmptyApplication() { + return withApplicationRoot(new Consumer() { + @Override + public void accept(JavaArchive javaArchive) { + + } + }); } /**