You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/07/24 05:08:06 UTC

[causeway] branch master updated: CAUSEWAY-3532: regr. testing: more concurrent test synchronization

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4cfa3e8495 CAUSEWAY-3532: regr. testing: more concurrent test synchronization
4cfa3e8495 is described below

commit 4cfa3e8495606886a1a0416c3b0ed0aeb811fe02
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Jul 24 07:08:03 2023 +0200

    CAUSEWAY-3532: regr. testing: more concurrent test synchronization
---
 .../persistence/jdo/JdoBootstrappingTest.java         | 16 ++++++++++++++++
 ...doExceptionTranslationTest_usingTransactional.java | 19 +++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
index 4037f45358..352f0ddf48 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
@@ -36,8 +36,10 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.base._Refs;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
+import org.apache.causeway.testdomain.fixtures.EntityTestFixtures.Lock;
 import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
 import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
@@ -54,6 +56,7 @@ import lombok.val;
 class JdoBootstrappingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private JdoTestFixtures testFixtures;
+    private static _Refs.ObjectReference<Lock> lockHolder = _Refs.objectRef(null);
 
     @BeforeAll
     static void beforeAll() throws SQLException {
@@ -61,6 +64,13 @@ class JdoBootstrappingTest extends CausewayIntegrationTestAbstract {
         // Util_H2Console.main(null);
     }
 
+    @Test @Order(0) @Rollback(false)
+    void aquireLock() {
+        val lock = testFixtures.aquireLock(); // concurrent test synchronization
+        lockHolder.set(lock);
+        lock.install();
+    }
+
     @Test @Order(1) @Rollback(false)
     void sampleInventoryShouldBeSetUp() {
 
@@ -95,4 +105,10 @@ class JdoBootstrappingTest extends CausewayIntegrationTestAbstract {
         sampleInventoryShouldBeSetUp();
     }
 
+    @Test @Order(3)
+    void releaseLock() {
+        lockHolder.getValue()
+            .ifPresent(Lock::release); // concurrent test synchronization
+    }
+
 }
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
index 534bf6e7b7..01e88f7234 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
@@ -41,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.internal.base._Refs;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.RegressionTestAbstract;
 import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
@@ -65,7 +66,7 @@ extends RegressionTestAbstract {
 
     @Inject private JdoTestFixtures testFixtures;
     @Inject private Provider<JdoInventoryDao> inventoryDao;
-    private Lock lock;
+    private static _Refs.ObjectReference<Lock> lockHolder = _Refs.objectRef(null);
 
     @BeforeAll
     static void beforeAll() throws SQLException {
@@ -73,15 +74,19 @@ extends RegressionTestAbstract {
         // Util_H2Console.main(null);
     }
 
+    @Test @Order(0)
+    void aquireLock() {
+        val lock = testFixtures.aquireLock(); // concurrent test synchronization
+        lockHolder.set(lock);
+        lock.install();
+    }
+
     @Test @Order(1)
     void booksUniqueByIsbn_whenViolated_shouldThrowTranslatedException() {
 
         // when adding a book for which one with same ISBN already exists in the database,
         // we expect to see a Spring recognized DataAccessException been thrown
 
-        this.lock = testFixtures.aquireLock();
-        lock.install();
-
         final ThrowingRunnable uniqueConstraintViolator =
                 ()->inventoryDao.get().addBook_havingIsbnA_usingRepositoryService();
 
@@ -128,4 +133,10 @@ extends RegressionTestAbstract {
 
     }
 
+    @Test @Order(3)
+    void releaseLock() {
+        lockHolder.getValue()
+            .ifPresent(Lock::release); // concurrent test synchronization
+    }
+
 }