TSK-1406: moved spring-boot test classes to dedicated test module
This commit is contained in:
parent
ce6ea19a5b
commit
427ff366c3
|
@ -16,15 +16,63 @@
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<artifactId>junit-jupiter</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>pro.taskana</groupId>
|
<groupId>pro.taskana</groupId>
|
||||||
<artifactId>taskana-common</artifactId>
|
<artifactId>taskana-common</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>pro.taskana</groupId>
|
||||||
|
<artifactId>taskana-common-data</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
|
<artifactId>jackson-module-parameter-names</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
|
<artifactId>jackson-datatype-jdk8</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-web</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.hateoas</groupId>
|
||||||
|
<artifactId>spring-hateoas</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-autoconfigure</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-jdbc</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-logging</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- TEST DEPENDENCIES -->
|
<!-- TEST DEPENDENCIES -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -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.DeserializationFeature;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@ -1,4 +1,4 @@
|
||||||
package pro.taskana.common.rest;
|
package pro.taskana.common.test.rest;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Inherited;
|
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.annotation.DirtiesContext.ClassMode;
|
||||||
import org.springframework.test.context.ActiveProfiles;
|
import org.springframework.test.context.ActiveProfiles;
|
||||||
|
|
||||||
import pro.taskana.TestConfiguration;
|
|
||||||
|
|
||||||
/** Use this annotation to test with a spring context and a standardized configuration. */
|
/** Use this annotation to test with a spring context and a standardized configuration. */
|
||||||
@Target(ElementType.TYPE)
|
@Target(ElementType.TYPE)
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
|
@ -1,10 +1,11 @@
|
||||||
package pro.taskana;
|
package pro.taskana.common.test.rest;
|
||||||
|
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
import org.springframework.context.annotation.DependsOn;
|
import org.springframework.context.annotation.DependsOn;
|
||||||
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
||||||
import org.springframework.transaction.PlatformTransactionManager;
|
import org.springframework.transaction.PlatformTransactionManager;
|
||||||
|
@ -12,6 +13,7 @@ import org.springframework.transaction.PlatformTransactionManager;
|
||||||
import pro.taskana.sampledata.SampleDataGenerator;
|
import pro.taskana.sampledata.SampleDataGenerator;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
|
@ComponentScan("pro.taskana")
|
||||||
@DependsOn("getTaskanaEngine") // wait for schema to be created BEFORE inserting test data
|
@DependsOn("getTaskanaEngine") // wait for schema to be created BEFORE inserting test data
|
||||||
public class TestConfiguration {
|
public class TestConfiguration {
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>${version.jackson-databind}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
|
|
|
@ -169,6 +169,8 @@ class ArchitectureTest {
|
||||||
.haveSimpleNameNotEndingWith("AbstractTaskanaJob")
|
.haveSimpleNameNotEndingWith("AbstractTaskanaJob")
|
||||||
.and()
|
.and()
|
||||||
.resideInAPackage("..common..")
|
.resideInAPackage("..common..")
|
||||||
|
.and()
|
||||||
|
.resideOutsideOfPackage("..common.test..")
|
||||||
.should()
|
.should()
|
||||||
.dependOnClassesThat()
|
.dependOnClassesThat()
|
||||||
.resideInAPackage(p)
|
.resideInAPackage(p)
|
||||||
|
|
1
pom.xml
1
pom.xml
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
<version.mybatis>3.5.6</version.mybatis>
|
<version.mybatis>3.5.6</version.mybatis>
|
||||||
<version.json>20200518</version.json>
|
<version.json>20200518</version.json>
|
||||||
<version.jackson-databind>2.11.2</version.jackson-databind>
|
|
||||||
|
|
||||||
<!-- build dependencies -->
|
<!-- build dependencies -->
|
||||||
<version.checkstyle>8.36.2</version.checkstyle>
|
<version.checkstyle>8.36.2</version.checkstyle>
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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<String> 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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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 {}
|
|
|
@ -1,7 +1,7 @@
|
||||||
package pro.taskana.jobs;
|
package pro.taskana.jobs;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
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.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -15,13 +15,13 @@ import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
|
||||||
import pro.taskana.RestHelper;
|
|
||||||
import pro.taskana.TaskanaSpringBootTest;
|
|
||||||
import pro.taskana.classification.api.models.Classification;
|
import pro.taskana.classification.api.models.Classification;
|
||||||
import pro.taskana.classification.rest.assembler.ClassificationRepresentationModelAssembler;
|
import pro.taskana.classification.rest.assembler.ClassificationRepresentationModelAssembler;
|
||||||
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
||||||
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.api.models.Task;
|
||||||
import pro.taskana.task.rest.assembler.TaskRepresentationModelAssembler;
|
import pro.taskana.task.rest.assembler.TaskRepresentationModelAssembler;
|
||||||
import pro.taskana.task.rest.models.TaskRepresentationModel;
|
import pro.taskana.task.rest.models.TaskRepresentationModel;
|
||||||
|
|
|
@ -6,9 +6,9 @@ import java.util.List;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import pro.taskana.TaskanaSpringBootTest;
|
|
||||||
import pro.taskana.common.rest.ldap.LdapClient;
|
import pro.taskana.common.rest.ldap.LdapClient;
|
||||||
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/** Test Ldap attachment. */
|
/** Test Ldap attachment. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
|
|
|
@ -70,11 +70,6 @@ public class SpringBootWebSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
return bean;
|
return bean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
|
||||||
public DefaultSpringSecurityContextSource defaultSpringSecurityContextSource() {
|
|
||||||
return new DefaultSpringSecurityContextSource(ldapServerUrl + "/" + ldapBaseDn);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public LdapAuthoritiesPopulator authoritiesPopulator() {
|
public LdapAuthoritiesPopulator authoritiesPopulator() {
|
||||||
Function<Map<String, List<String>>, GrantedAuthority> authorityMapper =
|
Function<Map<String, List<String>>, GrantedAuthority> authorityMapper =
|
||||||
|
@ -93,6 +88,11 @@ public class SpringBootWebSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
return populator;
|
return populator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public DefaultSpringSecurityContextSource defaultSpringSecurityContextSource() {
|
||||||
|
return new DefaultSpringSecurityContextSource(ldapServerUrl + "/" + ldapBaseDn);
|
||||||
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public GrantedAuthoritiesMapper grantedAuthoritiesMapper() {
|
public GrantedAuthoritiesMapper grantedAuthoritiesMapper() {
|
||||||
SimpleAuthorityMapper grantedAuthoritiesMapper = new SimpleAuthorityMapper();
|
SimpleAuthorityMapper grantedAuthoritiesMapper = new SimpleAuthorityMapper();
|
||||||
|
|
|
@ -20,9 +20,9 @@ import org.springframework.web.client.RestTemplate;
|
||||||
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test ClassificationController.
|
* Test ClassificationController.
|
||||||
|
|
|
@ -2,7 +2,7 @@ package pro.taskana.classification.rest;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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 com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import java.io.File;
|
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.ClassificationRepresentationModel;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
import pro.taskana.common.rest.models.TaskanaPagedModelKeys;
|
import pro.taskana.common.rest.models.TaskanaPagedModelKeys;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/** Test classification definitions. */
|
/** Test classification definitions. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
|
|
|
@ -12,7 +12,7 @@ import pro.taskana.classification.api.models.Classification;
|
||||||
import pro.taskana.classification.internal.models.ClassificationImpl;
|
import pro.taskana.classification.internal.models.ClassificationImpl;
|
||||||
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationRepresentationModel;
|
||||||
import pro.taskana.common.rest.Mapping;
|
import pro.taskana.common.rest.Mapping;
|
||||||
import pro.taskana.common.rest.TaskanaSpringBootTest;
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/** Test for {@link ClassificationRepresentationModelAssembler}. */
|
/** Test for {@link ClassificationRepresentationModelAssembler}. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
|
|
|
@ -17,7 +17,7 @@ import pro.taskana.classification.api.ClassificationService;
|
||||||
import pro.taskana.classification.api.models.ClassificationSummary;
|
import pro.taskana.classification.api.models.ClassificationSummary;
|
||||||
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
|
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.rest.TaskanaSpringBootTest;
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/** Test for {@link ClassificationSummaryRepresentationModelAssembler}. */
|
/** Test for {@link ClassificationSummaryRepresentationModelAssembler}. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
|
|
|
@ -2,7 +2,7 @@ package pro.taskana.common.rest;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -18,6 +18,8 @@ import org.springframework.test.context.ActiveProfiles;
|
||||||
import org.springframework.web.client.HttpClientErrorException;
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
|
|
||||||
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
@ActiveProfiles({"test"})
|
@ActiveProfiles({"test"})
|
||||||
|
|
|
@ -13,6 +13,8 @@ import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.rest.models.TaskanaPagedModel;
|
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. */
|
/** Test general Exception Handling. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
|
@ -24,7 +26,8 @@ class GeneralExceptionHandlingTest {
|
||||||
new ParameterizedTypeReference<
|
new ParameterizedTypeReference<
|
||||||
TaskanaPagedModel<ClassificationSummaryRepresentationModel>>() {};
|
TaskanaPagedModel<ClassificationSummaryRepresentationModel>>() {};
|
||||||
private static RestTemplate template;
|
private static RestTemplate template;
|
||||||
@Autowired RestHelper restHelper;
|
@Autowired
|
||||||
|
RestHelper restHelper;
|
||||||
|
|
||||||
@BeforeAll
|
@BeforeAll
|
||||||
static void init() {
|
static void init() {
|
||||||
|
|
|
@ -13,13 +13,16 @@ import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import pro.taskana.common.api.TaskanaRole;
|
import pro.taskana.common.api.TaskanaRole;
|
||||||
import pro.taskana.common.rest.models.TaskanaUserInfoRepresentationModel;
|
import pro.taskana.common.rest.models.TaskanaUserInfoRepresentationModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
|
|
||||||
/** Test TaskanaEngineController. */
|
/** Test TaskanaEngineController. */
|
||||||
@TaskanaSpringBootTest
|
@TaskanaSpringBootTest
|
||||||
class TaskanaEngineControllerIntTest {
|
class TaskanaEngineControllerIntTest {
|
||||||
|
|
||||||
private static RestTemplate template;
|
private static RestTemplate template;
|
||||||
@Autowired RestHelper restHelper;
|
@Autowired
|
||||||
|
RestHelper restHelper;
|
||||||
|
|
||||||
@BeforeAll
|
@BeforeAll
|
||||||
static void init() {
|
static void init() {
|
||||||
|
|
|
@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import pro.taskana.SpringTaskanaEngineConfiguration;
|
import pro.taskana.SpringTaskanaEngineConfiguration;
|
||||||
import pro.taskana.common.internal.configuration.DB;
|
import pro.taskana.common.internal.configuration.DB;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
import pro.taskana.sampledata.SampleDataGenerator;
|
import pro.taskana.sampledata.SampleDataGenerator;
|
||||||
|
|
||||||
/** Test that the schema name can be customized. */
|
/** Test that the schema name can be customized. */
|
||||||
|
|
|
@ -13,8 +13,8 @@ import org.springframework.context.annotation.Import;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.web.context.WebApplicationContext;
|
import org.springframework.web.context.WebApplicationContext;
|
||||||
|
|
||||||
import pro.taskana.common.rest.RestHelper;
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
import pro.taskana.common.rest.TaskanaSpringBootTest;
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
import pro.taskana.doc.api.BaseRestDocumentation.ResultHandlerConfiguration;
|
import pro.taskana.doc.api.BaseRestDocumentation.ResultHandlerConfiguration;
|
||||||
|
|
||||||
/** Base class for Rest Documentation tests. */
|
/** Base class for Rest Documentation tests. */
|
||||||
|
|
|
@ -16,7 +16,7 @@ import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.ClassificationReport;
|
||||||
import pro.taskana.monitor.api.reports.WorkbasketReport;
|
import pro.taskana.monitor.api.reports.WorkbasketReport;
|
||||||
import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
|
import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
|
||||||
|
|
|
@ -2,7 +2,7 @@ package pro.taskana.task.rest;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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.time.Instant;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
@ -18,9 +18,9 @@ import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.client.HttpClientErrorException;
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
|
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
import pro.taskana.task.rest.models.TaskCommentRepresentationModel;
|
import pro.taskana.task.rest.models.TaskCommentRepresentationModel;
|
||||||
|
|
||||||
/** Test TaskCommentController. */
|
/** Test TaskCommentController. */
|
||||||
|
|
|
@ -3,7 +3,7 @@ package pro.taskana.task.rest;
|
||||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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.BufferedWriter;
|
||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
|
@ -30,9 +30,9 @@ import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
import pro.taskana.sampledata.SampleDataGenerator;
|
import pro.taskana.sampledata.SampleDataGenerator;
|
||||||
import pro.taskana.task.api.TaskState;
|
import pro.taskana.task.api.TaskState;
|
||||||
import pro.taskana.task.api.models.ObjectReference;
|
import pro.taskana.task.api.models.ObjectReference;
|
||||||
|
|
|
@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import pro.taskana.classification.api.ClassificationService;
|
import pro.taskana.classification.api.ClassificationService;
|
||||||
import pro.taskana.classification.api.models.ClassificationSummary;
|
import pro.taskana.classification.api.models.ClassificationSummary;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
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.TaskService;
|
||||||
import pro.taskana.task.api.models.Attachment;
|
import pro.taskana.task.api.models.Attachment;
|
||||||
import pro.taskana.task.api.models.ObjectReference;
|
import pro.taskana.task.api.models.ObjectReference;
|
||||||
|
|
|
@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import pro.taskana.classification.api.ClassificationService;
|
import pro.taskana.classification.api.ClassificationService;
|
||||||
import pro.taskana.classification.api.models.ClassificationSummary;
|
import pro.taskana.classification.api.models.ClassificationSummary;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
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.TaskService;
|
||||||
import pro.taskana.task.api.models.AttachmentSummary;
|
import pro.taskana.task.api.models.AttachmentSummary;
|
||||||
import pro.taskana.task.api.models.ObjectReference;
|
import pro.taskana.task.api.models.ObjectReference;
|
||||||
|
|
|
@ -6,7 +6,7 @@ import java.time.Instant;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.TaskService;
|
||||||
import pro.taskana.task.api.models.TaskComment;
|
import pro.taskana.task.api.models.TaskComment;
|
||||||
import pro.taskana.task.internal.models.TaskCommentImpl;
|
import pro.taskana.task.internal.models.TaskCommentImpl;
|
||||||
|
|
|
@ -14,7 +14,7 @@ import pro.taskana.classification.api.models.ClassificationSummary;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
||||||
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskCustomField;
|
||||||
import pro.taskana.task.api.TaskService;
|
import pro.taskana.task.api.TaskService;
|
||||||
import pro.taskana.task.api.TaskState;
|
import pro.taskana.task.api.TaskState;
|
||||||
|
|
|
@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import pro.taskana.classification.api.ClassificationService;
|
import pro.taskana.classification.api.ClassificationService;
|
||||||
import pro.taskana.classification.api.models.ClassificationSummary;
|
import pro.taskana.classification.api.models.ClassificationSummary;
|
||||||
import pro.taskana.classification.rest.models.ClassificationSummaryRepresentationModel;
|
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.TaskService;
|
||||||
import pro.taskana.task.api.TaskState;
|
import pro.taskana.task.api.TaskState;
|
||||||
import pro.taskana.task.api.models.AttachmentSummary;
|
import pro.taskana.task.api.models.AttachmentSummary;
|
||||||
|
|
|
@ -18,9 +18,9 @@ import org.springframework.web.client.HttpClientErrorException;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
|
import pro.taskana.common.test.rest.RestHelper;
|
||||||
|
import pro.taskana.common.test.rest.TaskanaSpringBootTest;
|
||||||
import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel;
|
import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel;
|
||||||
|
|
||||||
/** Test WorkbasketAccessItemController. */
|
/** Test WorkbasketAccessItemController. */
|
||||||
|
|
|
@ -2,7 +2,7 @@ package pro.taskana.workbasket.rest;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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.time.Instant;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
@ -20,9 +20,9 @@ import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.client.HttpClientErrorException;
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
|
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.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.api.WorkbasketType;
|
||||||
import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel;
|
import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel;
|
||||||
import pro.taskana.workbasket.rest.models.WorkbasketRepresentationModel;
|
import pro.taskana.workbasket.rest.models.WorkbasketRepresentationModel;
|
||||||
|
@ -51,8 +51,8 @@ class WorkbasketControllerIntTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testGetWorkbasket() {
|
void testGetWorkbasket() {
|
||||||
final String url = restHelper.toUrl(Mapping.URL_WORKBASKET_ID,
|
final String url =
|
||||||
"WBI:100000000000000000000000000000000006");
|
restHelper.toUrl(Mapping.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006");
|
||||||
ResponseEntity<WorkbasketRepresentationModel> response =
|
ResponseEntity<WorkbasketRepresentationModel> response =
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
url,
|
url,
|
||||||
|
|
|
@ -3,7 +3,7 @@ package pro.taskana.workbasket.rest;
|
||||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
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 com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
@ -35,10 +35,10 @@ import org.springframework.web.client.HttpClientErrorException;
|
||||||
import org.springframework.web.client.HttpStatusCodeException;
|
import org.springframework.web.client.HttpStatusCodeException;
|
||||||
|
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.TaskanaPagedModel;
|
||||||
import pro.taskana.common.rest.models.TaskanaPagedModelKeys;
|
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.sampledata.SampleDataGenerator;
|
||||||
import pro.taskana.workbasket.rest.models.WorkbasketDefinitionRepresentationModel;
|
import pro.taskana.workbasket.rest.models.WorkbasketDefinitionRepresentationModel;
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ import static pro.taskana.workbasket.api.WorkbasketPermission.TRANSFER;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.WorkbasketService;
|
||||||
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
|
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
|
||||||
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
|
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
|
||||||
|
|
|
@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.mock.mockito.SpyBean;
|
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.WorkbasketService;
|
||||||
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
|
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
|
||||||
import pro.taskana.workbasket.api.models.WorkbasketSummary;
|
import pro.taskana.workbasket.api.models.WorkbasketSummary;
|
||||||
|
|
|
@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import pro.taskana.common.rest.Mapping;
|
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.WorkbasketCustomField;
|
||||||
import pro.taskana.workbasket.api.WorkbasketService;
|
import pro.taskana.workbasket.api.WorkbasketService;
|
||||||
import pro.taskana.workbasket.api.WorkbasketType;
|
import pro.taskana.workbasket.api.WorkbasketType;
|
||||||
|
|
|
@ -10,7 +10,7 @@ import org.junit.Assert;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.WorkbasketService;
|
||||||
import pro.taskana.workbasket.api.WorkbasketType;
|
import pro.taskana.workbasket.api.WorkbasketType;
|
||||||
import pro.taskana.workbasket.api.models.WorkbasketSummary;
|
import pro.taskana.workbasket.api.models.WorkbasketSummary;
|
||||||
|
|
Loading…
Reference in New Issue