This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new f5c5b1f4ab8 CAUSEWAY-2445: [v4] test compile fixes and comments
f5c5b1f4ab8 is described below
commit f5c5b1f4ab8b6a74ae3ffab159b85b06072e55f8
Author: andi-huber <[email protected]>
AuthorDate: Fri Jan 16 10:19:09 2026 +0100
CAUSEWAY-2445: [v4] test compile fixes and comments
---
.../tabular/simple/DataTableSerializationTest.java | 14 ++--
regressiontests/layouts/pom.xml | 2 +-
.../integtest/Layout_Counter_IntegTest.java | 92 +++++++++++-----------
.../integtest/Layout_SimpleObject_IntegTest.java | 8 +-
4 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/tabular/simple/DataTableSerializationTest.java
b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/tabular/simple/DataTableSerializationTest.java
index 135f22ba11b..09e6e6c8da4 100644
---
a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/tabular/simple/DataTableSerializationTest.java
+++
b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/tabular/simple/DataTableSerializationTest.java
@@ -59,7 +59,7 @@ public static class CustomerClass implements ViewModel {
@Override public String viewModelMemento() { return memento; }
}
-
+
@Named("DataTableSerializationTest.CustomerRecord")
public record CustomerRecord(@Property String memento) implements
ViewModel {
@@ -68,8 +68,8 @@ public record CustomerRecord(@Property String memento)
implements ViewModel {
@ParameterizedTest
@ValueSource(classes = {CustomerClass.class, CustomerRecord.class})
- void roundtripOnEmptyTable(Class<? extends ViewModel> viewmodelClass) {
- var original = DataTable.forDomainType(viewmodelClass);
+ void roundtripOnEmptyTable(final Class<? extends ViewModel>
viewmodelClass) {
+ var original = DataTable.forDomainType(viewmodelClass); //FIXME may
throw IllegalState Recursive update
var afterRoundtrip = _SerializationTester.roundtrip(original);
assertNotNull(afterRoundtrip);
@@ -83,8 +83,8 @@ void roundtripOnEmptyTable(Class<? extends ViewModel>
viewmodelClass) {
@ParameterizedTest
@ValueSource(classes = {CustomerClass.class, CustomerRecord.class})
- void roundtripOnPopulatedTable(Class<? extends ViewModel> viewmodelClass) {
- var original = DataTable.forDomainType(viewmodelClass)
+ void roundtripOnPopulatedTable(final Class<? extends ViewModel>
viewmodelClass) {
+ var original = DataTable.forDomainType(viewmodelClass) //FIXME may
throw IllegalState Recursive update
.withDataElementPojos(Can.of("cus-1", "cus-2")
.map(name->newInstance(viewmodelClass, name))
.map(getObjectManager()::adapt));
@@ -99,9 +99,9 @@ void roundtripOnPopulatedTable(Class<? extends ViewModel>
viewmodelClass) {
assertEquals("cus-1", cus1.viewModelMemento());
assertEquals("cus-2", cus2.viewModelMemento());
}
-
+
@SneakyThrows
- private static ViewModel newInstance(Class<? extends ViewModel>
viewmodelClass, String memento) {
+ private static ViewModel newInstance(final Class<? extends ViewModel>
viewmodelClass, final String memento) {
return viewmodelClass.getConstructor(new
Class<?>[]{String.class}).newInstance(memento);
}
diff --git a/regressiontests/layouts/pom.xml b/regressiontests/layouts/pom.xml
index ff073ea50ed..b2aecca5255 100644
--- a/regressiontests/layouts/pom.xml
+++ b/regressiontests/layouts/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.causeway.regressiontests</groupId>
<artifactId>causeway-regressiontests</artifactId>
- <version>${revision}</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>causeway-regressiontests-layouts</artifactId>
diff --git
a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 710a4041041..17f1fdbac40 100644
---
a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++
b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -155,12 +155,12 @@ void actionNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -182,12 +182,12 @@ void actionPositionBelow() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -209,12 +209,12 @@ void actionPositionPanel() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -236,12 +236,12 @@ void actionDetailsFieldSetNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("1"))
;
@@ -264,12 +264,12 @@ void actionDetailsFieldSetPositionBelow() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("2"))
;
@@ -292,12 +292,12 @@ void actionDetailsFieldSetPositionPanel() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("3"))
;
@@ -320,12 +320,12 @@ void actionDetailsFieldSetPositionPanelDropdown() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("4"))
;
@@ -348,12 +348,12 @@ void actionEmptyFieldSetNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("1"))
;
@@ -375,12 +375,12 @@ void actionEmptyFieldSetPositionBelow() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("2"))
;
@@ -402,12 +402,12 @@ void actionEmptyFieldSetPositionPanel() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("3"))
;
@@ -429,12 +429,12 @@ void actionEmptyFieldSetPositionPanelDropdown() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("4"))
;
@@ -456,12 +456,12 @@ void actionAssociatedWithNamePropertyNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -483,12 +483,12 @@ void actionAssociatedWithNamePropertyBelow() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -510,12 +510,12 @@ void actionAssociatedWithNamePropertyPanel() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -537,12 +537,12 @@ void actionAssociatedWithNamePropertyPanelDropdown() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo(""))
;
@@ -564,12 +564,12 @@ void
actionAssociatedWithNamePropertyAndDetailsFieldSetNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("1"))
;
@@ -591,12 +591,12 @@ void
actionAssociatedWithNameAndDetailsFieldSetPropertyBelow() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("2"))
;
@@ -618,12 +618,12 @@ void
actionAssociatedWithNamePropertyAndDetailsFieldSetPanel() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("3"))
;
@@ -645,12 +645,12 @@ void
actionAssociatedWithNamePropertyAndDetailsFieldSetPanelDropdown() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("4"))
;
@@ -672,12 +672,12 @@ void
actionAssociatedWithNamePropertyButEmptyFieldSetNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("1"))
;
@@ -699,12 +699,12 @@ void
actionAssociatedWithNamePropertyAndSequenceNoPosition() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.FALLBACK))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.FALLBACK))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.BELOW));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("1"))
;
@@ -726,12 +726,12 @@ void openRestApi() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("750.1"))
;
@@ -755,12 +755,12 @@ void clearHints() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("400.1"))
;
diff --git
a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 027040ae6f5..87513c71c61 100644
---
a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++
b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -97,12 +97,12 @@ void openRestApi() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL_DROPDOWN));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("750.1"))
;
@@ -126,12 +126,12 @@ void clearHints() {
var actionPositionFacet = action.getFacet(ActionPositionFacet.class);
assertThat(actionPositionFacet)
- .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(ActionPositionFacet::position).isEqualTo(ActionLayout.Position.PANEL));
var layoutOrderFacet = action.getFacet(LayoutOrderFacet.class);
assertThat(layoutOrderFacet)
- .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getPrecedence).isEqualTo(Facet.Precedence.DEFAULT))
+ .satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::precedence).isEqualTo(Facet.Precedence.DEFAULT))
.satisfies(f ->
assertThat(f).extracting(LayoutOrderFacet::getSequence).isEqualTo("400.1"))
;
