(causeway) branch v4 updated: CAUSEWAY-3897: another attempt on stabilizing tests (RO)

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v4
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/v4 by this push:
     new fff97ed9f6b CAUSEWAY-3897: another attempt on stabilizing tests (RO)
fff97ed9f6b is described below

commit fff97ed9f6b2bfb51e064eab1900700b6babdc33
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Jul 8 23:39:52 2025 +0200

    CAUSEWAY-3897: another attempt on stabilizing tests (RO)
---
 .../restfulobjects/test/scenarios/Abstract_IntegTest.java | 15 ---------------
 .../test/scenarios/staff/Staff_IntegTest.java             |  2 ++
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git 
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/Abstract_IntegTest.java
 
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/Abstract_IntegTest.java
index 823d8aa2449..9c1c45e91f7 100644
--- 
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/Abstract_IntegTest.java
+++ 
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/Abstract_IntegTest.java
@@ -34,7 +34,6 @@
 import org.springframework.transaction.annotation.Propagation;
 
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.xactn.TransactionState;
 import 
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
 import 
org.apache.causeway.viewer.restfulobjects.test.CausewayViewerRestfulObjectsIntegTestAbstract;
 import org.apache.causeway.viewer.restfulobjects.test.domain.UniversityModule;
@@ -94,25 +93,11 @@ protected void beforeEach(){
             staffMemberRepository.create("Margaret Randall", physics);
 
         });
-
     }
 
     @Override
     @AfterEach
     protected void afterEach(){
-
-        int maxiter = 20;
-        while(maxiter>0
-                && 
transactionService.currentTransactionState()!=TransactionState.NONE) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            System.err.printf("Waiting for current transaction to complete 
(%d)%n", maxiter);
-            --maxiter;
-        }
-
         transactionService.runTransactional(Propagation.REQUIRES_NEW, () -> {
             staffMemberRepository.removeAll();
             deptHeadRepository.findAll().forEach(x -> x.setDepartment(null));
diff --git 
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_IntegTest.java
 
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_IntegTest.java
index f65e86f5a2a..a5aaaec22a6 100644
--- 
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_IntegTest.java
+++ 
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/scenarios/staff/Staff_IntegTest.java
@@ -116,6 +116,8 @@ void createStaffMemberWithPhoto(final Scenario scenario) {
         var entity = response.body(String.class);
         assertNotNull(entity);
 
+        Thread.sleep(2000);
+
         epilog();
     }