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/08/16 04:58:53 UTC
[isis-app-simpleapp] branch jpa-secman-SNAPSHOT created (now
354ffaf)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
at 354ffaf enables secman
This branch includes the following new commits:
new 078c9ba updates parent pom to 2.0.0-M5.20210802-0226-04ee32a6
new 9f593ed updates to 2.0.0-SNAPSHOT
new 0335b78 uses @Nested for integ tests
new b8b6c83 updates parent pom to 2.0.0-M5.20210805-1637-ae1e2f24
new bc67fd5 reverts @Nested
new f848c6d fixes home page logicalTypeName; removes secman menu items (added accidentally previously); force h2 to use MSSQLServer compatible mode.
new 354ffaf enables secman
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis-app-simpleapp] 01/07: updates parent pom to
2.0.0-M5.20210802-0226-04ee32a6
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 078c9ba02f68ccd264dad29928f71672ea8afa7d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 2 10:01:46 2021 +0100
updates parent pom to 2.0.0-M5.20210802-0226-04ee32a6
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fdecb38..0a06ff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M5.20210724-1447-cdcc665b</version>
+ <version>2.0.0-M5.20210802-0226-04ee32a6</version>
<relativePath/>
</parent>
@@ -19,7 +19,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>2.0.0-M5.20210724-1447-cdcc665b</isis.version>
+ <isis.version>2.0.0-M5.20210802-0226-04ee32a6</isis.version>
<java.version>11</java.version>
<maven-cucumber-reporting.version>5.3.0</maven-cucumber-reporting.version>
<archunit.version>0.14.1</archunit.version>
[isis-app-simpleapp] 02/07: updates to 2.0.0-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 9f593ed5e63e1a53b5d6102f4f7b96e69e24f17e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 2 12:51:19 2021 +0100
updates to 2.0.0-SNAPSHOT
---
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 4 ++--
pom.xml | 4 ++--
.../java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java | 4 ++--
webapp/src/main/java/domainapp/webapp/AppManifest.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index b2f7721..a2b6476 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -10,7 +10,7 @@ import org.springframework.test.context.ActiveProfiles;
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.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -34,7 +34,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJpaEclipselink.class,
+ IsisModulePersistenceJpaEclipselink.class,
IsisModuleTestingFixturesApplib.class,
SimpleModule.class
diff --git a/pom.xml b/pom.xml
index 0a06ff1..71fd836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M5.20210802-0226-04ee32a6</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -19,7 +19,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>2.0.0-M5.20210802-0226-04ee32a6</isis.version>
+ <isis.version>2.0.0-SNAPSHOT</isis.version>
<java.version>11</java.version>
<maven-cucumber-reporting.version>5.3.0</maven-cucumber-reporting.version>
<archunit.version>0.14.1</archunit.version>
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 56c9bf4..dbd972b 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.test.context.ActiveProfiles;
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.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
@@ -40,7 +40,7 @@ public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstrac
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJpaEclipselink.class,
+ IsisModulePersistenceJpaEclipselink.class,
IsisModuleTestingFixturesApplib.class,
SimpleModule.class
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index e02e4e7..9dca47c 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
@@ -24,7 +24,7 @@ import domainapp.webapp.quartz.QuartzModule;
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModuleJpaEclipselink.class,
+ IsisModulePersistenceJpaEclipselink.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,
[isis-app-simpleapp] 04/07: updates parent pom to
2.0.0-M5.20210805-1637-ae1e2f24
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit b8b6c83d7c85a64a6da29d550f261c7c56d0c221
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Aug 5 18:52:06 2021 +0100
updates parent pom to 2.0.0-M5.20210805-1637-ae1e2f24
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 71fd836..4d86707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M5.20210805-1637-ae1e2f24</version>
<relativePath/>
</parent>
@@ -19,7 +19,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>2.0.0-SNAPSHOT</isis.version>
+ <isis.version>2.0.0-M5.20210805-1637-ae1e2f24</isis.version>
<java.version>11</java.version>
<maven-cucumber-reporting.version>5.3.0</maven-cucumber-reporting.version>
<archunit.version>0.14.1</archunit.version>
[isis-app-simpleapp] 06/07: fixes home page logicalTypeName;
removes secman menu items (added accidentally previously);
force h2 to use MSSQLServer compatible mode.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit f848c6dc40d8f9540f6e185adb5c0e4ff65f56ab
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 15 17:26:29 2021 +0100
fixes home page logicalTypeName; removes secman menu items (added accidentally previously); force h2 to use MSSQLServer compatible mode.
---
.../services/homepage/HomePageViewModel.java | 3 +-
.../main/resources/config/application.properties | 2 +-
webapp/src/main/resources/menubars.layout.xml | 32 ++++------------------
3 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 0326492..bfb4dca 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -8,14 +8,13 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.services.i18n.TranslatableString;
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "domainapp.HomePageViewModel"
+ logicalTypeName = "simple.HomePageViewModel"
)
@HomePage
@DomainObjectLayout()
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 8a7dcce..fef8a8c 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -11,7 +11,7 @@
spring.flyway.enabled=false
spring.sql.init.platform=h2
-spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false
+spring.datasource.url=jdbc:h2:mem:simple;MODE=MSSQLServer
spring.datasource.driver-class-name=org.h2.Driver
isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index 5e0bb55..e20bade 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -58,31 +58,6 @@
<mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations"/>
</mb3:section>
</mb3:menu>
- <mb3:menu>
- <mb3:named>Security</mb3:named>
- <mb3:section>
- <mb3:named>Users</mb3:named>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="userManager"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="findUsers"/>
- </mb3:section>
- <mb3:section>
- <mb3:named>Roles</mb3:named>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="findRoles"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="newRole"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="allRoles"/>
- </mb3:section>
- <mb3:section>
- <mb3:named>Permissions</mb3:named>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="allPermissions"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="findOrphanedPermissions"/>
- </mb3:section>
- <mb3:section>
- <mb3:named>Tenancies</mb3:named>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="findTenancies"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="newTenancy"/>
- <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="allTenancies"/>
- </mb3:section>
- </mb3:menu>
</mb3:secondary>
<mb3:tertiary>
<mb3:menu>
@@ -99,7 +74,12 @@
</mb3:section>
<mb3:section>
<mb3:named>Security</mb3:named>
- <mb3:serviceAction objectType="isis.applib.UserMenu" id="me"/>
+ <mb3:serviceAction objectType="isis.applib.UserMenu" id="me">
+ <cpt:named>Me (basic)</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.ext.secman.MeService" id="me">
+ <cpt:named>Me (secman)</cpt:named>
+ </mb3:serviceAction>
<mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout"/>
</mb3:section>
</mb3:menu>
[isis-app-simpleapp] 07/07: enables secman
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 354ffaf25c0351d2dbbcdc53af0c3b32967db79b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 16 05:56:53 2021 +0100
enables secman
---
pom.xml | 7 ++++++
webapp/pom.xml | 10 +++++++++
.../main/java/domainapp/webapp/AppManifest.java | 8 +++++--
webapp/src/main/resources/application.yml | 17 +++++++++++++++
.../main/resources/config/application.properties | 2 +-
webapp/src/main/resources/menubars.layout.xml | 25 ++++++++++++++++++++++
6 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4d86707..9164289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,13 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman</artifactId>
+ <scope>import</scope>
+ <type>pom</type>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<!-- this project's own modules -->
<dependency>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index f843b8e..90f118a 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -120,6 +120,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-persistence-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index 9dca47c..24363ed 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -8,8 +8,9 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
+import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
+import org.apache.isis.extensions.secman.jpa.IsisModuleExtSecmanPersistenceJpa;
import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
-import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
@@ -23,7 +24,10 @@ import domainapp.webapp.quartz.QuartzModule;
@Configuration
@Import({
IsisModuleCoreRuntimeServices.class,
- IsisModuleSecurityShiro.class,
+
+ IsisModuleExtSecmanPersistenceJpa.class,
+ IsisModuleExtSecmanEncryptionJbcrypt.class,
+
IsisModulePersistenceJpaEclipselink.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index acb197c..8d10d4e 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -75,6 +75,23 @@ isis:
non-persisted-objects-strategy: persist
multiple-execution-strategy: execute
+ extensions:
+ secman:
+ seed:
+ admin:
+ user-name: "secman-admin"
+ password: "pass"
+ role-name: "isis-ext-secman-admin"
+ namespace-permissions:
+# sticky: ...
+ additional: simple
+ regular-user:
+ role-name: "isis-ext-secman-user"
+ permissions-evaluation-policy: ALLOW_BEATS_VETO
+ user-menu-me-action-policy: ENABLE
+# user-registration:
+# initial-role-names: ...
+
eclipselink:
# if enabled, then must be run with JVM arg:
# -javaagent:lib/spring-instrument-5.3.8.jar
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index fef8a8c..bb05379 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -15,7 +15,7 @@ spring.datasource.url=jdbc:h2:mem:simple;MODE=MSSQLServer
spring.datasource.driver-class-name=org.h2.Driver
isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
-isis.persistence.schema.auto-create-schemas=simple
+isis.persistence.schema.auto-create-schemas=simple,isisExtensionsSecman
#eclipselink.weaving=true
eclipselink.deploy-on-startup=true
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index e20bade..42344e9 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -58,6 +58,31 @@
<mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations"/>
</mb3:section>
</mb3:menu>
+ <mb3:menu>
+ <mb3:named>Security</mb3:named>
+ <mb3:section>
+ <mb3:named>Users</mb3:named>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="userManager"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="findUsers"/>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Roles</mb3:named>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="findRoles"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="newRole"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="allRoles"/>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Permissions</mb3:named>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="allPermissions"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="findOrphanedPermissions"/>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Tenancies</mb3:named>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="findTenancies"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="newTenancy"/>
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="allTenancies"/>
+ </mb3:section>
+ </mb3:menu>
</mb3:secondary>
<mb3:tertiary>
<mb3:menu>
[isis-app-simpleapp] 05/07: reverts @Nested
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit bc67fd5e106e7f70604164b502eb88a240646ce4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Aug 5 19:19:01 2021 +0100
reverts @Nested
---
.../modules/simple/integtests/tests/SimpleObject_IntegTest.java | 5 +++--
.../modules/simple/integtests/tests/SimpleObjects_IntegTest.java | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 9a00511..761bb86 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -26,8 +26,9 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
simpleObject = fixtureScripts.runPersona(SimpleObject_persona.FOO);
}
+
@Nested
- public class name {
+ public static class name extends SimpleObject_IntegTest {
@Test
public void accessible() {
@@ -52,7 +53,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
}
@Nested
- public class updateName {
+ public static class updateName extends SimpleObject_IntegTest {
@Test
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 7dfc840..fdd26c2 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -27,7 +27,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
SimpleObjects menu;
@Nested
- public class listAll {
+ public static class listAll extends SimpleObjects_IntegTest {
@Test
public void happyCase() {
@@ -55,7 +55,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
}
@Nested
- public class create{
+ public static class create extends SimpleObjects_IntegTest {
@Test
public void happyCase() {
[isis-app-simpleapp] 03/07: uses @Nested for integ tests
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 0335b786ae509088b889843626036a84094f601b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Aug 5 18:51:53 2021 +0100
uses @Nested for integ tests
---
.../modules/simple/integtests/tests/SimpleObject_IntegTest.java | 9 +++++----
.../modules/simple/integtests/tests/SimpleObjects_IntegTest.java | 9 ++++++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index bd12fc6..9a00511 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -1,8 +1,7 @@
package domainapp.modules.simple.integtests.tests;
-import javax.inject.Inject;
-
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +26,8 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
simpleObject = fixtureScripts.runPersona(SimpleObject_persona.FOO);
}
- public static class name extends SimpleObject_IntegTest {
+ @Nested
+ public class name {
@Test
public void accessible() {
@@ -51,7 +51,8 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
}
- public static class updateName extends SimpleObject_IntegTest {
+ @Nested
+ public class updateName {
@Test
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 1763534..7dfc840 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.transaction.annotation.Transactional;
@@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.testing.integtestsupport.applib.ThrowableMatchers;
+import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
@@ -25,7 +26,8 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
@Inject
SimpleObjects menu;
- public static class listAll extends SimpleObjects_IntegTest {
+ @Nested
+ public class listAll {
@Test
public void happyCase() {
@@ -52,7 +54,8 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
}
}
- public static class create extends SimpleObjects_IntegTest {
+ @Nested
+ public class create{
@Test
public void happyCase() {