You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/03/08 11:16:48 UTC
(causeway) branch CAUSEWAY-3676 updated: CAUSEWAY-3676: fixes integ tests bootstrapping
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/CAUSEWAY-3676 by this push:
new f72e063548 CAUSEWAY-3676: fixes integ tests bootstrapping
f72e063548 is described below
commit f72e063548ff6d657c1f38b8b82c0dc424a94e88
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 8 11:15:44 2024 +0000
CAUSEWAY-3676: fixes integ tests bootstrapping
---
.../logonlog/WebModuleLogOnExceptionLogger.java | 12 +++++++----
.../viewer/test/domain/UniversityModule.java | 3 +++
.../viewer/test/e2e/Abstract_IntegTest.java | 23 +++++++++++++++++++++-
.../CausewayViewerGraphqlIntegTestAbstract.java | 1 -
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index 5be3cf2887..eeccede811 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -33,6 +33,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
+import lombok.val;
/**
* WebModule to log log-on exceptions.
@@ -62,10 +63,13 @@ public final class WebModuleLogOnExceptionLogger extends WebModuleAbstract {
registerFilter(ctx, LOGONLOGGER_FILTER_NAME, CausewayLogOnExceptionFilter.class)
.ifPresent(filterReg -> {
- filterReg.addMappingForUrlPatterns(
- null,
- true, // filterReg is forced last
- webModuleContext.getProtectedPaths().toArray(String.class));
+ val protectedPaths = webModuleContext.getProtectedPaths();
+ if(protectedPaths.isNotEmpty()) {
+ filterReg.addMappingForUrlPatterns(
+ null,
+ true, // filterReg is forced last
+ protectedPaths.toArray(String.class));
+ }
});
return Can.empty(); // registers no listeners
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
index 1d163cd829..548a1bb73c 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
@@ -18,9 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain;
+import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
+
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@Configuration
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
index f325f48be1..d9585cfbd3 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
@@ -20,10 +20,30 @@ package org.apache.causeway.viewer.graphql.viewer.test.e2e;
import javax.inject.Inject;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
+
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import org.apache.causeway.viewer.graphql.viewer.CausewayModuleViewerGraphqlViewer;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureHttpGraphQlTester;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.transaction.annotation.Propagation;
@@ -39,7 +59,8 @@ import org.apache.causeway.viewer.graphql.viewer.testsupport.CausewayViewerGraph
@Import({
- UniversityModule.class
+ UniversityModule.class,
+ CausewayModulePersistenceJpaEclipselink.class,
})
public abstract class Abstract_IntegTest extends CausewayViewerGraphqlIntegTestAbstract {
diff --git a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
index 06bf054153..f248d6b73b 100644
--- a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
+++ b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
@@ -156,7 +156,6 @@ public abstract class CausewayViewerGraphqlIntegTestAbstract {
@PropertySource(CausewayPresets.SilenceProgrammingModel),
})
public static class TestApp {
-
}
@Inject protected CausewaySystemEnvironment causewaySystemEnvironment;