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/27 10:28:15 UTC
[isis-app-simpleapp] branch jpa updated: fixes build issue,
fixes unit tests, adds support for 'simple' schema
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa by this push:
new 422cc1f fixes build issue, fixes unit tests, adds support for 'simple' schema
422cc1f is described below
commit 422cc1f3395187c4fb408589f768f3e58aae43a3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 27 10:27:26 2021 +0000
fixes build issue, fixes unit tests, adds support for 'simple' schema
---
.../main/java/domainapp/modules/simple/dom/so/SimpleObject.java | 2 +-
module-simple/src/test/java/application.properties~not-used | 5 -----
.../java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java | 4 +---
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 3 ++-
.../integtests/SimpleModuleTestConfiguration_usingJpa.java | 4 ++--
webapp/pom.xml | 9 +--------
webapp/src/main/resources/application.yml | 6 ++++--
.../webapp/integtests/ApplicationIntegTestAbstract.java | 7 ++++---
.../integtests/smoke/SimpleWebAppTestConfiguration_usingJpa.java | 8 ++++----
9 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 7fcfab3..97ce057 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -31,7 +31,7 @@ import domainapp.modules.simple.types.Notes;
@javax.persistence.Entity
@javax.persistence.Table(
-//TODO schema="simple",
+ schema="simple",
uniqueConstraints = {
@javax.persistence.UniqueConstraint(name = "SimpleObject_name_UNQ", columnNames = {"name"})
}
diff --git a/module-simple/src/test/java/application.properties~not-used b/module-simple/src/test/java/application.properties~not-used
deleted file mode 100644
index 6669447..0000000
--- a/module-simple/src/test/java/application.properties~not-used
+++ /dev/null
@@ -1,5 +0,0 @@
-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/dom/so/SimpleObjects_Test.java b/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
index a0d19f2..9d9dbc3 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
@@ -35,7 +35,6 @@ class SimpleObjects_Test {
objects = new SimpleObjects(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
}
- @Disabled("TODO - to be ported over")
@Nested
class create {
@@ -59,7 +58,6 @@ class SimpleObjects_Test {
}
}
- @Disabled("TODO - to be ported over")
@Nested
class ListAll {
@@ -70,7 +68,7 @@ class SimpleObjects_Test {
final List<SimpleObject> all = new ArrayList<>();
// expecting
- when(mockRepositoryService.allInstances(SimpleObject.class))
+ when(mockSimpleObjectRepository.findAll())
.thenReturn(all);
// when
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 fe55994..952f6e4 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
@@ -8,7 +8,8 @@ import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFi
@SpringBootTest(
classes = {
SimpleModuleTestConfiguration_usingJpa.class
- }
+ },
+ properties = "isis.persistence.jpa.auto-create-schemas=simple"
)
public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
index bade212..599f571 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
@@ -41,7 +41,7 @@ import domainapp.modules.simple.SimpleModule;
@EnableAutoConfiguration
@EnableJpaRepositories
@Import({
-
+
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
IsisModuleJpaEclipselink.class,
@@ -54,6 +54,6 @@ import domainapp.modules.simple.SimpleModule;
@PropertySource(IsisPresets.UseLog4j2Test),
})
public class SimpleModuleTestConfiguration_usingJpa {
-
+
}
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 3070afe..b63c7cb 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -174,14 +174,7 @@
</dependency>
<!-- TESTING -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>simpleapp-module-simple-jpa</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-integtests</artifactId>
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 1cae5e5..dd840f0 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -66,7 +66,10 @@ isis:
show-chooser: true
show-drop-down-on-footer: true
- #persistence:
+ persistence:
+ jpa:
+ auto-create-schemas: simple
+ create-schema-sql-template: "CREATE SCHEMA IF NOT EXISTS %S"
resteasy:
jaxrs:
@@ -96,4 +99,3 @@ app:
validation:
message: "'{character}' is invalid."
prohibited-characters: "&%$!"
-
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 5d98c02..475b547 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -4,19 +4,20 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import domainapp.modules.simple.integtests.SimpleModuleTestConfiguration_usingJpa;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
+import domainapp.webapp.integtests.smoke.SimpleWebAppTestConfiguration_usingJpa;
@SpringBootTest(
classes = {
// we use a slightly different confuguration compared to the production (AppManifest/webapp)
- SimpleModuleTestConfiguration_usingJpa.class,
+ SimpleWebAppTestConfiguration_usingJpa.class,
BddStepDefsModule.class,
ApplicationModule.class,
},
properties = {
- // "logging.level.io.cucumber.core.runner.Runner=DEBUG"
+ // "logging.level.io.cucumber.core.runner.Runner=DEBUG",
+ "isis.persistence.jpa.auto-create-schemas=simple"
}
)
public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAbstract {
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java b/webapp/src/test/java/domainapp/webapp/integtests/smoke/SimpleWebAppTestConfiguration_usingJpa.java
similarity index 95%
copy from module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
copy to webapp/src/test/java/domainapp/webapp/integtests/smoke/SimpleWebAppTestConfiguration_usingJpa.java
index bade212..b3d0fe1 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/smoke/SimpleWebAppTestConfiguration_usingJpa.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.modules.simple.integtests;
+package domainapp.webapp.integtests.smoke;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -41,7 +41,7 @@ import domainapp.modules.simple.SimpleModule;
@EnableAutoConfiguration
@EnableJpaRepositories
@Import({
-
+
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
IsisModuleJpaEclipselink.class,
@@ -53,7 +53,7 @@ import domainapp.modules.simple.SimpleModule;
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
@PropertySource(IsisPresets.UseLog4j2Test),
})
-public class SimpleModuleTestConfiguration_usingJpa {
-
+public class SimpleWebAppTestConfiguration_usingJpa {
+
}