AAE-30611 test: revert on hibernate version to 6.5.3.Final

Activiti · Feb 12, 2025 · 65b0fa2 · 65b0fa2
1 parent 7388673
commit 65b0fa2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/...st/src/test/java/org/activiti/cloud/services/audit/jpa/security/RestrictEventQueryIT.java b/...st/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
@@ -70,6 +70,16 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.hibernate.orm</groupId>
+        <artifactId>hibernate-core</artifactId>
+        <version>${hibernate.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate.orm</groupId>
+        <artifactId>hibernate-jpamodelgen</artifactId>
+        <version>${hibernate.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>

diff --git a/...rter-query/src/test/java/org/activiti/cloud/starter/tests/QueryAdminProcessDiagramIT.java b/...rter-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/...test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionCandidateStartersIT.java b/...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/...tarter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessDefinitionIT.java b/...tarter-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
@@ -224,7 +224,7 @@
     <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 
     <!-- dependencies versions -->
-    <hibernate.version>6.6.3.Final</hibernate.version>
+    <hibernate.version>6.5.3.Final</hibernate.version>
     <classgraph.version>4.8.175</classgraph.version>