This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3654
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/CAUSEWAY-3654 by this push:
new 8587401858 CAUSEWAY-3654: fixes order of wrapping; reenable commented
out tests to see what gives
8587401858 is described below
commit 858740185885c8d91a6a2ab40dc0a72a54cfb0a5
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Dec 12 08:01:05 2023 +0000
CAUSEWAY-3654: fixes order of wrapping; reenable commented out tests to see
what gives
---
.../persistence/jdo/JdoExceptionTranslationTest.java | 2 +-
.../causeway/testdomain/persistence/jdo/JdoJaxbTest.java | 2 +-
.../causeway/testdomain/RegressionTestAbstract.java | 15 +++++++--------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
index a2f3080f5c..c8ac7f895c 100644
---
a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
+++
b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
@@ -60,7 +60,7 @@ class JdoExceptionTranslationTest extends
RegressionTestWithJdoFixtures {
// Util_H2Console.main(null);
}
- @Disabled // CAUSEWAY-3654
+ // @Disabled // CAUSEWAY-3654
@Test
void booksUniqueByIsbn_whenViolated_shouldThrowTranslatedException() {
diff --git
a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
index 40ddb7df76..2ebefdc81a 100644
---
a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
+++
b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
@@ -46,7 +46,7 @@ class JdoJaxbTest extends RegressionTestWithJdoFixtures {
@Inject private JaxbService jaxbService;
- @Disabled // CAUSEWAY-3654
+ // @Disabled // CAUSEWAY-3654
@Test
void inventoryJaxbVm_shouldRoundtripProperly() {
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
index 8bc152b5b1..1c6a3dd564 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
@@ -39,19 +39,18 @@ import
org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
* Manage interactions yourself, by either wrapping your code blocks
* with {@link #run(ThrowingRunnable)} or {@link #call(Callable)}.
*/
-public abstract class RegressionTestAbstract extends
CausewayIntegrationTestAbstract {
+public abstract class RegressionTestAbstract {
protected void run(final ThrowingRunnable runnable) {
- transactionService.runTransactional(Propagation.REQUIRES_NEW, ()->
- interactionService.runAnonymous(runnable))
- .ifFailureFail();
+ interactionService.runAnonymous(() ->
+ transactionService.runTransactional(Propagation.REQUIRES_NEW,
runnable).ifFailureFail()
+ );
}
protected <T> T call(final Callable<T> callable) {
- return transactionService.callTransactional(Propagation.REQUIRES_NEW,
()->
- interactionService.callAnonymous(callable))
- // assuming return value of callable is not nullable
- .valueAsNonNullElseFail();
+ return interactionService.callAnonymous(() ->
+ transactionService.callTransactional(Propagation.REQUIRES_NEW,
callable))
+ .valueAsNonNullElseFail();
}
// -- ASSERTIONS
