diff --git a/core/src/test/java/io/kestra/core/contexts/KestraContextTest.java b/core/src/test/java/io/kestra/core/contexts/KestraContextTest.java index f9b04c2371..536ac6f1b9 100644 --- a/core/src/test/java/io/kestra/core/contexts/KestraContextTest.java +++ b/core/src/test/java/io/kestra/core/contexts/KestraContextTest.java @@ -1,16 +1,14 @@ package io.kestra.core.contexts; -import io.kestra.core.junit.annotations.KestraTest; -import io.micronaut.context.ApplicationContext; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; -import java.util.Map; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class KestraContextTest { @Inject diff --git a/core/src/test/java/io/kestra/core/contexts/MavenPluginRepositoryConfigTest.java b/core/src/test/java/io/kestra/core/contexts/MavenPluginRepositoryConfigTest.java index b3036f3bb3..4637c1ae9b 100644 --- a/core/src/test/java/io/kestra/core/contexts/MavenPluginRepositoryConfigTest.java +++ b/core/src/test/java/io/kestra/core/contexts/MavenPluginRepositoryConfigTest.java @@ -1,8 +1,7 @@ package io.kestra.core.contexts; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,7 +9,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest(environments = "maven") +@MicronautTest(environments = "maven") class MavenPluginRepositoryConfigTest { @Inject diff --git a/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java b/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java index eb1e08b6b6..7cd540d7f3 100644 --- a/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java +++ b/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java @@ -10,7 +10,7 @@ import io.kestra.plugin.core.debug.Return; import io.kestra.plugin.core.flow.Dag; import io.kestra.plugin.core.flow.Subflow; import io.kestra.plugin.core.state.Set; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest @Execution(ExecutionMode.SAME_THREAD) class DocumentationGeneratorTest { @Inject diff --git a/core/src/test/java/io/kestra/core/models/LabelTest.java b/core/src/test/java/io/kestra/core/models/LabelTest.java index 5608d70632..923d836397 100644 --- a/core/src/test/java/io/kestra/core/models/LabelTest.java +++ b/core/src/test/java/io/kestra/core/models/LabelTest.java @@ -2,6 +2,7 @@ package io.kestra.core.models; import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.validations.ModelValidator; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Test; @@ -12,7 +13,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class LabelTest { @Inject private ModelValidator modelValidator; diff --git a/core/src/test/java/io/kestra/core/models/property/PropertyTest.java b/core/src/test/java/io/kestra/core/models/property/PropertyTest.java index 6d48de500f..57ed3c0f9f 100644 --- a/core/src/test/java/io/kestra/core/models/property/PropertyTest.java +++ b/core/src/test/java/io/kestra/core/models/property/PropertyTest.java @@ -5,26 +5,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.core.JsonProcessingException; import io.kestra.core.context.TestRunContextFactory; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.serializers.FileSerde; import io.kestra.core.serializers.JacksonMapper; -import io.kestra.core.storages.Namespace; -import io.kestra.core.storages.NamespaceFile; import io.kestra.core.storages.StorageInterface; -import io.kestra.plugin.core.namespace.Version; import io.micronaut.core.annotation.Introspected; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; import org.junit.jupiter.api.Test; import org.slf4j.event.Level; import reactor.core.publisher.Flux; import java.io.FileInputStream; -import java.io.IOException; import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; @@ -37,7 +32,7 @@ import static java.util.Map.entry; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class PropertyTest { @Inject diff --git a/core/src/test/java/io/kestra/core/models/property/URIFetcherTest.java b/core/src/test/java/io/kestra/core/models/property/URIFetcherTest.java index e6a7eb89c6..8f49193075 100644 --- a/core/src/test/java/io/kestra/core/models/property/URIFetcherTest.java +++ b/core/src/test/java/io/kestra/core/models/property/URIFetcherTest.java @@ -1,12 +1,11 @@ package io.kestra.core.models.property; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.*; import io.kestra.core.storages.Namespace; import io.kestra.core.storages.NamespaceFactory; -import io.kestra.core.storages.StorageContext; import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -28,7 +27,7 @@ import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class URIFetcherTest { @Inject private StorageInterface storage; diff --git a/core/src/test/java/io/kestra/core/models/triggers/StatefulTriggerInterfaceTest.java b/core/src/test/java/io/kestra/core/models/triggers/StatefulTriggerInterfaceTest.java index 7ac9a58ebb..0d517c49fd 100644 --- a/core/src/test/java/io/kestra/core/models/triggers/StatefulTriggerInterfaceTest.java +++ b/core/src/test/java/io/kestra/core/models/triggers/StatefulTriggerInterfaceTest.java @@ -1,9 +1,8 @@ package io.kestra.core.models.triggers; -import io.kestra.core.junit.annotations.KestraTest; -import io.kestra.core.models.TenantInterface; import io.kestra.core.models.flows.Flow; import io.kestra.core.runners.RunContextFactory; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -17,7 +16,7 @@ import static io.kestra.core.models.triggers.StatefulTriggerService.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -@KestraTest +@MicronautTest class StatefulTriggerInterfaceTest { @Inject RunContextFactory runContextFactory; diff --git a/core/src/test/java/io/kestra/core/models/triggers/multipleflows/AbstractMultipleConditionStorageTest.java b/core/src/test/java/io/kestra/core/models/triggers/multipleflows/AbstractMultipleConditionStorageTest.java index 155ef6f7b1..1b30c9f1dd 100644 --- a/core/src/test/java/io/kestra/core/models/triggers/multipleflows/AbstractMultipleConditionStorageTest.java +++ b/core/src/test/java/io/kestra/core/models/triggers/multipleflows/AbstractMultipleConditionStorageTest.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap; import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.property.Property; import io.kestra.core.utils.TestsUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; import io.kestra.plugin.core.condition.ExecutionFlow; @@ -23,7 +24,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest(transactional = false) public abstract class AbstractMultipleConditionStorageTest { private static final String NAMESPACE = "io.kestra.unit"; diff --git a/core/src/test/java/io/kestra/core/plugins/PluginConfigurationTest.java b/core/src/test/java/io/kestra/core/plugins/PluginConfigurationTest.java index 8971667e08..87a1aca78f 100644 --- a/core/src/test/java/io/kestra/core/plugins/PluginConfigurationTest.java +++ b/core/src/test/java/io/kestra/core/plugins/PluginConfigurationTest.java @@ -1,17 +1,15 @@ package io.kestra.core.plugins; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; -import java.util.stream.IntStream; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class PluginConfigurationTest { @Inject diff --git a/core/src/test/java/io/kestra/core/reporter/reports/AbstractFeatureUsageReportTest.java b/core/src/test/java/io/kestra/core/reporter/reports/AbstractFeatureUsageReportTest.java index a38841326a..5019475bcd 100644 --- a/core/src/test/java/io/kestra/core/reporter/reports/AbstractFeatureUsageReportTest.java +++ b/core/src/test/java/io/kestra/core/reporter/reports/AbstractFeatureUsageReportTest.java @@ -1,7 +1,7 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.reporter.Reportable; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -11,7 +11,7 @@ import java.time.ZoneId; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractFeatureUsageReportTest { @Inject diff --git a/core/src/test/java/io/kestra/core/reporter/reports/AbstractServiceUsageReportTest.java b/core/src/test/java/io/kestra/core/reporter/reports/AbstractServiceUsageReportTest.java index 042998fee2..366256b6e2 100644 --- a/core/src/test/java/io/kestra/core/reporter/reports/AbstractServiceUsageReportTest.java +++ b/core/src/test/java/io/kestra/core/reporter/reports/AbstractServiceUsageReportTest.java @@ -1,6 +1,5 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.collectors.ServiceUsage; import io.kestra.core.reporter.Reportable; import io.kestra.core.repositories.ServiceInstanceRepositoryInterface; @@ -8,6 +7,7 @@ import io.kestra.core.server.Service; import io.kestra.core.server.ServiceInstance; import io.kestra.core.server.ServiceType; import io.kestra.core.utils.IdUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@KestraTest +@MicronautTest public abstract class AbstractServiceUsageReportTest { @Inject diff --git a/core/src/test/java/io/kestra/core/reporter/reports/PluginMetricReportTest.java b/core/src/test/java/io/kestra/core/reporter/reports/PluginMetricReportTest.java index d7ac3256db..fb70c2e82b 100644 --- a/core/src/test/java/io/kestra/core/reporter/reports/PluginMetricReportTest.java +++ b/core/src/test/java/io/kestra/core/reporter/reports/PluginMetricReportTest.java @@ -1,10 +1,10 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.metrics.MetricRegistry; import io.kestra.plugin.core.http.Trigger; import io.kestra.plugin.core.log.Log; import io.kestra.plugin.core.trigger.Schedule; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -13,7 +13,7 @@ import java.time.Instant; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class PluginMetricReportTest { @Inject diff --git a/core/src/test/java/io/kestra/core/reporter/reports/SystemInformationReportTest.java b/core/src/test/java/io/kestra/core/reporter/reports/SystemInformationReportTest.java index d7d611395a..621f932410 100644 --- a/core/src/test/java/io/kestra/core/reporter/reports/SystemInformationReportTest.java +++ b/core/src/test/java/io/kestra/core/reporter/reports/SystemInformationReportTest.java @@ -1,9 +1,9 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.Setting; import io.kestra.core.repositories.SettingRepositoryInterface; import io.micronaut.test.annotation.MockBean; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.inject.Singleton; import jakarta.validation.ConstraintViolationException; @@ -16,7 +16,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class SystemInformationReportTest { @Inject diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionRepositoryTest.java index b55786e59e..61e3ce5ce8 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionRepositoryTest.java @@ -4,7 +4,6 @@ import com.devskiller.friendly_id.FriendlyId; import com.google.common.collect.ImmutableMap; import io.kestra.core.exceptions.InvalidQueryFiltersException; import io.kestra.core.junit.annotations.FlakyTest; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.Label; import io.kestra.core.models.QueryFilter; import io.kestra.core.models.QueryFilter.Field; @@ -33,6 +32,7 @@ import io.micronaut.data.model.Pageable; import io.micronaut.data.model.Sort; import io.micronaut.http.HttpStatus; import io.micronaut.http.exceptions.HttpStatusException; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -58,7 +58,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -@KestraTest +@MicronautTest public abstract class AbstractExecutionRepositoryTest { public static final String NAMESPACE = "io.kestra.unittest"; public static final String FLOW = "full"; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java index 080231b3b6..7218affb75 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java @@ -10,7 +10,7 @@ import io.kestra.core.runners.RunContextFactory; import io.kestra.core.services.ExecutionService; import io.kestra.plugin.core.debug.Return; import io.kestra.core.utils.IdUtils; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.slf4j.event.Level; @@ -28,7 +28,7 @@ import java.util.Objects; import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractExecutionServiceTest { @Inject ExecutionService executionService; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java index 704b8a3f5b..7339d0c4d9 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap; import io.kestra.core.events.CrudEvent; import io.kestra.core.events.CrudEventType; import io.kestra.core.exceptions.InvalidQueryFiltersException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.Label; import io.kestra.core.models.QueryFilter; import io.kestra.core.models.QueryFilter.Field; @@ -26,6 +25,7 @@ import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.core.debug.Return; import io.micronaut.context.event.ApplicationEventListener; import io.micronaut.data.model.Pageable; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.inject.Singleton; import jakarta.validation.ConstraintViolationException; @@ -49,7 +49,7 @@ import static io.kestra.core.utils.NamespaceUtils.SYSTEM_FLOWS_DEFAULT_NAMESPACE import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -@KestraTest +@MicronautTest(transactional = false) public abstract class AbstractFlowRepositoryTest { public static final String TEST_NAMESPACE = "io.kestra.unittest"; public static final String TEST_FLOW_ID = "test"; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractFlowTopologyRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractFlowTopologyRepositoryTest.java index 00970ce0b5..7f7e59d132 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractFlowTopologyRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractFlowTopologyRepositoryTest.java @@ -3,8 +3,8 @@ package io.kestra.core.repositories; import io.kestra.core.models.topologies.FlowNode; import io.kestra.core.models.topologies.FlowRelation; import io.kestra.core.models.topologies.FlowTopology; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.utils.TestsUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractFlowTopologyRepositoryTest { @Inject private FlowTopologyRepositoryInterface flowTopologyRepository; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractKvMetadataRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractKvMetadataRepositoryTest.java index 27252a72ac..cb50ac2896 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractKvMetadataRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractKvMetadataRepositoryTest.java @@ -4,8 +4,8 @@ import io.kestra.core.models.FetchVersion; import io.kestra.core.models.QueryFilter; import io.kestra.core.models.kv.PersistedKvMetadata; import io.kestra.core.utils.TestsUtils; -import io.kestra.core.junit.annotations.KestraTest; import io.micronaut.data.model.Pageable; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -18,7 +18,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractKvMetadataRepositoryTest { @Inject protected KvMetadataRepositoryInterface kvMetadataRepositoryInterface; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java index 32b50b0765..ed96af587f 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java @@ -1,7 +1,6 @@ package io.kestra.core.repositories; import io.kestra.core.exceptions.InvalidQueryFiltersException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.QueryFilter; import io.kestra.core.models.QueryFilter.Field; import io.kestra.core.models.QueryFilter.Op; @@ -14,9 +13,9 @@ import io.kestra.core.models.flows.State; import io.kestra.core.repositories.ExecutionRepositoryInterface.ChildFilter; import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; -import io.kestra.plugin.core.dashboard.data.Executions; import io.kestra.plugin.core.dashboard.data.Logs; import io.micronaut.data.model.Pageable; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -37,7 +36,7 @@ import static io.kestra.core.models.flows.FlowScope.USER; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest(transactional = false) public abstract class AbstractLogRepositoryTest { @Inject protected LogRepositoryInterface logRepository; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java index 4f25aacc8e..0b736b335c 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java @@ -10,10 +10,9 @@ import io.kestra.core.models.executions.metrics.MetricAggregations; import io.kestra.core.models.executions.metrics.Timer; import io.kestra.core.utils.TestsUtils; import io.micronaut.data.model.Pageable; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; -import org.slf4j.event.Level; import java.time.Duration; import java.time.ZonedDateTime; @@ -21,7 +20,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractMetricRepositoryTest { @Inject protected MetricRepositoryInterface metricRepository; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractNamespaceFileMetadataRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractNamespaceFileMetadataRepositoryTest.java index 17bada75be..cb405b0c2c 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractNamespaceFileMetadataRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractNamespaceFileMetadataRepositoryTest.java @@ -1,11 +1,11 @@ package io.kestra.core.repositories; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.FetchVersion; import io.kestra.core.models.QueryFilter; import io.kestra.core.models.namespaces.files.NamespaceFileMetadata; import io.kestra.core.utils.TestsUtils; import io.micronaut.data.model.Pageable; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -21,7 +21,7 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest(transactional = false) public abstract class AbstractNamespaceFileMetadataRepositoryTest { @Inject protected NamespaceFileMetadataRepositoryInterface namespaceFileMetadataRepositoryInterface; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractSettingRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractSettingRepositoryTest.java index be4975341e..bd31ed8ab1 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractSettingRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractSettingRepositoryTest.java @@ -2,8 +2,8 @@ package io.kestra.core.repositories; import io.kestra.core.models.Setting; import io.kestra.core.utils.IdUtils; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.utils.VersionProvider; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractSettingRepositoryTest { @Inject protected SettingRepositoryInterface settingRepository; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java index e4a0598abf..2e57464cb4 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java @@ -10,7 +10,7 @@ import io.kestra.plugin.core.debug.Return; import io.kestra.core.utils.IdUtils; import io.micronaut.context.event.ApplicationEventListener; import io.micronaut.data.model.Pageable; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.inject.Singleton; import java.time.Duration; @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -30,7 +29,7 @@ import org.slf4j.LoggerFactory; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public abstract class AbstractTemplateRepositoryTest { @Inject protected TemplateRepositoryInterface templateRepository; diff --git a/core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java b/core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java index a8ec0a8e62..4821f1a42a 100644 --- a/core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java +++ b/core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java @@ -12,6 +12,7 @@ import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.micronaut.data.model.Pageable; import io.micronaut.data.model.Sort; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,7 +29,7 @@ import static io.kestra.core.models.flows.FlowScope.USER; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest(transactional = false) public abstract class AbstractTriggerRepositoryTest { private static final String TEST_NAMESPACE = "io.kestra.unittest"; diff --git a/core/src/test/java/io/kestra/core/runners/FlowInputOutputTest.java b/core/src/test/java/io/kestra/core/runners/FlowInputOutputTest.java index 7aa8649ebd..525a6634f1 100644 --- a/core/src/test/java/io/kestra/core/runners/FlowInputOutputTest.java +++ b/core/src/test/java/io/kestra/core/runners/FlowInputOutputTest.java @@ -22,6 +22,7 @@ import io.micronaut.http.MediaType; import io.micronaut.http.multipart.CompletedFileUpload; import io.micronaut.http.multipart.CompletedPart; import io.micronaut.test.annotation.MockBean; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.Assertions; @@ -42,7 +43,7 @@ import java.util.Optional; import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class FlowInputOutputTest { private static final String TEST_SECRET_VALUE = "test-secret-value"; diff --git a/core/src/test/java/io/kestra/core/runners/RunVariablesTest.java b/core/src/test/java/io/kestra/core/runners/RunVariablesTest.java index 2887ca0b35..5e1d1fcd0c 100644 --- a/core/src/test/java/io/kestra/core/runners/RunVariablesTest.java +++ b/core/src/test/java/io/kestra/core/runners/RunVariablesTest.java @@ -1,6 +1,5 @@ package io.kestra.core.runners; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.executions.Execution; import io.kestra.core.models.flows.DependsOn; import io.kestra.core.models.flows.Flow; @@ -24,6 +23,7 @@ import io.kestra.core.utils.IdUtils; import io.micrometer.core.instrument.MeterRegistry; import io.micronaut.context.ApplicationContext; import io.micronaut.test.annotation.MockBean; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.Assertions; @@ -36,7 +36,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class RunVariablesTest { @Inject diff --git a/core/src/test/java/io/kestra/core/runners/VariableRendererTest.java b/core/src/test/java/io/kestra/core/runners/VariableRendererTest.java index dd3987de1a..19c7b56abd 100644 --- a/core/src/test/java/io/kestra/core/runners/VariableRendererTest.java +++ b/core/src/test/java/io/kestra/core/runners/VariableRendererTest.java @@ -1,8 +1,8 @@ package io.kestra.core.runners; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.micronaut.context.ApplicationContext; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class VariableRendererTest { @Inject diff --git a/core/src/test/java/io/kestra/core/runners/pebble/PebbleVariableRendererTest.java b/core/src/test/java/io/kestra/core/runners/pebble/PebbleVariableRendererTest.java index a0795701a6..2713eca1e3 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/PebbleVariableRendererTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/PebbleVariableRendererTest.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.utils.Rethrow; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; @@ -18,7 +18,7 @@ import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class PebbleVariableRendererTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/RecursivePebbleVariableRendererTest.java b/core/src/test/java/io/kestra/core/runners/pebble/RecursivePebbleVariableRendererTest.java index 39bd0a99ad..ef6def9820 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/RecursivePebbleVariableRendererTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/RecursivePebbleVariableRendererTest.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; import io.micronaut.context.annotation.Property; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest @Property(name = "kestra.variables.recursive-rendering", value = "true") class RecursivePebbleVariableRendererTest { @Inject diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/EncryptDecryptFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/EncryptDecryptFunctionTest.java index 7cb476d20b..c394f4f3c9 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/EncryptDecryptFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/EncryptDecryptFunctionTest.java @@ -3,7 +3,7 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; import io.micronaut.context.annotation.Value; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -13,7 +13,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class EncryptDecryptFunctionTest { @Inject private VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/ErrorLogsFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/ErrorLogsFunctionTest.java index 7fa09143f3..b0d84d4d21 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/ErrorLogsFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/ErrorLogsFunctionTest.java @@ -1,11 +1,11 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.executions.LogEntry; import io.kestra.core.repositories.LogRepositoryInterface; import io.kestra.core.runners.VariableRenderer; import io.micronaut.context.annotation.Property; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -18,7 +18,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest @Property(name = "kestra.server-type", value = "WORKER") @Execution(ExecutionMode.SAME_THREAD) class ErrorLogsFunctionTest { diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FetchContextFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FetchContextFunctionTest.java index 1d574a1ded..0f7b1411c1 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FetchContextFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FetchContextFunctionTest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.serializers.JacksonMapper; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -13,7 +13,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class FetchContextFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileExistsFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileExistsFunctionTest.java index 32f1e00140..fa424ccb8a 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileExistsFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileExistsFunctionTest.java @@ -1,16 +1,15 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.LocalPath; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.storages.Namespace; import io.kestra.core.storages.NamespaceFactory; -import io.kestra.core.storages.StorageContext; import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.micronaut.context.annotation.Property; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -30,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; @Execution(ExecutionMode.SAME_THREAD) -@KestraTest(rebuildContext = true) +@MicronautTest(rebuildContext = true) class FileExistsFunctionTest { private static final String NAMESPACE = "my.namespace"; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileSizeFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileSizeFunctionTest.java index e6db8cbb3d..1be57f2a01 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileSizeFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileSizeFunctionTest.java @@ -1,16 +1,15 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.LocalPath; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.storages.Namespace; import io.kestra.core.storages.NamespaceFactory; -import io.kestra.core.storages.StorageContext; import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.micronaut.context.annotation.Property; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -27,10 +26,9 @@ import org.junit.jupiter.api.parallel.ExecutionMode; import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.validator.internal.util.Contracts.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest(rebuildContext = true) +@MicronautTest(rebuildContext = true) @Execution(ExecutionMode.SAME_THREAD) public class FileSizeFunctionTest { private static final String FLOW = "flow"; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileURIFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileURIFunctionTest.java index 21917520ef..3d41ffe446 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FileURIFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FileURIFunctionTest.java @@ -5,14 +5,14 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; import jakarta.inject.Inject; -@KestraTest +@MicronautTest class FileURIFunctionTest { @Inject private VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FromIonFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FromIonFunctionTest.java index 6292773a8c..bb4fd361c5 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FromIonFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FromIonFunctionTest.java @@ -2,11 +2,11 @@ package io.kestra.core.runners.pebble.functions; import com.google.common.collect.ImmutableMap; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.serializers.FileSerde; import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class FromIonFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/FromJsonFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/FromJsonFunctionTest.java index bf227d97a0..06e6617edb 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/FromJsonFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/FromJsonFunctionTest.java @@ -2,7 +2,7 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; import java.util.Map; @@ -11,7 +11,7 @@ import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest class FromJsonFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/HttpFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/HttpFunctionTest.java index 638e69353b..aebb67c45b 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/HttpFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/HttpFunctionTest.java @@ -6,8 +6,8 @@ import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.junit5.WireMockTest; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.serializers.JacksonMapper; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.pebbletemplates.pebble.error.PebbleException; import jakarta.inject.Inject; import org.apache.hc.client5.http.utils.Base64; @@ -25,7 +25,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertThrows; -@KestraTest +@MicronautTest @WireMockTest(httpPort = 28182) @Execution(ExecutionMode.SAME_THREAD) class HttpFunctionTest { diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/IDFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/IDFunctionTest.java index 77c07ec1a9..d590bf78e4 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/IDFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/IDFunctionTest.java @@ -3,13 +3,13 @@ package io.kestra.core.runners.pebble.functions; import static org.assertj.core.api.Assertions.assertThat; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import java.util.Collections; import org.junit.jupiter.api.Test; -@KestraTest +@MicronautTest class IDFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/IsFileEmptyFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/IsFileEmptyFunctionTest.java index dbf884ac6e..21f2e20398 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/IsFileEmptyFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/IsFileEmptyFunctionTest.java @@ -1,7 +1,6 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.LocalPath; import io.kestra.core.runners.VariableRenderer; import io.kestra.core.storages.Namespace; @@ -9,6 +8,7 @@ import io.kestra.core.storages.NamespaceFactory; import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; import io.micronaut.context.annotation.Property; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -@KestraTest(rebuildContext = true) +@MicronautTest(rebuildContext = true) @Execution(ExecutionMode.SAME_THREAD) class IsFileEmptyFunctionTest { diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/KSUIDFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/KSUIDFunctionTest.java index 59ba6c4eb0..e90abaf56e 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/KSUIDFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/KSUIDFunctionTest.java @@ -3,14 +3,14 @@ package io.kestra.core.runners.pebble.functions; import static org.assertj.core.api.Assertions.assertThat; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import java.util.Collections; import java.util.regex.Pattern; import org.junit.jupiter.api.Test; -@KestraTest +@MicronautTest class KSUIDFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/NanoIDFuntionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/NanoIDFuntionTest.java index 2794962d1d..ecb4e4f218 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/NanoIDFuntionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/NanoIDFuntionTest.java @@ -1,7 +1,7 @@ package io.kestra.core.runners.pebble.functions; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public class NanoIDFuntionTest { @Inject diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomIntFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomIntFunctionTest.java index 908c364ee8..f717b29365 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomIntFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomIntFunctionTest.java @@ -4,14 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import java.util.Collections; import java.util.Map; import org.junit.jupiter.api.Test; -@KestraTest +@MicronautTest class RandomIntFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomPortFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomPortFunctionTest.java index b8c17b2549..bdb9ab671f 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomPortFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/RandomPortFunctionTest.java @@ -1,8 +1,8 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class RandomPortFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/ReadFileFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/ReadFileFunctionTest.java index b59214d20f..4f90d3b626 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/ReadFileFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/ReadFileFunctionTest.java @@ -10,8 +10,7 @@ import io.kestra.core.storages.StorageInterface; import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.micronaut.context.annotation.Property; -import io.kestra.core.junit.annotations.KestraTest; -import io.pebbletemplates.pebble.error.PebbleException; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,7 +33,7 @@ import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest(rebuildContext = true) +@MicronautTest(rebuildContext = true) @Property(name="kestra.server-type", value="WORKER") @Execution(ExecutionMode.SAME_THREAD) class ReadFileFunctionTest { diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderFunctionTest.java index a692b0866f..3a457b7941 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderFunctionTest.java @@ -2,7 +2,7 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -11,7 +11,7 @@ import java.time.*; import java.util.HashMap; import java.util.Map; -@KestraTest +@MicronautTest class RenderFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderOncerFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderOncerFunctionTest.java index 1697ddd777..23038eaaa7 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderOncerFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/RenderOncerFunctionTest.java @@ -2,14 +2,14 @@ package io.kestra.core.runners.pebble.functions; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Map; -@KestraTest +@MicronautTest class RenderOncerFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/UUIDFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/UUIDFunctionTest.java index 0b8676f080..ecac8a4581 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/UUIDFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/UUIDFunctionTest.java @@ -3,13 +3,13 @@ package io.kestra.core.runners.pebble.functions; import static org.assertj.core.api.Assertions.assertThat; import io.kestra.core.exceptions.IllegalVariableEvaluationException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.runners.VariableRenderer; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import java.util.Collections; import org.junit.jupiter.api.Test; -@KestraTest +@MicronautTest class UUIDFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/runners/pebble/functions/YamlFunctionTest.java b/core/src/test/java/io/kestra/core/runners/pebble/functions/YamlFunctionTest.java index 6ce5b076ce..cc5a33c67f 100644 --- a/core/src/test/java/io/kestra/core/runners/pebble/functions/YamlFunctionTest.java +++ b/core/src/test/java/io/kestra/core/runners/pebble/functions/YamlFunctionTest.java @@ -3,13 +3,13 @@ package io.kestra.core.runners.pebble.functions; import com.google.common.collect.ImmutableMap; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.VariableRenderer; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class YamlFunctionTest { @Inject VariableRenderer variableRenderer; diff --git a/core/src/test/java/io/kestra/core/serializers/ObjectMapperFactoryTest.java b/core/src/test/java/io/kestra/core/serializers/ObjectMapperFactoryTest.java index 9b860d1733..be5b4dda65 100644 --- a/core/src/test/java/io/kestra/core/serializers/ObjectMapperFactoryTest.java +++ b/core/src/test/java/io/kestra/core/serializers/ObjectMapperFactoryTest.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import lombok.Data; import lombok.NoArgsConstructor; import org.junit.jupiter.api.Test; @@ -14,7 +15,7 @@ import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class ObjectMapperFactoryTest { @Inject ObjectMapper objectMapper; diff --git a/core/src/test/java/io/kestra/core/storages/InternalKVStoreTest.java b/core/src/test/java/io/kestra/core/storages/InternalKVStoreTest.java index ff6d7f53b1..1fe819553f 100644 --- a/core/src/test/java/io/kestra/core/storages/InternalKVStoreTest.java +++ b/core/src/test/java/io/kestra/core/storages/InternalKVStoreTest.java @@ -1,7 +1,6 @@ package io.kestra.core.storages; import io.kestra.core.exceptions.ResourceExpiredException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.repositories.KvMetadataRepositoryInterface; import io.kestra.core.serializers.JacksonMapper; import io.kestra.core.storages.kv.InternalKVStore; @@ -12,6 +11,7 @@ import io.kestra.core.storages.kv.KVValueAndMetadata; import io.kestra.core.storages.kv.KVValue; import io.kestra.core.tenant.TenantService; import io.kestra.core.utils.IdUtils; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; import static org.junit.jupiter.api.Assertions.assertTrue; -@KestraTest +@MicronautTest class InternalKVStoreTest { private static final Instant date = Instant.now().truncatedTo(ChronoUnit.MILLIS); private static final Map complexValue = Map.of("some", "complex", "object", Map.of("with", "nested", "values", date)); diff --git a/core/src/test/java/io/kestra/core/storages/InternalNamespaceTest.java b/core/src/test/java/io/kestra/core/storages/InternalNamespaceTest.java index 0c5e10e75f..41abe7ebda 100644 --- a/core/src/test/java/io/kestra/core/storages/InternalNamespaceTest.java +++ b/core/src/test/java/io/kestra/core/storages/InternalNamespaceTest.java @@ -1,14 +1,11 @@ package io.kestra.core.storages; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.repositories.NamespaceFileMetadataRepositoryInterface; -import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.PathMatcherPredicate; import io.kestra.core.utils.TestsUtils; -import io.kestra.storage.local.LocalStorage; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,14 +14,13 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class InternalNamespaceTest { private static final Logger logger = LoggerFactory.getLogger(InternalNamespaceTest.class); @@ -34,9 +30,6 @@ class InternalNamespaceTest { @Inject private NamespaceFileMetadataRepositoryInterface namespaceFileMetadataRepository; - - @Inject - private NamespaceFactory namespaceFactory; @Test void shouldGetAllNamespaceFiles() throws IOException, URISyntaxException { diff --git a/core/src/test/java/io/kestra/core/storages/StorageInterfaceFactoryTest.java b/core/src/test/java/io/kestra/core/storages/StorageInterfaceFactoryTest.java index 3a30d77740..44f32b8a21 100644 --- a/core/src/test/java/io/kestra/core/storages/StorageInterfaceFactoryTest.java +++ b/core/src/test/java/io/kestra/core/storages/StorageInterfaceFactoryTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import io.kestra.core.exceptions.KestraRuntimeException; import io.kestra.storage.local.LocalStorage; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Assertions; @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; -@KestraTest +@MicronautTest class StorageInterfaceFactoryTest { @Inject diff --git a/core/src/test/java/io/kestra/core/tasks/PluginUtilsServiceTest.java b/core/src/test/java/io/kestra/core/tasks/PluginUtilsServiceTest.java index a14ec5e913..ab2496b33c 100644 --- a/core/src/test/java/io/kestra/core/tasks/PluginUtilsServiceTest.java +++ b/core/src/test/java/io/kestra/core/tasks/PluginUtilsServiceTest.java @@ -3,8 +3,7 @@ package io.kestra.core.tasks; import io.kestra.core.context.TestRunContextFactory; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.models.tasks.runners.PluginUtilsService; -import io.kestra.core.runners.RunContextFactory; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -18,7 +17,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@KestraTest +@MicronautTest public class PluginUtilsServiceTest { @Inject private TestRunContextFactory runContextFactory; diff --git a/core/src/test/java/io/kestra/core/tenant/TenantServiceTest.java b/core/src/test/java/io/kestra/core/tenant/TenantServiceTest.java index f91242ae6f..455f702412 100644 --- a/core/src/test/java/io/kestra/core/tenant/TenantServiceTest.java +++ b/core/src/test/java/io/kestra/core/tenant/TenantServiceTest.java @@ -1,12 +1,12 @@ package io.kestra.core.tenant; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class TenantServiceTest { @Inject private TenantService tenantService; diff --git a/core/src/test/java/io/kestra/core/test/AssertionTest.java b/core/src/test/java/io/kestra/core/test/AssertionTest.java index 4bf8e6b096..03f99134f4 100644 --- a/core/src/test/java/io/kestra/core/test/AssertionTest.java +++ b/core/src/test/java/io/kestra/core/test/AssertionTest.java @@ -1,10 +1,10 @@ package io.kestra.core.test; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.property.Property; import io.kestra.core.runners.RunContextFactory; import io.kestra.core.test.flow.Assertion; import io.kestra.core.test.flow.AssertionResult; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import static io.kestra.core.test.flow.Assertion.Operator.EQUAL_TO; import static io.kestra.core.test.flow.Assertion.Operator.IS_NOT_NULL; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class AssertionTest { @Inject diff --git a/core/src/test/java/io/kestra/core/topologies/FlowTopologyServiceTest.java b/core/src/test/java/io/kestra/core/topologies/FlowTopologyServiceTest.java index 64ce9017d9..a3e9f19526 100644 --- a/core/src/test/java/io/kestra/core/topologies/FlowTopologyServiceTest.java +++ b/core/src/test/java/io/kestra/core/topologies/FlowTopologyServiceTest.java @@ -14,7 +14,7 @@ import io.kestra.plugin.core.debug.Return; import io.kestra.plugin.core.flow.Parallel; import io.kestra.plugin.core.flow.Subflow; import io.kestra.core.utils.TestsUtils; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class FlowTopologyServiceTest { @Inject diff --git a/core/src/test/java/io/kestra/core/topologies/FlowTopologyTest.java b/core/src/test/java/io/kestra/core/topologies/FlowTopologyTest.java index b9567a05ce..30de43eb27 100644 --- a/core/src/test/java/io/kestra/core/topologies/FlowTopologyTest.java +++ b/core/src/test/java/io/kestra/core/topologies/FlowTopologyTest.java @@ -1,18 +1,15 @@ package io.kestra.core.topologies; import io.kestra.core.exceptions.FlowProcessingException; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.flows.FlowWithSource; import io.kestra.core.models.topologies.FlowNode; import io.kestra.core.models.topologies.FlowTopology; import io.kestra.core.models.topologies.FlowTopologyGraph; -import io.kestra.core.repositories.FlowRepositoryInterface; import io.kestra.core.repositories.FlowTopologyRepositoryInterface; import io.kestra.core.services.FlowService; import io.kestra.core.utils.IdUtils; -import io.kestra.plugin.core.execution.AssertTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; -import jakarta.validation.constraints.AssertTrue; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -20,7 +17,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest public class FlowTopologyTest { @Inject private FlowService flowService; diff --git a/core/src/test/java/io/kestra/core/utils/NamespaceFilesUtilsTest.java b/core/src/test/java/io/kestra/core/utils/NamespaceFilesUtilsTest.java index 325822eae5..a7c80221f2 100644 --- a/core/src/test/java/io/kestra/core/utils/NamespaceFilesUtilsTest.java +++ b/core/src/test/java/io/kestra/core/utils/NamespaceFilesUtilsTest.java @@ -12,6 +12,7 @@ import io.kestra.core.storages.Namespace; import io.kestra.core.storages.NamespaceFactory; import io.kestra.core.storages.StorageInterface; import io.kestra.plugin.core.log.Log; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import jakarta.inject.Named; import org.junit.jupiter.api.Test; @@ -31,7 +32,7 @@ import java.util.stream.Collectors; import static io.kestra.core.tenant.TenantService.MAIN_TENANT; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest @Execution(ExecutionMode.SAME_THREAD) class NamespaceFilesUtilsTest { @Inject diff --git a/core/src/test/java/io/kestra/core/utils/UriProviderTest.java b/core/src/test/java/io/kestra/core/utils/UriProviderTest.java index 5dc977afa7..d502428a39 100644 --- a/core/src/test/java/io/kestra/core/utils/UriProviderTest.java +++ b/core/src/test/java/io/kestra/core/utils/UriProviderTest.java @@ -1,7 +1,7 @@ package io.kestra.core.utils; import com.google.common.collect.ImmutableMap; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; import io.kestra.core.models.executions.Execution; import io.kestra.core.models.flows.Flow; @@ -10,7 +10,7 @@ import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; -@KestraTest +@MicronautTest class UriProviderTest { @Inject UriProvider uriProvider; diff --git a/jdbc-h2/src/test/java/reports/H2FeatureUsageReportTest.java b/jdbc-h2/src/test/java/reports/H2FeatureUsageReportTest.java index 731244f1e9..491dfb0cd4 100644 --- a/jdbc-h2/src/test/java/reports/H2FeatureUsageReportTest.java +++ b/jdbc-h2/src/test/java/reports/H2FeatureUsageReportTest.java @@ -1,9 +1,9 @@ package reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.reporter.reports.AbstractFeatureUsageReportTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class H2FeatureUsageReportTest extends AbstractFeatureUsageReportTest { - + } diff --git a/jdbc-h2/src/test/java/reports/H2ServiceUsageReportTest.java b/jdbc-h2/src/test/java/reports/H2ServiceUsageReportTest.java index c9d11f9d5f..3172957732 100644 --- a/jdbc-h2/src/test/java/reports/H2ServiceUsageReportTest.java +++ b/jdbc-h2/src/test/java/reports/H2ServiceUsageReportTest.java @@ -1,9 +1,9 @@ package reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.reporter.reports.AbstractServiceUsageReportTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class H2ServiceUsageReportTest extends AbstractServiceUsageReportTest { - + } diff --git a/jdbc-mysql/src/test/java/reports/MysqlFeatureUsageReportTest.java b/jdbc-mysql/src/test/java/reports/MysqlFeatureUsageReportTest.java index 15a7dc5195..de448dd212 100644 --- a/jdbc-mysql/src/test/java/reports/MysqlFeatureUsageReportTest.java +++ b/jdbc-mysql/src/test/java/reports/MysqlFeatureUsageReportTest.java @@ -1,9 +1,9 @@ package reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.reporter.reports.AbstractFeatureUsageReportTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class MysqlFeatureUsageReportTest extends AbstractFeatureUsageReportTest { - + } diff --git a/jdbc-mysql/src/test/java/reports/MysqlServiceUsageReportTest.java b/jdbc-mysql/src/test/java/reports/MysqlServiceUsageReportTest.java index 5e22389744..4624f4bf73 100644 --- a/jdbc-mysql/src/test/java/reports/MysqlServiceUsageReportTest.java +++ b/jdbc-mysql/src/test/java/reports/MysqlServiceUsageReportTest.java @@ -1,9 +1,9 @@ package reports; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.reporter.reports.AbstractServiceUsageReportTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class MysqlServiceUsageReportTest extends AbstractServiceUsageReportTest { } diff --git a/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresFeatureUsageReportTest.java b/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresFeatureUsageReportTest.java index 9bad1767f2..a90e9a560a 100644 --- a/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresFeatureUsageReportTest.java +++ b/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresFeatureUsageReportTest.java @@ -1,8 +1,8 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class PostgresFeatureUsageReportTest extends AbstractFeatureUsageReportTest { - + } diff --git a/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresServiceUsageReportTest.java b/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresServiceUsageReportTest.java index 86873b58a7..4095743541 100644 --- a/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresServiceUsageReportTest.java +++ b/jdbc-postgres/src/test/java/io/kestra/core/reporter/reports/PostgresServiceUsageReportTest.java @@ -1,8 +1,8 @@ package io.kestra.core.reporter.reports; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; -@KestraTest +@MicronautTest class PostgresServiceUsageReportTest extends AbstractServiceUsageReportTest { - + } diff --git a/webserver/src/test/java/io/kestra/webserver/controllers/api/BlueprintControllerTest.java b/webserver/src/test/java/io/kestra/webserver/controllers/api/BlueprintControllerTest.java index c997d09f16..102c220cb7 100644 --- a/webserver/src/test/java/io/kestra/webserver/controllers/api/BlueprintControllerTest.java +++ b/webserver/src/test/java/io/kestra/webserver/controllers/api/BlueprintControllerTest.java @@ -9,7 +9,7 @@ import io.micronaut.core.type.Argument; import io.micronaut.http.HttpRequest; import io.micronaut.http.client.HttpClient; import io.micronaut.http.client.annotation.Client; -import io.kestra.core.junit.annotations.KestraTest; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.emptyOrNullString; -@KestraTest +@MicronautTest @WireMockTest(httpPort = 28181) class BlueprintControllerTest { diff --git a/webserver/src/test/java/io/kestra/webserver/controllers/api/DashboardControllerTest.java b/webserver/src/test/java/io/kestra/webserver/controllers/api/DashboardControllerTest.java index 724085e21c..fc9f5e2c80 100644 --- a/webserver/src/test/java/io/kestra/webserver/controllers/api/DashboardControllerTest.java +++ b/webserver/src/test/java/io/kestra/webserver/controllers/api/DashboardControllerTest.java @@ -17,8 +17,8 @@ import io.micronaut.http.HttpResponse; import io.micronaut.http.MediaType; import io.micronaut.http.client.annotation.Client; import io.micronaut.http.client.exceptions.HttpClientResponseException; -import io.micronaut.http.exceptions.HttpStatusException; import io.micronaut.reactor.http.client.ReactorHttpClient; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/webserver/src/test/java/io/kestra/webserver/controllers/api/ErrorControllerTest.java b/webserver/src/test/java/io/kestra/webserver/controllers/api/ErrorControllerTest.java index 92ffc05ac7..4952977b76 100644 --- a/webserver/src/test/java/io/kestra/webserver/controllers/api/ErrorControllerTest.java +++ b/webserver/src/test/java/io/kestra/webserver/controllers/api/ErrorControllerTest.java @@ -6,7 +6,6 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import com.google.common.collect.ImmutableMap; -import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.flows.Flow; import io.kestra.core.serializers.JacksonMapper; import io.kestra.core.utils.IdUtils; @@ -18,6 +17,7 @@ import io.micronaut.http.client.annotation.Client; import io.micronaut.http.client.exceptions.HttpClientResponseException; import io.micronaut.http.hateoas.JsonError; import io.micronaut.reactor.http.client.ReactorHttpClient; +import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @SuppressWarnings("OptionalGetWithoutIsPresent") -@KestraTest +@MicronautTest class ErrorControllerTest { @Inject @Client("/") diff --git a/webserver/src/test/java/io/kestra/webserver/controllers/api/LogControllerTest.java b/webserver/src/test/java/io/kestra/webserver/controllers/api/LogControllerTest.java index d5755167b0..2bbb225e6d 100644 --- a/webserver/src/test/java/io/kestra/webserver/controllers/api/LogControllerTest.java +++ b/webserver/src/test/java/io/kestra/webserver/controllers/api/LogControllerTest.java @@ -1,6 +1,5 @@ package io.kestra.webserver.controllers.api; -import com.google.common.collect.ImmutableMap; import io.kestra.core.junit.annotations.KestraTest; import io.kestra.core.models.executions.*; import io.kestra.core.models.flows.State;