From 427ff366c36f8ddb933934a4823ff0004eb3c5d0 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:24:35 +0200 Subject: [PATCH] TSK-1406: moved spring-boot test classes to dedicated test module --- common/taskana-common-test/pom.xml | 56 +++++++++- .../taskana/common/test}/rest/RestHelper.java | 2 +- .../test}/rest/TaskanaSpringBootTest.java | 4 +- .../common/test/rest}/TestConfiguration.java | 4 +- history/taskana-loghistory-provider/pom.xml | 1 - .../java/pro/taskana/ArchitectureTest.java | 2 + pom.xml | 1 - .../pro/taskana/CommonTestConfiguration.java | 28 ----- .../src/test/java/pro/taskana/RestHelper.java | 102 ------------------ .../pro/taskana/TaskanaSpringBootTest.java | 24 ----- .../taskana/jobs/AsyncUpdateJobIntTest.java | 6 +- .../test/java/pro/taskana/ldap/LdapTest.java | 2 +- .../security/SpringBootWebSecurityConfig.java | 10 +- .../rest/ClassificationControllerIntTest.java | 4 +- ...sificationDefinitionControllerIntTest.java | 6 +- ...ationRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- .../rest/AccessIdControllerIntTest.java | 4 +- .../rest/GeneralExceptionHandlingTest.java | 5 +- .../rest/TaskanaEngineControllerIntTest.java | 5 +- .../rest/TestSchemaNameCustomizable.java | 1 + .../doc/api/BaseRestDocumentation.java | 4 +- .../models/ReportRepresentationModelTest.java | 2 +- .../rest/TaskCommentControllerIntTest.java | 6 +- .../task/rest/TaskControllerIntTest.java | 6 +- ...hmentRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- ...mmentRepresentationModelAssemblerTest.java | 2 +- .../TaskRepresentationModelAssemberTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- ...WorkbasketAccessItemControllerIntTest.java | 4 +- .../rest/WorkbasketControllerIntTest.java | 10 +- ...WorkbasketDefinitionControllerIntTest.java | 6 +- ...sItemRepresentationModelAssemblerTest.java | 2 +- ...itionRepresentationModelAssemblerTest.java | 2 +- ...asketRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- 37 files changed, 115 insertions(+), 212 deletions(-) rename {rest/taskana-rest-spring/src/test/java/pro/taskana/common => common/taskana-common-test/src/main/java/pro/taskana/common/test}/rest/RestHelper.java (99%) rename {rest/taskana-rest-spring/src/test/java/pro/taskana/common => common/taskana-common-test/src/main/java/pro/taskana/common/test}/rest/TaskanaSpringBootTest.java (93%) rename {rest/taskana-rest-spring/src/test/java/pro/taskana => common/taskana-common-test/src/main/java/pro/taskana/common/test/rest}/TestConfiguration.java (88%) delete mode 100644 rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/CommonTestConfiguration.java delete mode 100644 rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/RestHelper.java delete mode 100644 rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/TaskanaSpringBootTest.java diff --git a/common/taskana-common-test/pom.xml b/common/taskana-common-test/pom.xml index 8f41a5f90..4978a8f12 100644 --- a/common/taskana-common-test/pom.xml +++ b/common/taskana-common-test/pom.xml @@ -16,15 +16,63 @@ - - org.junit.jupiter - junit-jupiter - pro.taskana taskana-common ${project.version} + + pro.taskana + taskana-common-data + ${project.version} + + + org.junit.jupiter + junit-jupiter + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.module + jackson-module-parameter-names + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.springframework + spring-web + + + org.springframework.hateoas + spring-hateoas + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework + spring-jdbc + + + org.springframework.boot + spring-boot-starter-test + + + org.springframework.boot + spring-boot-starter-logging + + + + diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/RestHelper.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java similarity index 99% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/RestHelper.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java index 0892b410b..d2a91fafa 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/RestHelper.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java @@ -1,4 +1,4 @@ -package pro.taskana.common.rest; +package pro.taskana.common.test.rest; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaSpringBootTest.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TaskanaSpringBootTest.java similarity index 93% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaSpringBootTest.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TaskanaSpringBootTest.java index 001182fff..94c602ac8 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaSpringBootTest.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TaskanaSpringBootTest.java @@ -1,4 +1,4 @@ -package pro.taskana.common.rest; +package pro.taskana.common.test.rest; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -10,8 +10,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; -import pro.taskana.TestConfiguration; - /** Use this annotation to test with a spring context and a standardized configuration. */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/TestConfiguration.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestConfiguration.java similarity index 88% rename from rest/taskana-rest-spring/src/test/java/pro/taskana/TestConfiguration.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestConfiguration.java index d4f3bc2c2..169fe02c6 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/TestConfiguration.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestConfiguration.java @@ -1,10 +1,11 @@ -package pro.taskana; +package pro.taskana.common.test.rest; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.DependsOn; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; @@ -12,6 +13,7 @@ import org.springframework.transaction.PlatformTransactionManager; import pro.taskana.sampledata.SampleDataGenerator; @SpringBootApplication +@ComponentScan("pro.taskana") @DependsOn("getTaskanaEngine") // wait for schema to be created BEFORE inserting test data public class TestConfiguration { diff --git a/history/taskana-loghistory-provider/pom.xml b/history/taskana-loghistory-provider/pom.xml index 7bb4ae45e..06eae8f20 100644 --- a/history/taskana-loghistory-provider/pom.xml +++ b/history/taskana-loghistory-provider/pom.xml @@ -30,7 +30,6 @@ com.fasterxml.jackson.core jackson-databind - ${version.jackson-databind} com.fasterxml.jackson.datatype diff --git a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java index 6a23cd6be..ea63633fa 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java @@ -169,6 +169,8 @@ class ArchitectureTest { .haveSimpleNameNotEndingWith("AbstractTaskanaJob") .and() .resideInAPackage("..common..") + .and() + .resideOutsideOfPackage("..common.test..") .should() .dependOnClassesThat() .resideInAPackage(p) diff --git a/pom.xml b/pom.xml index 3e7f52e66..0183e9f83 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,6 @@ 3.5.6 20200518 - 2.11.2 8.36.2 diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/CommonTestConfiguration.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/CommonTestConfiguration.java deleted file mode 100644 index ada859e71..000000000 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/CommonTestConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package pro.taskana; - -import javax.sql.DataSource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.DependsOn; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; - -import pro.taskana.sampledata.SampleDataGenerator; - -@SpringBootApplication -@DependsOn("getTaskanaEngine") // wait for schema to be created BEFORE inserting test data -public class CommonTestConfiguration { - - @Autowired - public CommonTestConfiguration( - @Value("${taskana.schemaName:TASKANA}") String schemaName, DataSource dataSource) { - new SampleDataGenerator(dataSource, schemaName).generateSampleData(); - } - - @Bean - public PlatformTransactionManager txManager(DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } -} diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/RestHelper.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/RestHelper.java deleted file mode 100644 index d079caba8..000000000 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/RestHelper.java +++ /dev/null @@ -1,102 +0,0 @@ -package pro.taskana; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import java.util.Collections; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.hateoas.MediaTypes; -import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.util.UriComponentsBuilder; - -/** Helps to simplify rest api testing. */ -@Component -public class RestHelper { - - public static final RestTemplate TEMPLATE = getRestTemplate(); - @Autowired Environment environment; - - public String toUrl(String relativeUrl, Object... uriVariables) { - return UriComponentsBuilder.fromPath(relativeUrl) - .scheme("http") - .host("127.0.0.1") - .port(environment.getProperty("local.server.port")) - .build(false) - .expand(uriVariables) - .toString(); - } - - public HttpEntity defaultRequest() { - return new HttpEntity<>(getHeadersTeamlead_1()); - } - - public HttpHeaders getHeadersTeamlead_1() { - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Basic dGVhbWxlYWQtMTp0ZWFtbGVhZC0x"); // teamlead-1 - headers.add("Content-Type", "application/json"); - return headers; - } - - public HttpHeaders getHeadersAdmin() { - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Basic YWRtaW46YWRtaW4="); // admin:admin - headers.add("Content-Type", "application/hal+json"); - return headers; - } - - public HttpHeaders getHeadersBusinessAdmin() { - HttpHeaders headers = new HttpHeaders(); - // businessadmin:businessadmin - headers.add("Authorization", "Basic YnVzaW5lc3NhZG1pbjpidXNpbmVzc2FkbWlu"); - headers.add("Content-Type", "application/hal+json"); - return headers; - } - - public HttpHeaders getHeadersUser_1_2() { - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Basic dXNlci0xLTI6dXNlci0xLTI="); // user-1-2 - headers.add("Content-Type", "application/json"); - return headers; - } - - public HttpHeaders getHeadersUser_1_1() { - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Basic dXNlci0xLTE6dXNlci0xLTE="); // user-1-1 - headers.add("Content-Type", "application/json"); - return headers; - } - - /** - * Return a REST template which is capable of dealing with responses in HAL format. - * - * @return RestTemplate - */ - private static RestTemplate getRestTemplate() { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - mapper.registerModule(new Jackson2HalModule()); - mapper - .registerModule(new ParameterNamesModule()) - .registerModule(new Jdk8Module()) - .registerModule(new JavaTimeModule()); - - MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); - converter.setSupportedMediaTypes(Collections.singletonList(MediaTypes.HAL_JSON)); - converter.setObjectMapper(mapper); - - RestTemplate template = new RestTemplate(); - // important to add first to ensure priority - template.getMessageConverters().add(0, converter); - return template; - } -} diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/TaskanaSpringBootTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/TaskanaSpringBootTest.java deleted file mode 100644 index f7e3cc1e1..000000000 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/TaskanaSpringBootTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package pro.taskana; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.springframework.test.context.ActiveProfiles; - -/** Use this annotation to test with a spring context and a standardized configuration. */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -// DirtiesContext is required to make the integration tests run with embedded LDAP. -// Otherwise the LDAP server is not shut down correctly and will not come up again. (socket busy) -@DirtiesContext(classMode = ClassMode.AFTER_CLASS) -@Inherited -@ActiveProfiles({"test"}) -@SpringBootTest( - classes = CommonTestConfiguration.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public @interface TaskanaSpringBootTest {} diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index 14f30b747..e5277f189 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -1,7 +1,7 @@ package pro.taskana.jobs; import static org.assertj.core.api.Assertions.assertThat; -import static pro.taskana.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.time.Instant; import java.util.ArrayList; @@ -15,13 +15,13 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; -import pro.taskana.RestHelper; -import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.rest.assembler.ClassificationRepresentationModelAssembler; import pro.taskana.classification.rest.models.ClassificationRepresentationModel; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.rest.Mapping; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.models.Task; import pro.taskana.task.rest.assembler.TaskRepresentationModelAssembler; import pro.taskana.task.rest.models.TaskRepresentationModel; diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java index 14c43890c..2779824a9 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java @@ -6,9 +6,9 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.TaskanaSpringBootTest; import pro.taskana.common.rest.ldap.LdapClient; import pro.taskana.common.rest.models.AccessIdRepresentationModel; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test Ldap attachment. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/security/SpringBootWebSecurityConfig.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/security/SpringBootWebSecurityConfig.java index b29461951..09f4190f8 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/security/SpringBootWebSecurityConfig.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/rest/security/SpringBootWebSecurityConfig.java @@ -70,11 +70,6 @@ public class SpringBootWebSecurityConfig extends WebSecurityConfigurerAdapter { return bean; } - @Bean - public DefaultSpringSecurityContextSource defaultSpringSecurityContextSource() { - return new DefaultSpringSecurityContextSource(ldapServerUrl + "/" + ldapBaseDn); - } - @Bean public LdapAuthoritiesPopulator authoritiesPopulator() { Function>, GrantedAuthority> authorityMapper = @@ -93,6 +88,11 @@ public class SpringBootWebSecurityConfig extends WebSecurityConfigurerAdapter { return populator; } + @Bean + public DefaultSpringSecurityContextSource defaultSpringSecurityContextSource() { + return new DefaultSpringSecurityContextSource(ldapServerUrl + "/" + ldapBaseDn); + } + @Bean public GrantedAuthoritiesMapper grantedAuthoritiesMapper() { SimpleAuthorityMapper grantedAuthoritiesMapper = new SimpleAuthorityMapper(); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java index 1893b2714..a3d674b48 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java @@ -20,9 +20,9 @@ import org.springframework.web.client.RestTemplate; import pro.taskana.classification.rest.models.ClassificationRepresentationModel; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** * Test ClassificationController. diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java index e84a9e536..d61e1b24b 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java @@ -2,7 +2,7 @@ package pro.taskana.classification.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; @@ -37,10 +37,10 @@ import pro.taskana.classification.rest.assembler.ClassificationRepresentationMod import pro.taskana.classification.rest.models.ClassificationRepresentationModel; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; import pro.taskana.common.rest.models.TaskanaPagedModelKeys; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test classification definitions. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationRepresentationModelAssemblerTest.java index 215be050a..84af807e2 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationRepresentationModelAssemblerTest.java @@ -12,7 +12,7 @@ import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.classification.rest.models.ClassificationRepresentationModel; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test for {@link ClassificationRepresentationModelAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryRepresentationModelAssemblerTest.java index 8775840b2..9cffc23db 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/assembler/ClassificationSummaryRepresentationModelAssemblerTest.java @@ -17,7 +17,7 @@ import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test for {@link ClassificationSummaryRepresentationModelAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java index 71fd103f9..471af9160 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java @@ -2,7 +2,7 @@ package pro.taskana.common.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.util.ArrayList; import java.util.List; @@ -18,6 +18,8 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.web.client.HttpClientErrorException; import pro.taskana.common.rest.models.AccessIdRepresentationModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; @TaskanaSpringBootTest @ActiveProfiles({"test"}) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java index 95fb8468c..46820e11c 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java @@ -13,6 +13,8 @@ import org.springframework.web.client.RestTemplate; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test general Exception Handling. */ @TaskanaSpringBootTest @@ -24,7 +26,8 @@ class GeneralExceptionHandlingTest { new ParameterizedTypeReference< TaskanaPagedModel>() {}; private static RestTemplate template; - @Autowired RestHelper restHelper; + @Autowired + RestHelper restHelper; @BeforeAll static void init() { diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java index 5d1a54ea7..0c6b1b2d5 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java @@ -13,13 +13,16 @@ import org.springframework.web.client.RestTemplate; import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.rest.models.TaskanaUserInfoRepresentationModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; /** Test TaskanaEngineController. */ @TaskanaSpringBootTest class TaskanaEngineControllerIntTest { private static RestTemplate template; - @Autowired RestHelper restHelper; + @Autowired + RestHelper restHelper; @BeforeAll static void init() { diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TestSchemaNameCustomizable.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TestSchemaNameCustomizable.java index e4435538b..61317489c 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TestSchemaNameCustomizable.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TestSchemaNameCustomizable.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.SpringTaskanaEngineConfiguration; import pro.taskana.common.internal.configuration.DB; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.sampledata.SampleDataGenerator; /** Test that the schema name can be customized. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java index a9be6115f..a22071ca9 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Import; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.doc.api.BaseRestDocumentation.ResultHandlerConfiguration; /** Base class for Rest Documentation tests. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/models/ReportRepresentationModelTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/models/ReportRepresentationModelTest.java index 4f8ea729e..63eb324a4 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/models/ReportRepresentationModelTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/models/ReportRepresentationModelTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.monitor.api.reports.ClassificationReport; import pro.taskana.monitor.api.reports.WorkbasketReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskCommentControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskCommentControllerIntTest.java index 2b8ea1f05..119b372f8 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskCommentControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskCommentControllerIntTest.java @@ -2,7 +2,7 @@ package pro.taskana.task.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.time.Instant; import java.util.Comparator; @@ -18,9 +18,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.rest.models.TaskCommentRepresentationModel; /** Test TaskCommentController. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java index 28be76523..0d35d7b7b 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java @@ -3,7 +3,7 @@ package pro.taskana.task.rest; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.io.BufferedWriter; import java.io.OutputStreamWriter; @@ -30,9 +30,9 @@ import org.springframework.web.client.RestTemplate; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.ObjectReference; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentRepresentationModelAssemblerTest.java index 0233ba569..aab4e2cc4 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentRepresentationModelAssemblerTest.java @@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.ObjectReference; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentSummaryRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentSummaryRepresentationModelAssemblerTest.java index 4fcabc92e..87322f384 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentSummaryRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/AttachmentSummaryRepresentationModelAssemblerTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.AttachmentSummary; import pro.taskana.task.api.models.ObjectReference; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskCommentRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskCommentRepresentationModelAssemblerTest.java index 7279c620e..2138759d2 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskCommentRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskCommentRepresentationModelAssemblerTest.java @@ -6,7 +6,7 @@ import java.time.Instant; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskComment; import pro.taskana.task.internal.models.TaskCommentImpl; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java index c00c1a272..9c8475a29 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java @@ -14,7 +14,7 @@ import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java index eac6919bf..74432c5aa 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.AttachmentSummary; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java index c8358cc3e..05c2fe4fa 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java @@ -18,9 +18,9 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel; /** Test WorkbasketAccessItemController. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java index b2609ac39..d5095af97 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java @@ -2,7 +2,7 @@ package pro.taskana.workbasket.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.time.Instant; import java.util.Optional; @@ -20,9 +20,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel; import pro.taskana.workbasket.rest.models.WorkbasketRepresentationModel; @@ -51,8 +51,8 @@ class WorkbasketControllerIntTest { @Test void testGetWorkbasket() { - final String url = restHelper.toUrl(Mapping.URL_WORKBASKET_ID, - "WBI:100000000000000000000000000000000006"); + final String url = + restHelper.toUrl(Mapping.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006"); ResponseEntity response = TEMPLATE.exchange( url, diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java index 8d4de7e54..d0d6972e6 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java @@ -3,7 +3,7 @@ package pro.taskana.workbasket.rest; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static pro.taskana.common.rest.RestHelper.TEMPLATE; +import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; @@ -35,10 +35,10 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpStatusCodeException; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.RestHelper; -import pro.taskana.common.rest.TaskanaSpringBootTest; import pro.taskana.common.rest.models.TaskanaPagedModel; import pro.taskana.common.rest.models.TaskanaPagedModelKeys; +import pro.taskana.common.test.rest.RestHelper; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.workbasket.rest.models.WorkbasketDefinitionRepresentationModel; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java index d2dc84abd..132f8782f 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java @@ -22,7 +22,7 @@ import static pro.taskana.workbasket.api.WorkbasketPermission.TRANSFER; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java index d125f6f30..f0ae68fee 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java @@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.SpyBean; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; import pro.taskana.workbasket.api.models.WorkbasketSummary; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssemblerTest.java index 0f7d6a106..1cfd45f90 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssemblerTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.common.rest.Mapping; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketCustomField; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java index 080744ea5..35bfa586d 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java @@ -10,7 +10,7 @@ import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.common.rest.TaskanaSpringBootTest; +import pro.taskana.common.test.rest.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.models.WorkbasketSummary;