You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/01/18 07:21:49 UTC
[isis-app-simpleapp] branch v2.0.0-jpa-SNAPSHOT updated: attempting
to get the integ tests to pass
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2.0.0-jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/v2.0.0-jpa-SNAPSHOT by this push:
new 402b748 attempting to get the integ tests to pass
402b748 is described below
commit 402b748374004c00c2ffedea614b500f34c04279
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 18 07:21:35 2021 +0000
attempting to get the integ tests to pass
---
module-simple/src/test/java/application.properties | 5 +++++
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 5 ++---
webapp/src/main/resources/config/application-SQLSERVER.properties | 1 +
.../domainapp/webapp/integtests/ApplicationIntegTestAbstract.java | 4 ++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/module-simple/src/test/java/application.properties b/module-simple/src/test/java/application.properties
new file mode 100644
index 0000000..6669447
--- /dev/null
+++ b/module-simple/src/test/java/application.properties
@@ -0,0 +1,5 @@
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=sa
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 2386763..79d13f7 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jpa.integration.IsisModuleJpaIntegration;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -20,7 +20,6 @@ import domainapp.modules.simple.SimpleModule;
)
@TestPropertySource({
IsisPresets.H2InMemory_withUniqueSchema,
- IsisPresets.DataNucleusAutoCreate,
IsisPresets.UseLog4j2Test,
})
public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
@@ -29,7 +28,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJpaIntegration.class,
+ IsisModuleJpaEclipselink.class,
IsisModuleTestingFixturesApplib.class,
SimpleModule.class
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index d9a71f6..c7b6523 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -4,6 +4,7 @@
# To override externally, see Spring Boot docs
# https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config
#
+
# See also /application.yml
#
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index ef051e1..4eb4629 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -8,6 +8,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
import org.apache.isis.persistence.jpa.integration.IsisModuleJpaIntegration;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -25,7 +26,6 @@ import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
)
@TestPropertySource({
IsisPresets.H2InMemory_withUniqueSchema,
- IsisPresets.DataNucleusAutoCreate,
IsisPresets.UseLog4j2Test,
})
@ContextConfiguration
@@ -38,7 +38,7 @@ public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAb
@Configuration
@Import({
IsisModuleCoreRuntimeServices.class,
- IsisModuleJpaIntegration.class,
+ IsisModuleJpaEclipselink.class,
IsisModuleSecurityBypass.class,
IsisModuleTestingFixturesApplib.class,