This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 147d72e186 ISIS-3275: JPA testsetup fixes
147d72e186 is described below
commit 147d72e186708570afad2539d4ceedd1e9886063
Author: Andi Huber <[email protected]>
AuthorDate: Thu Nov 17 07:20:06 2022 +0100
ISIS-3275: JPA testsetup fixes
---
.../commandlog/jpa/integtests/AppManifest.java | 18 ++++++++++++------
.../jpa/integtests/ExecutionLog_IntegTest.java | 8 +++++++-
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 8 +++++++-
.../jpa/integtests/AuditTrail_IntegTest.java | 9 +++++++--
.../dom/ApplicationPermissionRepository_IntegTest.java | 5 +++++
.../jpa/integtests/SessionLog_IntegTest.java | 5 +++++
.../inject/BeanManagerForEntityListeners.java | 6 ------
7 files changed, 43 insertions(+), 16 deletions(-)
diff --git
a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
index ea05142180..a6314e8cbc 100644
---
a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
+++
b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
@@ -18,12 +18,6 @@
*/
package org.apache.causeway.extensions.commandlog.jpa.integtests;
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import
org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
-import
org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
-import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -32,12 +26,24 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import
org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
+import
org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
+import org.apache.causeway.extensions.commandlog.jpa.integtests.model.Counter;
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
+
@SpringBootConfiguration
@EnableAutoConfiguration
@Import({
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtCommandLogPersistenceJpa.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, // because
something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class // because
something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
diff --git
a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index 47a0694bfd..a49039758d 100644
---
a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++
b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -35,6 +35,8 @@ import
org.apache.causeway.extensions.executionlog.applib.integtest.model.Execut
import
org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
import
org.apache.causeway.extensions.executionlog.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ExecutionLog_IntegTest.AppManifest.class
@@ -48,6 +50,9 @@ public class ExecutionLog_IntegTest extends
ExecutionLog_IntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionLogPersistenceJpa.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class //
because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
@@ -58,7 +63,8 @@ public class ExecutionLog_IntegTest extends
ExecutionLog_IntegTestAbstract {
}
- protected
org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter
newCounter(String name) {
+ @Override
+ protected
org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter
newCounter(final String name) {
return Counter.builder().name(name).build();
}
diff --git
a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index bf86f14179..29d15ac929 100644
---
a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++
b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -35,6 +35,8 @@ import
org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Exe
import
org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa;
import
org.apache.causeway.extensions.executionoutbox.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ExecutionOutbox_IntegTest.AppManifest.class
@@ -48,6 +50,9 @@ public class ExecutionOutbox_IntegTest extends
ExecutionOutbox_IntegTestAbstract
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class //
because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
@@ -58,7 +63,8 @@ public class ExecutionOutbox_IntegTest extends
ExecutionOutbox_IntegTestAbstract
}
- protected
org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter
newCounter(String name) {
+ @Override
+ protected
org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter
newCounter(final String name) {
return Counter.builder().name(name).build();
}
diff --git
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index afaf9e7a56..e483f51781 100644
---
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.extensions.audittrail.jpa.integtests;
-import jakarta.inject.Inject;
-
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -39,6 +37,10 @@ import
org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrail
import org.apache.causeway.extensions.audittrail.jpa.integtests.model.Counter;
import
org.apache.causeway.extensions.audittrail.jpa.integtests.model.CounterRepository;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
+
+import jakarta.inject.Inject;
@SpringBootTest(
classes = AuditTrail_IntegTest.AppManifest.class,
@@ -57,6 +59,9 @@ public class AuditTrail_IntegTest extends
AuditTrail_IntegTestAbstract {
CausewayModuleSecurityBypass.class,
CausewayModuleExtAuditTrailPersistenceJpa.class,
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class, //
because something? disables autoconfiguration
+
// entities, eager meta-model introspection
Counter.class,
})
diff --git
a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
index af8a49b55d..7301d5e76d 100644
---
a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++
b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -32,6 +32,8 @@ import
org.apache.causeway.extensions.secman.applib.ApplicationPermissionReposit
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import
org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = ApplicationPermissionRepository_IntegTest.AppManifest.class
@@ -46,6 +48,9 @@ class ApplicationPermissionRepository_IntegTest extends
ApplicationPermissionRep
CausewayModuleSecurityBypass.class,
CausewayModuleExtSecmanPersistenceJpa.class,
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class, //
because something? disables autoconfiguration
+
MmmModule.class,
})
@PropertySources({
diff --git
a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
index 885a19025d..a1f05c76c3 100644
---
a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
+++
b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
@@ -31,6 +31,8 @@ import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService
import
org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import
org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = SessionLog_IntegTest.AppManifest.class
@@ -45,6 +47,9 @@ public class SessionLog_IntegTest extends
SessionLogIntegTestAbstract {
CausewayModuleCoreRuntimeServices.class,
CausewayModuleSecurityBypass.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class //
because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test),
diff --git
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
index 88edba4f08..a7d77588b1 100644
---
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
+++
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/inject/BeanManagerForEntityListeners.java
@@ -122,12 +122,6 @@ public class BeanManagerForEntityListeners implements
BeanManager {
_Exceptions.throwNotImplemented();
}
-//TODO[ISIS-3275] investigate this removal
-// @Override
-// public void fireEvent(final Object event, final Annotation...
qualifiers) {
-// _Exceptions.throwNotImplemented();
-// }
-
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T
event, final Annotation... qualifiers) {
_Exceptions.throwNotImplemented();
