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 2020/01/31 08:39:40 UTC
[isis] branch master updated: ISIS-2223: fixes tests with
'isis-subdomains-excel-integtests'
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 f5318c5 ISIS-2223: fixes tests with 'isis-subdomains-excel-integtests'
f5318c5 is described below
commit f5318c535c8fbb224b844ba5145c8647bed509dc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 31 09:39:34 2020 +0100
ISIS-2223: fixes tests with 'isis-subdomains-excel-integtests'
---
.../specloader/validator/MetaModelValidatorVisiting.java | 7 +++++++
.../dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java | 4 +++-
.../fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java | 6 ++++--
.../demotodoitem/DemoToDoItemRowHandler2.java | 6 ++++--
.../excelupload/ExcelUploadRowHandler4ToDoItem.java | 11 +++++++----
.../fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java | 12 ++++++------
subdomains/excel/integtests/pom.xml | 1 -
7 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
index 4925446..98bcebf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
@@ -94,6 +94,13 @@ public class MetaModelValidatorVisiting extends MetaModelValidatorAbstract {
val specLoader = (SpecificationLoaderDefault)super.getMetaModelContext().getSpecificationLoader();
specLoader.forEach(spec->{
+
+ if(!getConfiguration().getApplib().getAnnotation().getAction().isExplicit()) {
+ if(spec.getBeanSort().isUnknown()) {
+ return; // in support of @Action not being forced, we need to relax
+ }
+ }
+
if(! includeIf.test(spec)) {
return;
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index 80d3b49..0eccfd3 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.BookmarkPolicy;
@@ -20,6 +21,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
@@ -95,7 +97,7 @@ public class BulkUpdateLineItemForDemoToDoItem
@Getter @Setter
private String ownedBy;
- @Getter @Setter
+ @Getter @Setter @XmlJavaTypeAdapter(JaxbAdapters.LocalDateAdapter.class)
private LocalDate dueBy;
@Getter @Setter
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index 50ec857..0f63a30 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -7,19 +7,21 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture;
-import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
+@ViewModel
public class DemoToDoItemRowHandler implements ExcelFixtureRowHandler {
@Getter @Setter
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index e4e0aa3..24d0fc6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -2,17 +2,19 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehand
import java.math.BigDecimal;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
+import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
-import org.apache.isis.subdomains.excel.testing.FixtureAwareRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
+import org.apache.isis.subdomains.excel.testing.FixtureAwareRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+@ViewModel
@ToString
public class DemoToDoItemRowHandler2
implements FixtureAwareRowHandler<DemoToDoItemRowHandler2>, ExcelMetaDataEnabled {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 50a1949..9557604 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -9,11 +9,14 @@ import javax.inject.Inject;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.subdomains.excel.testing.ExcelFixture;
import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
@@ -33,7 +36,7 @@ import lombok.Setter;
@XmlType(
propOrder = {
"description",
- "subcategory",
+ "subCategory",
"ownedBy",
"dueBy",
"cost",
@@ -51,7 +54,7 @@ public class ExcelUploadRowHandler4ToDoItem implements ExcelFixtureRowHandler {
@Getter @Setter
private String ownedBy;
- @Getter @Setter
+ @Getter @Setter @XmlJavaTypeAdapter(JaxbAdapters.LocalDateAdapter.class)
private LocalDate dueBy;
@Getter @Setter
@@ -70,9 +73,9 @@ public class ExcelUploadRowHandler4ToDoItem implements ExcelFixtureRowHandler {
return Collections.<Object>singletonList(toDoItem);
}
- @Inject
+ @Inject @XmlTransient
ExcelDemoToDoItemMenu toDoItems;
- @Inject
+ @Inject @XmlTransient
WrapperFactory wrapperFactory;
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index a4f8cac..7ebcfac 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -56,36 +56,36 @@ import lombok.ToString;
@javax.jdo.annotations.Query(
name = "todo_all", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy"),
@javax.jdo.annotations.Query(
name = "todo_notYetComplete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy "
+ " && complete == false"),
@javax.jdo.annotations.Query(
name = "findByDescription", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy "
+ " && description == :description"),
@javax.jdo.annotations.Query(
name = "todo_complete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy "
+ "&& complete == true"),
@javax.jdo.annotations.Query(
name = "todo_similarTo", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy "
+ "&& category == :category"),
@javax.jdo.annotations.Query(
name = "todo_autoComplete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ "WHERE ownedBy == :ownedBy && "
+ "description.indexOf(:description) >= 0")
})
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 8a5ce60..b647a98 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -30,7 +30,6 @@
<jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.integtests</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/subdomains/excel/integtests</git-plugin.propertiesDir>
- <skipTests>true</skipTests>
</properties>
<build>