diff --git a/activiti-cloud-audit-service/activiti-cloud-services-audit-rest/src/test/java/org/activiti/cloud/services/audit/jpa/security/RestrictEventQueryIT.java b/activiti-cloud-audit-service/activiti-cloud-services-audit-rest/src/test/java/org/activiti/cloud/services/audit/jpa/security/RestrictEventQueryIT.java index b83936a62d5..4ce31d0930a 100644 --- a/activiti-cloud-audit-service/activiti-cloud-services-audit-rest/src/test/java/org/activiti/cloud/services/audit/jpa/security/RestrictEventQueryIT.java +++ b/activiti-cloud-audit-service/activiti-cloud-services-audit-rest/src/test/java/org/activiti/cloud/services/audit/jpa/security/RestrictEventQueryIT.java @@ -26,7 +26,6 @@ import org.activiti.cloud.services.audit.jpa.events.ProcessStartedAuditEventEntity; import org.activiti.cloud.services.audit.jpa.repository.EventsRepository; import org.activiti.core.common.spring.security.policies.SecurityPolicyAccess; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -38,7 +37,6 @@ @TestPropertySource("classpath:application-test.properties") @SpringBootTest @EnableAutoConfiguration -@Disabled public class RestrictEventQueryIT { @Autowired diff --git a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml index bb965075d76..58f394537ab 100644 --- a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml +++ b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml @@ -70,6 +70,16 @@ pom import + + org.hibernate.orm + hibernate-core + ${hibernate.version} + + + org.hibernate.orm + hibernate-jpamodelgen + ${hibernate.version} + org.postgresql postgresql diff --git a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java index 814097dd7de..3ae5df37b7a 100644 --- a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java +++ b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java @@ -46,9 +46,9 @@ import org.awaitility.Durations; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.info.BuildProperties; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; @@ -60,6 +60,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.bean.override.mockito.MockitoBean; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestPropertySource("classpath:application-test-admin.properties") @@ -94,6 +95,9 @@ public class QueryAdminProcessDiagramIT { @Autowired private TestRestTemplate testRestTemplate; + @MockitoBean + private BuildProperties buildProperties; + private String processDefinitionId = UUID.randomUUID().toString(); private EventsAggregator eventsAggregator; @@ -132,7 +136,6 @@ public void tearDown() { bpmnSequenceFlowRepository.deleteAll(); } - @Disabled("404 response") @Test public void shouldGetProcessInstanceDiagramAdmin() throws InterruptedException { //given diff --git a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java index 5abb3c790d8..13529ec4735 100644 --- a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java +++ b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java @@ -34,9 +34,9 @@ import org.activiti.cloud.starters.test.MyProducer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.info.BuildProperties; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; import org.springframework.context.annotation.Import; @@ -45,13 +45,13 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.bean.override.mockito.MockitoBean; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestPropertySource("classpath:application-test.properties") @Import({ ProcessDefinitionRestTemplate.class, TestChannelBinderConfiguration.class }) @ContextConfiguration(initializers = { KeycloakContainerApplicationInitializer.class }) @DirtiesContext -@Disabled("Assertions not met, probably due to spring-cloud-function") public class QueryProcessDefinitionCandidateStartersIT { @Autowired @@ -69,6 +69,9 @@ public class QueryProcessDefinitionCandidateStartersIT { @Autowired private MyProducer producer; + @MockitoBean + private BuildProperties buildProperties; + @BeforeEach public void setUp() { identityTokenProducer.withTestUser("hruser"); diff --git a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java index 1bf3c26f0e1..4a4b86e4f13 100644 --- a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java +++ b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java @@ -35,9 +35,9 @@ import org.activiti.cloud.starters.test.MyProducer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.info.BuildProperties; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; import org.springframework.context.annotation.Import; @@ -46,6 +46,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.util.StreamUtils; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -72,6 +73,9 @@ public class QueryProcessDefinitionIT { @Autowired private MyProducer producer; + @MockitoBean + private BuildProperties buildProperties; + @BeforeEach public void setUp() { identityTokenProducer.withTestUser("hruser"); @@ -83,7 +87,6 @@ public void tearDown() { processDefinitionRepository.deleteAll(); } - @Disabled("No response") @Test public void shouldGetAvailableProcessDefinitions() { //given @@ -123,7 +126,6 @@ public void shouldGetAvailableProcessDefinitions() { ); } - @Disabled("404 no response") @Test public void shouldGetAvailableProcessModels() throws Exception { //given @@ -182,7 +184,6 @@ public void shouldGetAvailableProcessModels() throws Exception { .isXmlEqualToContentOf(new File("src/test/resources/parse-for-test/SimpleProcess.bpmn20.xml")); } - @Disabled("No response") @Test public void shouldFilterOnProcessKey() { //given @@ -215,7 +216,6 @@ public void shouldFilterOnProcessKey() { .containsExactly(tuple(secondProcessDefinition.getId(), "My second Process", "mySecondProcess")); } - @Disabled("No response") @Test public void shouldUpdateDefinitionOnDuplicate() { //given @@ -254,7 +254,6 @@ public void shouldUpdateDefinitionOnDuplicate() { ); } - @Disabled("No response") @Test public void shouldUpdateProcessModelOnDuplicate() throws Exception { //given diff --git a/pom.xml b/pom.xml index 5db5c7480a4..c94ed65bb81 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ 2.22.2 - 6.6.3.Final + 6.5.3.Final 4.8.175