diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3837fe705..881bf52a5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,12 +44,12 @@ Examples: ### Test documentation -Please documented the test cases that you contribute by means of [Allure](http://allure.qatools.ru) annotations and proper test method naming. +Please documented the test cases that you contribute by means of [Allure](https://docs.qameta.io/allure/) annotations and proper test method naming. -All test classes are documented with [Allure's](https://github.com/allure-framework/allure-core/wiki/Features-and-Stories) **@Features** and **@Stories** annotations in the following format: +All test classes are documented with [Allure's](https://docs.qameta.io/allure/#_behaviours_mapping) **@Feature** and **@Story** annotations in the following format: ``` -@Features("TEST_TYPE - HAWKBIT_COMPONENT") -@Stories("Test class description") +@Feature("TEST_TYPE - HAWKBIT_COMPONENT") +@Story("Test class description") ``` Test types are: @@ -69,8 +69,8 @@ Examples for hawkBit components: * Security ```java -@Features("Component Tests - Management API") -@Stories("Distribution Set Type Resource") +@Feature("Component Tests - Management API") +@Story("Distribution Set Type Resource") ``` In addition all test method's name describes in **camel case** what the test is all about and has in addition a long description in Allures **@Description** annotation. diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml index cf943b110..e6d9fc090 100644 --- a/hawkbit-artifact-repository-filesystem/pom.xml +++ b/hawkbit-artifact-repository-filesystem/pom.xml @@ -46,8 +46,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java index b77e1ec0c..9d526348c 100644 --- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java +++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java @@ -19,12 +19,12 @@ import org.assertj.core.api.Assertions; import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Artifact File System Repository") -@Stories("Test storing artifact binaries in the file-system") +@Feature("Unit Tests - Artifact File System Repository") +@Story("Test storing artifact binaries in the file-system") public class ArtifactFilesystemRepositoryTest { private static final String TENANT = "test_tenant"; diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java index 827d57762..ab66519b3 100644 --- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java +++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java @@ -19,12 +19,12 @@ import org.assertj.core.api.Assertions; import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Artifact File System Repository") -@Stories("Test storing artifact binaries in the file-system") +@Feature("Unit Tests - Artifact File System Repository") +@Story("Test storing artifact binaries in the file-system") public class ArtifactFilesystemTest { @Test diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml index 176d70e9a..81fc9d559 100644 --- a/hawkbit-core/pom.xml +++ b/hawkbit-core/pom.xml @@ -44,8 +44,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java index 52aabc586..f7256c3d5 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java @@ -12,12 +12,12 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Artifact URL Handler") -@Stories("Base62 Utility tests") +@Feature("Unit Tests - Artifact URL Handler") +@Story("Base62 Utility tests") public class Base62UtilTest { @Test diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java index adccd0684..463701dd1 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java @@ -22,15 +22,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Tests for creating urls to download artifacts. */ -@Features("Unit Tests - Artifact URL Handler") -@Stories("Test to generate the artifact download URL") +@Feature("Unit Tests - Artifact URL Handler") +@Story("Test to generate the artifact download URL") @RunWith(MockitoJUnitRunner.class) public class PropertyBasedArtifactUrlHandlerTest { diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java index c0b8ad476..cfb94b4a7 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java @@ -23,12 +23,12 @@ import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.support.SimpleValueWrapper; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Cache") -@Stories("Download ID Cache") +@Feature("Unit Tests - Cache") +@Story("Download ID Cache") @RunWith(MockitoJUnitRunner.class) public class DefaultDownloadIdCacheTest { diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml index 283ca7d54..e0baa172f 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml @@ -79,8 +79,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java index 037381213..7596f0cbb 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java @@ -63,16 +63,16 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * * Test Amqp controller authentication. */ -@Features("Component Tests - Device Management Federation API") -@Stories("AmqpController Authentication Test") +@Feature("Component Tests - Device Management Federation API") +@Story("AmqpController Authentication Test") @RunWith(MockitoJUnitRunner.class) public class AmqpControllerAuthenticationTest { diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java index 099005c34..c37e870e3 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java @@ -62,13 +62,13 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.ActiveProfiles; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; @ActiveProfiles({ "test" }) -@Features("Component Tests - Device Management Federation API") -@Stories("AmqpMessage Dispatcher Service Test") +@Feature("Component Tests - Device Management Federation API") +@Story("AmqpMessage Dispatcher Service Test") @SpringApplicationConfiguration(classes = { RepositoryApplicationConfiguration.class }) public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java index 8379c279b..ac092af1d 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java @@ -69,13 +69,13 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.http.HttpStatus; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; @RunWith(MockitoJUnitRunner.class) -@Features("Component Tests - Device Management Federation API") -@Stories("AmqpMessage Handler Service Test") +@Feature("Component Tests - Device Management Federation API") +@Story("AmqpMessage Handler Service Test") public class AmqpMessageHandlerServiceTest { private static final String SHA1 = "12345"; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java index 16279e899..d05fb42a1 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java @@ -28,13 +28,13 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConversionException; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; @RunWith(MockitoJUnitRunner.class) -@Features("Component Tests - Device Management Federation API") -@Stories("Base Amqp Service Test") +@Feature("Component Tests - Device Management Federation API") +@Story("Base Amqp Service Test") public class BaseAmqpServiceTest { @Mock diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java index c677e74c5..80948d754 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java @@ -39,12 +39,12 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.http.HttpStatus; import org.springframework.util.StringUtils; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Device Management Federation API") -@Stories("Amqp Authentication Message Handler") +@Feature("Component Tests - Device Management Federation API") +@Story("Amqp Authentication Message Handler") @SpringApplicationConfiguration(classes = { RepositoryApplicationConfiguration.class, AmqpTestConfiguration.class, DmfApiConfiguration.class }) public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmqpIntegrationTest { diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java index 43753f557..35c2f4bff 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java @@ -34,12 +34,12 @@ import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents; import org.junit.Test; import org.springframework.amqp.core.Message; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Device Management Federation API") -@Stories("Amqp Message Dispatcher Service") +@Feature("Component Tests - Device Management Federation API") +@Story("Amqp Message Dispatcher Service") public class AmqpMessageDispatcherServiceIntegrationTest extends AmqpServiceIntegrationTest { private static final String TARGET_PREFIX = "Dmf_disp_"; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java index fb9175887..dffa16dba 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java @@ -51,13 +51,13 @@ import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.beans.factory.annotation.Autowired; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; -@Features("Component Tests - Device Management Federation API") -@Stories("Amqp Message Handler Service") +@Feature("Component Tests - Device Management Federation API") +@Story("Amqp Message Handler Service") public class AmqpMessageHandlerServiceIntegrationTest extends AmqpServiceIntegrationTest { private static final String CORRELATION_ID = UUID.randomUUID().toString(); private static final String TARGET_PREFIX = "Dmf_hand_"; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java index 819f179c3..72022ee9a 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java @@ -51,7 +51,7 @@ import org.springframework.amqp.rabbit.test.RabbitListenerTestHarness; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.SpringApplicationConfiguration; -import ru.yandex.qatools.allure.annotations.Step; +import io.qameta.allure.Step; /** * diff --git a/hawkbit-http-security/pom.xml b/hawkbit-http-security/pom.xml index c65748775..3a02d2020 100644 --- a/hawkbit-http-security/pom.xml +++ b/hawkbit-http-security/pom.xml @@ -52,8 +52,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java index e43bd1eca..8a423a920 100644 --- a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java +++ b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java @@ -23,12 +23,12 @@ import org.springframework.security.authentication.InsufficientAuthenticationExc import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Security") -@Stories("PreAuthToken Source TrustAuthentication Provider Test") +@Feature("Unit Tests - Security") +@Story("PreAuthToken Source TrustAuthentication Provider Test") @RunWith(MockitoJUnitRunner.class) // TODO: create description annotations public class PreAuthTokenSourceTrustAuthenticationProviderTest { diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml index c51e262ae..34454a7b8 100644 --- a/hawkbit-repository/hawkbit-repository-api/pom.xml +++ b/hawkbit-repository/hawkbit-repository-api/pom.xml @@ -54,8 +54,8 @@ - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java index b22836540..e92d0f97b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java @@ -19,12 +19,12 @@ import org.junit.Test; import com.cronutils.model.Cron; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Maintenance Schedule Utility") +@Feature("Unit Tests - Repository") +@Story("Maintenance Schedule Utility") public class MaintenanceScheduleHelperTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java index 135e01570..c85e15a7b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java @@ -25,12 +25,12 @@ import org.springframework.security.access.prepost.PreAuthorize; import com.google.common.reflect.ClassPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Security Test") +@Feature("Unit Tests - Repository") +@Story("Security Test") public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { private static final Set METHOD_SECURITY_EXCLUSION = new HashSet<>(); diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml index 77a02fbea..87696f193 100644 --- a/hawkbit-repository/hawkbit-repository-core/pom.xml +++ b/hawkbit-repository/hawkbit-repository-core/pom.xml @@ -58,8 +58,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java b/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java index 6a7585dd1..e4e90ad0d 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java +++ b/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java @@ -27,7 +27,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.converter.MessageConversionException; -import ru.yandex.qatools.allure.annotations.Description; +import io.qameta.allure.Description; @RunWith(MockitoJUnitRunner.class) public class BusProtoStuffMessageConverterTest { diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml index aabe8c2b3..b1bc5d747 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml @@ -99,8 +99,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java index c5f887273..0eb69ea2d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java @@ -16,15 +16,15 @@ import java.util.Arrays; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Entity Id Events") +@Feature("Component Tests - Repository") +@Story("Entity Id Events") public class RemoteIdEventTest extends AbstractRemoteEventTest { private static final long ENTITY_ID = 1L; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java index e71e1f93a..4331008ac 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java @@ -22,12 +22,12 @@ import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.Target; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RemoteTenantAwareEvent Tests") +@Feature("Component Tests - Repository") +@Story("RemoteTenantAwareEvent Tests") public class RemoteTenantAwareEventTest extends AbstractRemoteEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java index c75195c2b..38bf6da21 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java @@ -15,14 +15,14 @@ import java.lang.reflect.Constructor; import org.eclipse.hawkbit.repository.event.remote.AbstractRemoteEventTest; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Entity Events") +@Feature("Component Tests - Repository") +@Story("Entity Events") public abstract class AbstractRemoteEntityEventTest extends AbstractRemoteEventTest { protected RemoteEntityEvent assertAndCreateRemoteEvent(final Class> eventType) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java index 796d93dab..93b90783e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java @@ -21,15 +21,15 @@ import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.Target; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test ActionCreatedEvent and ActionUpdatedEvent") +@Feature("Component Tests - Repository") +@Story("Test ActionCreatedEvent and ActionUpdatedEvent") public class ActionEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java index cfe9dbbb3..af69ff897 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java @@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test DistributionSetCreatedEvent") +@Feature("Component Tests - Repository") +@Story("Test DistributionSetCreatedEvent") public class DistributionSetCreatedEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java index 3dab35d75..b58be7649 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java @@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity; import org.eclipse.hawkbit.repository.model.DistributionSetTag; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test DistributionSetTagCreatedEvent and DistributionSetTagUpdateEvent") +@Feature("Component Tests - Repository") +@Story("Test DistributionSetTagCreatedEvent and DistributionSetTagUpdateEvent") public class DistributionSetTagEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java index cb9b3aae7..3b5a5f4b6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java @@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test DistributionSetUpdateEvent") +@Feature("Component Tests - Repository") +@Story("Test DistributionSetUpdateEvent") public class DistributionSetUpdatedEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java index 048753ac7..fbffd41c3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java @@ -14,15 +14,15 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessCond import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test RolloutUpdatedEvent") +@Feature("Component Tests - Repository") +@Story("Test RolloutUpdatedEvent") public class RolloutEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java index 017138c5b..b4e239ead 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java @@ -21,15 +21,15 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessCond import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test RolloutGroupCreatedEvent and RolloutGroupUpdatedEvent") +@Feature("Component Tests - Repository") +@Story("Test RolloutGroupCreatedEvent and RolloutGroupUpdatedEvent") public class RolloutGroupEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java index dbeef9fb1..592217a33 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java @@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test SoftwareModuleCreatedEvent, SoftwareModuleUpdatedEvent") +@Feature("Component Tests - Repository") +@Story("Test SoftwareModuleCreatedEvent, SoftwareModuleUpdatedEvent") public class SoftwareModuleEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java index 581796b75..bc409c6c7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java @@ -13,15 +13,15 @@ import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.hawkbit.repository.model.Target; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test TargetCreatedEvent, TargetUpdatedEvent and CancelTargetAssignmentEvent") +@Feature("Component Tests - Repository") +@Story("Test TargetCreatedEvent, TargetUpdatedEvent and CancelTargetAssignmentEvent") public class TargetEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java index d24134990..499545650 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java @@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity; import org.eclipse.hawkbit.repository.model.TargetTag; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the remote entity events. */ -@Features("Component Tests - Repository") -@Stories("Test TargetTagCreatedEvent and TargetTagUpdateEvent") +@Feature("Component Tests - Repository") +@Story("Test TargetTagCreatedEvent and TargetTagUpdateEvent") public class TargetTagEventTest extends AbstractRemoteEntityEventTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java index 2b1725db5..6104f3166 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java @@ -14,12 +14,12 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaAction; import org.eclipse.hawkbit.repository.model.Action.ActionType; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Deployment Management") +@Feature("Unit Tests - Repository") +@Story("Deployment Management") public class ActionTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java index 628e82a6f..0c180df05 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java @@ -40,15 +40,15 @@ import org.junit.Test; import com.google.common.collect.Lists; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test class for {@link ArtifactManagement}. */ -@Features("Component Tests - Repository") -@Stories("Artifact Management") +@Feature("Component Tests - Repository") +@Story("Artifact Management") public class ArtifactManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java index e6ac27da5..560594595 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java @@ -61,13 +61,13 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Controller Management") +@Feature("Component Tests - Repository") +@Story("Controller Management") public class ControllerManagementTest extends AbstractJpaIntegrationTest { @Autowired diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java index 79fbcf9d4..b5bf84b03 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java @@ -72,17 +72,17 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test class testing the functionality of triggering a deployment of * {@link DistributionSet}s to {@link Target}s. * */ -@Features("Component Tests - Repository") -@Stories("Deployment Management") +@Feature("Component Tests - Repository") +@Story("Deployment Management") public class DeploymentManagementTest extends AbstractJpaIntegrationTest { private EventHandlerStub eventHandlerStub; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java index 8d316d45b..2f51a3aa6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java @@ -56,17 +56,17 @@ import org.springframework.data.domain.PageRequest; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * {@link DistributionSetManagement} tests. * */ -@Features("Component Tests - Repository") -@Stories("DistributionSet Management") +@Feature("Component Tests - Repository") +@Story("DistributionSet Management") public class DistributionSetManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java index 4763e69ec..a6c07a545 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java @@ -32,16 +32,16 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect; import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * {@link DistributionSetTagManagement} tests. * */ -@Features("Component Tests - Repository") -@Stories("DistributionSet Tag Management") +@Feature("Component Tests - Repository") +@Story("DistributionSet Tag Management") public class DistributionSetTagManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java index 2f42ac569..4c694e9fa 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java @@ -37,17 +37,17 @@ import org.junit.Test; import com.google.common.collect.Sets; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * {@link DistributionSetManagement} tests. * */ -@Features("Component Tests - Repository") -@Stories("DistributionSet Management") +@Feature("Component Tests - Repository") +@Story("DistributionSet Management") public class DistributionSetTypeManagementTest extends AbstractJpaIntegrationTest { @Test @Description("Verifies that management get access react as specfied on calls for non existing entities by means " diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java index f4e663fa9..23a0a8d01 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java @@ -21,16 +21,16 @@ import org.junit.Test; import org.springframework.dao.ConcurrencyFailureException; import org.springframework.dao.UncategorizedDataAccessException; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Mapping tests for {@link HawkBitEclipseLinkJpaDialect}. * */ -@Features("Unit Tests - Repository") -@Stories("Exception handling") +@Feature("Unit Tests - Repository") +@Story("Exception handling") public class HawkBitEclipseLinkJpaDialectTest { private final HawkBitEclipseLinkJpaDialect hawkBitEclipseLinkJpaDialectUnderTest = new HawkBitEclipseLinkJpaDialect(); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java index 9c27a1dde..872daf9b7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java @@ -22,12 +22,12 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.TestPropertySource; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Controller Management") +@Feature("Component Tests - Repository") +@Story("Controller Management") @TestPropertySource(locations = "classpath:/jpa-test.properties", properties = { "hawkbit.server.repository.eagerPollPersistence=false", "hawkbit.server.repository.pollPersistenceFlushTime=1000" }) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java index 00117c88e..f302d550a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java @@ -22,12 +22,12 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Rollout Management") +@Feature("Component Tests - Repository") +@Story("Rollout Management") public class RolloutGroupManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java index 50fe67e9a..ca1e5f1bb 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java @@ -76,20 +76,16 @@ import org.springframework.data.domain.Slice; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; -import ru.yandex.qatools.allure.annotations.Title; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Junit tests for RolloutManagment. */ -@Features("Component Tests - Repository") -@Stories("Rollout Management") +@Feature("Component Tests - Repository") +@Story("Rollout Management") public class RolloutManagementTest extends AbstractJpaIntegrationTest { @Before @@ -298,7 +294,7 @@ public class RolloutManagementTest extends AbstractJpaIntegrationTest { } @Test - @Title("Deleting targets of a rollout") + // @Title("Deleting targets of a rollout") @Description("Verfiying that next group is started when targets of the group have been deleted.") public void checkRunningRolloutsStartsNextGroupIfTargetsDeleted() { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java index 06afdec43..6856eb1a4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java @@ -48,12 +48,12 @@ import org.springframework.data.domain.PageRequest; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Software Module Management") +@Feature("Component Tests - Repository") +@Story("Software Module Management") public class SoftwareModuleManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java index 0dd0e16dd..e5740d631 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java @@ -25,12 +25,12 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect; import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Software Module Management") +@Feature("Component Tests - Repository") +@Story("Software Module Management") public class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java index 8eefabc41..4de21ee05 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java @@ -22,12 +22,12 @@ import org.eclipse.hawkbit.repository.report.model.TenantUsage; import org.eclipse.hawkbit.repository.test.util.WithSpringAuthorityRule; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("System Management") +@Feature("Component Tests - Repository") +@Story("System Management") public class SystemManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java index dee9892cb..27fbcbb9f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java @@ -37,16 +37,16 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test class for {@link TargetFilterQueryManagement}. * */ -@Features("Component Tests - Repository") -@Stories("Target Filter Query Management") +@Feature("Component Tests - Repository") +@Story("Target Filter Query Management") public class TargetFilterQueryManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java index 0425fcbbe..1dc8765b8 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java @@ -33,13 +33,13 @@ import org.springframework.data.domain.Slice; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Target Management Searches") +@Feature("Component Tests - Repository") +@Story("Target Management Searches") public class TargetManagementSearchTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java index 85f7015e1..f5c086d71 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java @@ -59,13 +59,13 @@ import org.springframework.data.domain.PageRequest; import com.google.common.collect.Iterables; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Target Management") +@Feature("Component Tests - Repository") +@Story("Target Management") public class TargetManagementTest extends AbstractJpaIntegrationTest { private static final String WHITESPACE_ERROR = "target with whitespaces in controller id should not be created"; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java index f3dded343..49c75c054 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java @@ -35,17 +35,17 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect; import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Test class for {@link TargetTagManagement}. * */ -@Features("Component Tests - Repository") -@Stories("Target Tag Management") +@Feature("Component Tests - Repository") +@Story("Target Tag Management") public class TargetTagManagementTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java index 741d2bfdf..dd7c21149 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java @@ -26,12 +26,12 @@ import org.junit.Test; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Tenant Configuration Management") +@Feature("Component Tests - Repository") +@Story("Tenant Configuration Management") public class TenantConfigurationManagementTest extends AbstractJpaIntegrationTest implements EnvironmentAware { private Environment environment = null; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java index ab7238163..7771078dc 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java @@ -27,17 +27,17 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Slice; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Test class for {@link AutoAssignChecker}. * */ -@Features("Component Tests - Repository") -@Stories("Auto assign checker") +@Feature("Component Tests - Repository") +@Story("Auto assign checker") public class AutoAssignCheckerTest extends AbstractJpaIntegrationTest { @Autowired diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java index e546700ae..5d83ec12d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java @@ -26,16 +26,16 @@ import org.eclipse.hawkbit.repository.model.Target; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test class for {@link AutoActionCleanup}. * */ -@Features("Component Tests - Repository") -@Stories("Action cleanup handler") +@Feature("Component Tests - Repository") +@Story("Action cleanup handler") public class AutoActionCleanupTest extends AbstractJpaIntegrationTest { @Autowired diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java index 712086a2d..8553cccc1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java @@ -19,16 +19,16 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.support.locks.LockRegistry; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test class for {@link AutoCleanupScheduler}. * */ -@Features("Component Tests - Repository") -@Stories("Auto cleanup scheduler") +@Feature("Component Tests - Repository") +@Story("Auto cleanup scheduler") public class AutoCleanupSchedulerTest extends AbstractJpaIntegrationTest { private final AtomicInteger counter = new AtomicInteger(); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java index ce4bd7198..09bf32943 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java @@ -38,12 +38,12 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.event.EventListener; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("Entity Events") +@Feature("Component Tests - Repository") +@Story("Entity Events") @SpringApplicationConfiguration(classes = RepositoryTestConfiguration.class) public class RepositoryEntityEventTest extends AbstractJpaIntegrationTest { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java index 0fc1f28e7..6d57b044c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java @@ -18,15 +18,15 @@ import org.eclipse.hawkbit.repository.model.Target; import org.junit.After; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test the entity listener interceptor. */ -@Features("Component Tests - Repository") -@Stories("Entity Listener Interceptor") +@Feature("Component Tests - Repository") +@Story("Entity Listener Interceptor") public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest { @After diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java index 1c336f2f7..b6bb32292 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java @@ -14,12 +14,12 @@ import org.eclipse.hawkbit.repository.jpa.AbstractJpaIntegrationTest; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Repository Model") +@Feature("Unit Tests - Repository") +@Story("Repository Model") public class ModelEqualsHashcodeTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java index 3821d9f3f..75707dc71 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java @@ -25,12 +25,12 @@ import org.junit.Test; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter actions") +@Feature("Component Tests - Repository") +@Story("RSQL filter actions") public class RSQLActionFieldsTest extends AbstractJpaIntegrationTest { private JpaTarget target; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java index 7dbc57fef..b3904af8d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java @@ -24,12 +24,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter distribution set") +@Feature("Component Tests - Repository") +@Story("RSQL filter distribution set") public class RSQLDistributionSetFieldTest extends AbstractJpaIntegrationTest { @Before diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java index dd92ad9e8..1db2d60b3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java @@ -24,12 +24,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter distribution set metadata") +@Feature("Component Tests - Repository") +@Story("RSQL filter distribution set metadata") public class RSQLDistributionSetMetadataFieldsTest extends AbstractJpaIntegrationTest { private Long distributionSetId; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java index db8cd9c78..75bc6d70c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java @@ -22,12 +22,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter rollout group") +@Feature("Component Tests - Repository") +@Story("RSQL filter rollout group") public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { private Long rolloutGroupId; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java index 176625c2b..59c2a680f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java @@ -21,12 +21,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter software module") +@Feature("Component Tests - Repository") +@Story("RSQL filter software module") public class RSQLSoftwareModuleFieldTest extends AbstractJpaIntegrationTest { @Before diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java index 3f9ef8acf..0aba02f33 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java @@ -25,12 +25,12 @@ import org.springframework.data.domain.PageRequest; import com.google.common.collect.Lists; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter software module metadata") +@Feature("Component Tests - Repository") +@Story("RSQL filter software module metadata") public class RSQLSoftwareModuleMetadataFieldsTest extends AbstractJpaIntegrationTest { private Long softwareModuleId; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java index 1c67ec2e1..c0a02cb3e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java @@ -18,12 +18,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter software module test type") +@Feature("Component Tests - Repository") +@Story("RSQL filter software module test type") public class RSQLSoftwareModuleTypeFieldsTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java index 01554b289..f44e1c847 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java @@ -20,12 +20,12 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter target and distribution set tags") +@Feature("Component Tests - Repository") +@Story("RSQL filter target and distribution set tags") public class RSQLTagFieldsTest extends AbstractJpaIntegrationTest { @Before diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java index d473e172a..8ef37c24b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java @@ -26,12 +26,12 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.domain.Page; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter target") +@Feature("Component Tests - Repository") +@Story("RSQL filter target") public class RSQLTargetFieldTest extends AbstractJpaIntegrationTest { private Target target; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java index d5a2b0d12..690da8db1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java @@ -49,13 +49,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.orm.jpa.vendor.Database; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; @RunWith(PowerMockRunner.class) -@Features("Component Tests - Repository") -@Stories("RSQL search utility") +@Feature("Component Tests - Repository") +@Story("RSQL search utility") @PrepareForTest(TimestampCalculator.class) // TODO: fully document tests -> @Description for long text and reasonable // method name as short text diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java index c506c8aa0..42310a165 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java @@ -21,12 +21,12 @@ import org.eclipse.hawkbit.repository.rsql.ValidationOracleContext; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Repository") -@Stories("RSQL filter suggestion") +@Feature("Component Tests - Repository") +@Story("RSQL filter suggestion") public class RsqlParserValidationOracleTest extends AbstractJpaIntegrationTest { @Autowired diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java index 15cb6a083..a240e158d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java @@ -28,12 +28,12 @@ import org.mockito.Spy; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Placeholder resolution for virtual properties") +@Feature("Unit Tests - Repository") +@Story("Placeholder resolution for virtual properties") @RunWith(PowerMockRunner.class) @PrepareForTest(TimestampCalculator.class) public class VirtualPropertyResolverTest { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java index 5e077c736..7e019c634 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java @@ -30,12 +30,12 @@ import org.junit.Test; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specifications; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Repository") -@Stories("Specifications builder") +@Feature("Unit Tests - Repository") +@Story("Specifications builder") public class SpecificationsBuilderTest { @Test diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java index d0dbd0001..d3dbc075f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Slice; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Multi-Tenancy tests which testing the CRUD operations of entities that all @@ -34,8 +34,8 @@ import ru.yandex.qatools.allure.annotations.Stories; * belonging to the current tenant. * */ -@Features("Component Tests - Repository") -@Stories("Multi Tenancy") +@Feature("Component Tests - Repository") +@Story("Multi Tenancy") public class MultiTenancyEntityTest extends AbstractJpaIntegrationTest { @Test diff --git a/hawkbit-rest/hawkbit-ddi-resource/pom.xml b/hawkbit-rest/hawkbit-ddi-resource/pom.xml index b26013183..5cf82ef21 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/pom.xml +++ b/hawkbit-rest/hawkbit-ddi-resource/pom.xml @@ -118,8 +118,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java index 1703a21c3..4b0d8973f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java @@ -48,15 +48,15 @@ import org.springframework.test.web.servlet.MvcResult; import com.google.common.base.Charsets; import com.google.common.net.HttpHeaders; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test artifact downloads from the controller. */ -@Features("Component Tests - Direct Device Integration API") -@Stories("Artifact Download Resource") +@Feature("Component Tests - Direct Device Integration API") +@Story("Artifact Download Resource") @SpringApplicationConfiguration(classes = DownloadTestConfiguration.class) public class DdiArtifactDownloadTest extends AbstractDDiApiIntegrationTest { diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java index 56f395741..adef0ef0c 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java @@ -33,15 +33,15 @@ import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; import org.junit.Test; import org.springframework.http.MediaType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test cancel action from the controller. */ -@Features("Component Tests - Direct Device Integration API") -@Stories("Cancel Action Resource") +@Feature("Component Tests - Direct Device Integration API") +@Story("Cancel Action Resource") public class DdiCancelActionTest extends AbstractDDiApiIntegrationTest { @Test diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java index 9984de002..3bea65f7c 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java @@ -35,17 +35,17 @@ import org.springframework.test.context.ActiveProfiles; import com.google.common.collect.Maps; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Test config data from the controller. */ @ActiveProfiles({ "im", "test" }) -@Features("Component Tests - Direct Device Integration API") -@Stories("Config Data Resource") +@Feature("Component Tests - Direct Device Integration API") +@Story("Config Data Resource") public class DdiConfigDataTest extends AbstractDDiApiIntegrationTest { private static final String KEY_TOO_LONG = "123456789012345678901234567890123"; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java index 25034c562..5cdcc68e1 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java @@ -56,15 +56,15 @@ import org.springframework.test.web.servlet.MvcResult; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test deployment base from the controller. */ -@Features("Component Tests - Direct Device Integration API") -@Stories("Deployment Action Resource") +@Feature("Component Tests - Direct Device Integration API") +@Story("Deployment Action Resource") public class DdiDeploymentBaseTest extends AbstractDDiApiIntegrationTest { private static final String HTTP_LOCALHOST = "http://localhost:8080/"; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java index c6154b8af..cd28d88fb 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java @@ -60,16 +60,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultActions; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Test the root controller resources. */ -@Features("Component Tests - Direct Device Integration API") -@Stories("Root Poll Resource") +@Feature("Component Tests - Direct Device Integration API") +@Story("Root Poll Resource") public class DdiRootControllerTest extends AbstractDDiApiIntegrationTest { private static final String TARGET_COMPLETED_INSTALLATION_MSG = "Target completed installation."; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java index 3ec614020..4ca30243f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java @@ -33,17 +33,17 @@ import org.springframework.web.context.WebApplicationContext; import com.google.common.net.HttpHeaders; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test potential DOS attack scenarios and check if the filter prevents them. * */ @ActiveProfiles({ "test" }) -@Features("Component Tests - REST Security") -@Stories("Denial of Service protection filter") +@Feature("Component Tests - REST Security") +@Story("Denial of Service protection filter") public class DosFilterTest extends AbstractDDiApiIntegrationTest { @Override diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml index ca95b4fd4..788126454 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-api/pom.xml @@ -40,8 +40,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java index d5b089868..ce099d57c 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java @@ -16,12 +16,12 @@ import java.util.List; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Management API") -@Stories("Paged List Handling") +@Feature("Unit Tests - Management API") +@Story("Paged List Handling") public class PagedListTest { @Test diff --git a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml index 9308b30b2..ce6dd8818 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml @@ -121,8 +121,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java index e18dc2260..480b36b4c 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java @@ -55,13 +55,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; -@Features("Component Tests - Management API") -@Stories("Distribution Set Resource") +@Feature("Component Tests - Management API") +@Story("Distribution Set Resource") public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegrationTest { @Test diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java index d7fa69979..11aeadeb8 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java @@ -42,12 +42,12 @@ import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultActions; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Management API") -@Stories("Distribution Set Tag Resource") +@Feature("Component Tests - Management API") +@Story("Distribution Set Tag Resource") public class MgmtDistributionSetTagResourceTest extends AbstractManagementApiIntegrationTest { private static final String DISTRIBUTIONSETTAGS_ROOT = "http://localhost" diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java index ef6b572d9..d77703b4e 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java @@ -44,17 +44,17 @@ import org.springframework.test.web.servlet.MvcResult; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Test for {@link MgmtDistributionSetTypeResource}. * */ -@Features("Component Tests - Management API") -@Stories("Distribution Set Type Resource") +@Feature("Component Tests - Management API") +@Story("Distribution Set Type Resource") public class MgmtDistributionSetTypeResourceTest extends AbstractManagementApiIntegrationTest { @Test diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java index 0d706daf0..dfbde11ff 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java @@ -23,12 +23,12 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Component Tests - Management API") -@Stories("Download Resource") +@Feature("Component Tests - Management API") +@Story("Download Resource") public class MgmtDownloadResourceTest extends AbstractManagementApiIntegrationTest { @Autowired diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java index 2f71c0e98..0136e5625 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java @@ -49,16 +49,16 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort.Direction; import org.springframework.http.MediaType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Tests for covering the {@link MgmtRolloutResource}. */ -@Features("Component Tests - Management API") -@Stories("Rollout Resource") +@Feature("Component Tests - Management API") +@Story("Rollout Resource") public class MgmtRolloutResourceTest extends AbstractManagementApiIntegrationTest { private static final String HREF_ROLLOUT_PREFIX = "http://localhost/rest/v1/rollouts/"; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java index 4720c64c1..fecb1ae64 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java @@ -59,16 +59,16 @@ import org.springframework.web.bind.annotation.RestController; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Tests for {@link MgmtSoftwareModuleResource} {@link RestController}. * */ -@Features("Component Tests - Management API") -@Stories("Software Module Resource") +@Feature("Component Tests - Management API") +@Story("Software Module Resource") @TestPropertySource(properties = { "hawkbit.server.security.dos.maxArtifactSize=100000", "hawkbit.server.security.dos.maxArtifactStorage=500000" }) public class MgmtSoftwareModuleResourceTest extends AbstractManagementApiIntegrationTest { diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java index fa717efc4..45c060f73 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java @@ -38,16 +38,16 @@ import org.springframework.test.web.servlet.MvcResult; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test for {@link MgmtSoftwareModuleTypeResource}. * */ -@Features("Component Tests - Management API") -@Stories("Software Module Type Resource") +@Feature("Component Tests - Management API") +@Story("Software Module Type Resource") public class MgmtSoftwareModuleTypeResourceTest extends AbstractManagementApiIntegrationTest { @Test diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java index a77ba3ba9..72358138b 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java @@ -32,16 +32,16 @@ import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Spring MVC Tests against the MgmtTargetResource. * */ -@Features("Component Tests - Management API") -@Stories("Target Filter Query Resource") +@Feature("Component Tests - Management API") +@Story("Target Filter Query Resource") public class MgmtTargetFilterQueryResourceTest extends AbstractManagementApiIntegrationTest { private static final String JSON_PATH_ROOT = "$"; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java index a3bff21c5..e88f29aa7 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java @@ -66,17 +66,17 @@ import org.springframework.test.web.servlet.MvcResult; import com.jayway.jsonpath.JsonPath; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Step; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Step; +import io.qameta.allure.Story; /** * Spring MVC Tests against the MgmtTargetResource. * */ -@Features("Component Tests - Management API") -@Stories("Target Resource") +@Feature("Component Tests - Management API") +@Story("Target Resource") public class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { private static final String TARGET_DESCRIPTION_TEST = "created in test"; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java index ab686adf0..c155cc1bb 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java @@ -40,16 +40,16 @@ import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultActions; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Spring MVC Tests against the MgmtTargetTagResource. * */ -@Features("Component Tests - Management API") -@Stories("Target Tag Resource") +@Feature("Component Tests - Management API") +@Story("Target Tag Resource") public class MgmtTargetTagResourceTest extends AbstractManagementApiIntegrationTest { private static final String TARGETTAGS_ROOT = "http://localhost" + MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml index 21bd9b21b..167f2a330 100644 --- a/hawkbit-rest/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest/hawkbit-rest-core/pom.xml @@ -75,8 +75,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java index 5d56eb156..eaf38be6d 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java @@ -28,11 +28,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Security") -@Stories("Exclude path aware shallow ETag filter") +@Feature("Unit Tests - Security") +@Story("Exclude path aware shallow ETag filter") @RunWith(MockitoJUnitRunner.class) public class ExcludePathAwareShallowETagFilterTest { diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java index 46876debc..72837cdc0 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java @@ -15,12 +15,12 @@ import java.util.List; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Management API") -@Stories("Error Handling") +@Feature("Unit Tests - Management API") +@Story("Error Handling") public class ExceptionInfoTest { @Test diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java index 5c8d444be..1dbd31d0b 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java @@ -20,15 +20,15 @@ import org.eclipse.hawkbit.rest.exception.SortParameterUnsupportedFieldException import org.junit.Test; import org.springframework.data.domain.Sort.Order; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * */ -@Features("Component Tests - Management API") -@Stories("Sorting parameter") +@Feature("Component Tests - Management API") +@Story("Sorting parameter") public class SortUtilityTest { private static final String SORT_PARAM_1 = "NAME:ASC"; private static final String SORT_PARAM_2 = "NAME:ASC, DESCRIPTION:DESC"; diff --git a/hawkbit-rest/hawkbit-rest-docs/pom.xml b/hawkbit-rest/hawkbit-rest-docs/pom.xml index 4f8b5d689..716a8328b 100644 --- a/hawkbit-rest/hawkbit-rest-docs/pom.xml +++ b/hawkbit-rest/hawkbit-rest-docs/pom.xml @@ -110,8 +110,9 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 + test org.springframework diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java index 5329a4abc..701f81bfd 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java @@ -42,16 +42,16 @@ import org.junit.Test; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Direct Device Integration API. * */ -@Features("Documentation Verfication - Direct Device Integration API") -@Stories("Root Resource") +@Feature("Documentation Verfication - Direct Device Integration API") +@Story("Root Resource") public class RootControllerDocumentationTest extends AbstractApiRestDocumentation { private static final String CONTROLLER_ID = "CONTROLLER_ID"; diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java index 324b8cb98..b3d607aca 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java @@ -47,13 +47,13 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import ru.yandex.qatools.allure.annotations.Features; +import io.qameta.allure.Feature; /** * Parent class for all Management API rest documentation classes. * */ -@Features("Documentation Verfication - API") +@Feature("Documentation Verfication - API") @SpringApplicationConfiguration(classes = { DdiApiConfiguration.class, MgmtApiConfiguration.class }) @TestPropertySource(locations = { "classpath:/updateserver-restdocumentation-test.properties" }) public abstract class AbstractApiRestDocumentation extends AbstractRestIntegrationTest { diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java index e3ac79651..459224053 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java @@ -42,16 +42,16 @@ import org.springframework.restdocs.snippet.Snippet; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link DistributionSetTag}. * */ -@Features("Spring Rest Docs Tests - DistributionSetTag") -@Stories("DistributionSet Tag Resource") +@Feature("Spring Rest Docs Tests - DistributionSetTag") +@Story("DistributionSet Tag Resource") public class DistributionSetTagResourceDocumentationTest extends AbstractApiRestDocumentation { private DistributionSet distributionSet; diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java index 86eeb3b02..b92635d44 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java @@ -42,16 +42,16 @@ import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.restdocs.payload.JsonFieldType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link DistributionSetType}. * */ -@Features("Spring Rest Docs Tests - DistributionSetType") -@Stories("DistributionSetTypes Resource") +@Feature("Spring Rest Docs Tests - DistributionSetType") +@Story("DistributionSetTypes Resource") public class DistributionSetTypesDocumentationTest extends AbstractApiRestDocumentation { @Override diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java index 222ab30df..eb0aeb6ca 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java @@ -44,16 +44,16 @@ import org.springframework.restdocs.payload.JsonFieldType; import com.google.common.collect.Lists; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link DistributionSet}. * */ -@Features("Spring Rest Docs Tests - DistributionSet") -@Stories("DistributionSet Resource") +@Feature("Spring Rest Docs Tests - DistributionSet") +@Story("DistributionSet Resource") public class DistributionSetsDocumentationTest extends AbstractApiRestDocumentation { @Override diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java index 4e771effa..3780157e7 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java @@ -52,16 +52,16 @@ import org.springframework.restdocs.snippet.Snippet; import com.fasterxml.jackson.core.JsonProcessingException; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Rollout API for {@link Rollout}. * */ -@Features("Spring Rest Docs Tests - Rollout") -@Stories("Rollout Resource") +@Feature("Spring Rest Docs Tests - Rollout") +@Story("Rollout Resource") public class RolloutResourceDocumentationTest extends AbstractApiRestDocumentation { @Autowired diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java index 15d02c461..55cc7c47e 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java @@ -36,17 +36,17 @@ import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.restdocs.payload.JsonFieldType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * * Documentation generation for Management API for {@link SoftwareModuleType}. * */ -@Features("Spring Rest Docs Tests - SoftwareModuleType") -@Stories("Softwaremoduletypes Resource") +@Feature("Spring Rest Docs Tests - SoftwareModuleType") +@Story("Softwaremoduletypes Resource") public class SoftwaremoduleTypesDocumentationTest extends AbstractApiRestDocumentation { @Override diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java index caad88abf..1597faeae 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java @@ -45,15 +45,15 @@ import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.restdocs.payload.JsonFieldType; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link SoftwareModule}. */ -@Features("Spring Rest Docs Tests - SoftwareModule") -@Stories("Softwaremodule Resource") +@Feature("Spring Rest Docs Tests - SoftwareModule") +@Story("Softwaremodule Resource") public class SoftwaremodulesDocumentationTest extends AbstractApiRestDocumentation { @Override diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java index 1d5468492..fa5c277c8 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java @@ -38,15 +38,15 @@ import org.springframework.restdocs.snippet.Snippet; import com.fasterxml.jackson.core.JsonProcessingException; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link TargetFilterQuery}. */ -@Features("Spring Rest Docs Tests - TargetFilterQuery") -@Stories("TargetFilterQuery Resource") +@Feature("Spring Rest Docs Tests - TargetFilterQuery") +@Story("TargetFilterQuery Resource") public class TargetFilterQueriesResourceDocumentationTest extends AbstractApiRestDocumentation { private static final String EXAMPLE_TFQ_NAME = "filter1"; diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java index 5be76d624..171612001 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java @@ -48,16 +48,16 @@ import org.springframework.restdocs.payload.JsonFieldType; import com.fasterxml.jackson.core.JsonProcessingException; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link Target}. * */ -@Features("Spring Rest Docs Tests - Target") -@Stories("Target Resource") +@Feature("Spring Rest Docs Tests - Target") +@Story("Target Resource") public class TargetResourceDocumentationTest extends AbstractApiRestDocumentation { private final String controllerId = "137"; diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java index 7f1e64c23..c0a0f5cea 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java @@ -43,16 +43,16 @@ import org.springframework.restdocs.snippet.Snippet; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for Management API for {@link TargetTag}. * */ -@Features("Spring Rest Docs Tests - TargetTag") -@Stories("TargetTag Resource") +@Feature("Spring Rest Docs Tests - TargetTag") +@Story("TargetTag Resource") public class TargetTagResourceDocumentationTest extends AbstractApiRestDocumentation { private DistributionSet distributionSet; diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java index 409fcd26f..2194ddd4c 100644 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java +++ b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java @@ -40,15 +40,15 @@ import org.springframework.restdocs.payload.FieldDescriptor; import com.fasterxml.jackson.databind.ObjectMapper; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Documentation generation for System API for {@link TenantConfiguration}. */ -@Features("Spring Rest Docs Tests - TenantConfiguration") -@Stories("TenantConfiguration Resource") +@Feature("Spring Rest Docs Tests - TenantConfiguration") +@Story("TenantConfiguration Resource") public class TenantResourceDocumentationTest extends AbstractApiRestDocumentation { protected static final Map CONFIG_ITEM_DESCRIPTIONS = new HashMap<>(); diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml index 86259041e..642993edb 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security-core/pom.xml @@ -55,8 +55,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/PermissionTest.java b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/PermissionTest.java index 38a273df1..e6ba187a1 100644 --- a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/PermissionTest.java +++ b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/PermissionTest.java @@ -17,15 +17,15 @@ import java.util.stream.Collectors; import org.junit.Test; import org.springframework.security.core.GrantedAuthority; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Test {@link SpPermission}. */ -@Features("Unit Tests - Security") -@Stories("Permission Test") +@Feature("Unit Tests - Security") +@Story("Permission Test") public final class PermissionTest { @Test diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java index f8c621dba..fcf409fdf 100644 --- a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java +++ b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java @@ -29,13 +29,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; @RunWith(MockitoJUnitRunner.class) -@Features("Unit Tests - Security") -@Stories("IP Util Test") +@Feature("Unit Tests - Security") +@Story("IP Util Test") public class IpUtilTest { private static final String KNOWN_REQUEST_HEADER = "bumlux"; diff --git a/hawkbit-security-integration/pom.xml b/hawkbit-security-integration/pom.xml index 175bdbd65..bd9bddf1c 100644 --- a/hawkbit-security-integration/pom.xml +++ b/hawkbit-security-integration/pom.xml @@ -49,8 +49,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownloadTest.java b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownloadTest.java index ef1705a1f..90e692e25 100644 --- a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownloadTest.java +++ b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownloadTest.java @@ -20,14 +20,14 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * */ -@Features("Unit Tests - Security") -@Stories("Exclude path aware shallow ETag filter") +@Feature("Unit Tests - Security") +@Story("Exclude path aware shallow ETag filter") @RunWith(MockitoJUnitRunner.class) public class ControllerPreAuthenticatedAnonymousDownloadTest { diff --git a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java index 5a14f1227..f27330c86 100644 --- a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java +++ b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java @@ -25,12 +25,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Security") -@Stories("Issuer hash based authentication") +@Feature("Unit Tests - Security") +@Story("Issuer hash based authentication") @RunWith(MockitoJUnitRunner.class) public class ControllerPreAuthenticatedSecurityHeaderFilterTest { diff --git a/hawkbit-test-report/pom.xml b/hawkbit-test-report/pom.xml index e59a047c3..81ad04dd3 100644 --- a/hawkbit-test-report/pom.xml +++ b/hawkbit-test-report/pom.xml @@ -41,7 +41,7 @@ ${basedir}/.. false - **/target/allure-results/*.xml + **/target/allure-results/*.json diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml index 46c67165d..85aa51085 100644 --- a/hawkbit-ui/pom.xml +++ b/hawkbit-ui/pom.xml @@ -257,8 +257,8 @@ test - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 test diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java index 50a5dcc03..691dada66 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/push/SpringSecurityAtmosphereInterceptorTest.java @@ -26,12 +26,12 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Management UI") -@Stories("Push Security") +@Feature("Unit Tests - Management UI") +@Story("Push Security") @RunWith(MockitoJUnitRunner.class) public class SpringSecurityAtmosphereInterceptorTest { diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java index be6f7f9db..4a8bef302 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java @@ -19,11 +19,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Management UI") -@Stories("Upload UI state") +@Feature("Unit Tests - Management UI") +@Story("Upload UI state") @RunWith(MockitoJUnitRunner.class) public class ArtifactUploadStateTest { diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ItemIdClientCriterionTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ItemIdClientCriterionTest.java index 978303e67..1e9eb833a 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ItemIdClientCriterionTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ItemIdClientCriterionTest.java @@ -19,12 +19,12 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import com.vaadin.client.UIDL; import com.vaadin.client.ui.dd.VDragEvent; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Drag And Drop") -@Stories("Client-side Accept criteria") +@Feature("Unit Tests - Drag And Drop") +@Story("Client-side Accept criteria") @RunWith(GwtMockitoTestRunner.class) public class ItemIdClientCriterionTest { diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewClientCriterionTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewClientCriterionTest.java index 7a1240485..b5f8c9f18 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewClientCriterionTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewClientCriterionTest.java @@ -34,12 +34,12 @@ import com.vaadin.client.ui.VDragAndDropWrapper; import com.vaadin.client.ui.VScrollTable; import com.vaadin.client.ui.dd.VDragEvent; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Drag And Drop") -@Stories("Client-side Accept criteria") +@Feature("Unit Tests - Drag And Drop") +@Story("Client-side Accept criteria") @RunWith(GwtMockitoTestRunner.class) @WithClassesToStub({ RootPanel.class }) public class ViewClientCriterionTest { diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewComponentClientCriterionTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewComponentClientCriterionTest.java index f1100590a..7c349c61c 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewComponentClientCriterionTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/dd/client/criteria/ViewComponentClientCriterionTest.java @@ -27,12 +27,12 @@ import com.vaadin.client.ui.dd.VDragAndDropManager; import com.vaadin.client.ui.dd.VDragEvent; import com.vaadin.client.ui.dd.VDropHandler; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; -@Features("Unit Tests - Drag And Drop") -@Stories("Client-side Accept criteria") +@Feature("Unit Tests - Drag And Drop") +@Story("Client-side Accept criteria") @RunWith(GwtMockitoTestRunner.class) public class ViewComponentClientCriterionTest { diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUITest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUITest.java index 35e84d503..638152910 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUITest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUITest.java @@ -12,16 +12,16 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -import ru.yandex.qatools.allure.annotations.Description; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Description; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Tests for {@link AbstractHawkbitLoginUI} * */ -@Features("Unit Tests - Management UI") -@Stories("Login UI") +@Feature("Unit Tests - Management UI") +@Story("Login UI") public class AbstractHawkbitLoginUITest { @Test diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java index 59f09ae9f..2c2fc3ac1 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java @@ -17,15 +17,15 @@ import org.junit.Test; import com.vaadin.ui.Button; -import ru.yandex.qatools.allure.annotations.Features; -import ru.yandex.qatools.allure.annotations.Stories; +import io.qameta.allure.Feature; +import io.qameta.allure.Story; /** * Unit Test block for UI Component provider. Dynamic Factory Testing. * */ -@Features("Unit Tests - Management UI") -@Stories("UI components") +@Feature("Unit Tests - Management UI") +@Story("UI components") public class SPUIComponentProviderTest { /** * Test case for check button factory. diff --git a/pom.xml b/pom.xml index 66a139f8b..e0fb544fe 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 5.0.5 1.8.3 2.0.1.Final - 1.5.4 + 2.7.0 2.7.1 1.1.8 1.6.5 @@ -399,6 +399,10 @@ maven-surefire-plugin ${maven.surefire.plugin.version} + + + ${project.build.directory}/allure-results + true ${surefire.forkcount} @@ -407,7 +411,7 @@ listener - ru.yandex.qatools.allure.junit.AllureRunListener + io.qameta.allure.junit4.AllureJunit4 @@ -430,7 +434,7 @@ listener - ru.yandex.qatools.allure.junit.AllureRunListener + io.qameta.allure.junit4.AllureJunit4 @@ -797,8 +801,8 @@ ${json.version} - ru.yandex.qatools.allure - allure-junit-adaptor + io.qameta.allure + allure-junit4 ${allure.version} test