You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/12/02 11:35:14 UTC

[isis] branch master updated: ISIS-2903: adds home-page for visual testing

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new b25f5f4  ISIS-2903: adds home-page for visual testing
b25f5f4 is described below

commit b25f5f482f3ff6fda2438cb57749f27a194cf92b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 2 12:35:04 2021 +0100

    ISIS-2903: adds home-page for visual testing
    
    - allows to setup fixtures
    - allows to open VM of interest
---
 .../testdomain/viewers/jdo/wkt/TestAppJdoWkt.java  | 38 ++++++++++++++++++++++
 .../testdomain/viewers/jdo/wkt/TestAppJpaWkt.java  | 38 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
index 20ef9f2..7de82b4 100644
--- a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
@@ -18,14 +18,25 @@
  */
 package org.apache.isis.testdomain.viewers.jdo.wkt;
 
+import javax.inject.Inject;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Import;
 
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.HomePage;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.conf.Configuration_usingJdo;
 import org.apache.isis.testdomain.conf.Configuration_usingWicket;
+import org.apache.isis.testdomain.jdo.JdoInventoryJaxbVm;
+import org.apache.isis.testdomain.jdo.JdoTestFixtures;
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 
 /**
@@ -54,4 +65,31 @@ public class TestAppJdoWkt extends SpringBootServletInitializer {
         SpringApplication.run(new Class[] { TestAppJdoWkt.class }, args);
     }
 
+    @DomainObject(
+            nature=Nature.VIEW_MODEL,
+            logicalTypeName = "testdomain.jdo.TestHomePage"
+            )
+    @HomePage
+    public static class TestHomePage {
+
+        @Inject UserService userService;
+        @Inject JdoTestFixtures testFixtures;
+
+        @ObjectSupport public String title() {
+            return "Hello, " + userService.currentUserNameElseNobody();
+        }
+
+        @Action @ActionLayout(sequence = "0.1")
+        public TestHomePage setup() {
+            testFixtures.setUp3Books();
+            return this;
+        }
+
+        @Action @ActionLayout(sequence = "0.2")
+        public JdoInventoryJaxbVm openSamplePage() {
+            return testFixtures.setUpViewmodelWith3Books();
+        }
+
+    }
+
 }
diff --git a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJpaWkt.java b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJpaWkt.java
index 584d9f3..e36714c 100644
--- a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJpaWkt.java
+++ b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/isis/testdomain/viewers/jdo/wkt/TestAppJpaWkt.java
@@ -18,14 +18,25 @@
  */
 package org.apache.isis.testdomain.viewers.jdo.wkt;
 
+import javax.inject.Inject;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Import;
 
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.HomePage;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
+import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.conf.Configuration_usingJpa;
 import org.apache.isis.testdomain.conf.Configuration_usingWicket;
+import org.apache.isis.testdomain.jpa.JpaInventoryJaxbVm;
+import org.apache.isis.testdomain.jpa.JpaTestFixtures;
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 
 /**
@@ -54,4 +65,31 @@ public class TestAppJpaWkt extends SpringBootServletInitializer {
         SpringApplication.run(new Class[] { TestAppJpaWkt.class }, args);
     }
 
+    @DomainObject(
+            nature=Nature.VIEW_MODEL,
+            logicalTypeName = "testdomain.jpa.TestHomePage"
+            )
+    @HomePage
+    public static class TestHomePage {
+
+        @Inject UserService userService;
+        @Inject JpaTestFixtures testFixtures;
+
+        @ObjectSupport public String title() {
+            return "Hello, " + userService.currentUserNameElseNobody();
+        }
+
+        @Action @ActionLayout(sequence = "0.1")
+        public TestHomePage setup() {
+            testFixtures.setUp3Books();
+            return this;
+        }
+
+        @Action @ActionLayout(sequence = "0.2")
+        public JpaInventoryJaxbVm openSamplePage() {
+            return testFixtures.setUpViewmodelWith3Books();
+        }
+
+    }
+
 }