You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/10 08:16:56 UTC
[causeway] branch master updated: CAUSEWAY-3442: test fixes
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 5222377565 CAUSEWAY-3442: test fixes
5222377565 is described below
commit 522237756581554b214414505ba3936b4e066ffe
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jun 10 10:16:51 2023 +0200
CAUSEWAY-3442: test fixes
---
.../testdomain/conf/Configuration_usingWicket.java | 45 ++++++++++------------
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index 0a910fde88..fc9f3ec96f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -37,8 +37,6 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
-import org.apache.wicket.util.visit.IVisit;
-import org.apache.wicket.util.visit.IVisitor;
import org.junit.jupiter.api.function.ThrowingConsumer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -119,7 +117,7 @@ public class Configuration_usingWicket {
+ ":property:scalarTypeContainer:scalarIfRegular";
public static final String FAVORITE_BOOK_SCALAR_NAME = FAVORITE_BOOK_SCALAR
- + ":scalarName";
+ + ":scalarNameBeforeValue";
public static final String FAVORITE_BOOK_ENTITY_LINK = FAVORITE_BOOK_SCALAR
+ ":container-fieldFrame:scalarValueInlinePromptLink:container-scalarValue:entityLink"
@@ -229,29 +227,26 @@ public class Configuration_usingWicket {
}
public void dumpComponentTree(final Predicate<Component> filter) {
- getLastRenderedPage().visitChildren(new IVisitor<Component, Object>() {
- @Override
- public void component(final Component component, final IVisit<Object> visit) {
- if(filter.test(component)) {
-
- val inversePath = new ArrayList<String>();
- var comp = component;
-
- while(comp!=null) {
- inversePath.add(comp.getId());
- comp = comp.getParent();
- }
-
- val path = Can.ofCollection(inversePath)
- .reverse()
- .stream()
- .skip(1L)
- .collect(Collectors.joining(":"));
-
- System.err.printf("comp[%s]: %s -> %s: %s%n",
- path, component, component.getClass().getSimpleName(),
- component.getDefaultModelObjectAsString());
+ getLastRenderedPage().visitChildren((component, visit) -> {
+ if(filter.test(component)) {
+
+ val inversePath = new ArrayList<String>();
+ var comp = component;
+
+ while(comp!=null) {
+ inversePath.add(comp.getId());
+ comp = comp.getParent();
}
+
+ val path = Can.ofCollection(inversePath)
+ .reverse()
+ .stream()
+ .skip(1L)
+ .collect(Collectors.joining(":"));
+
+ System.err.printf("comp[%s]: %s -> %s: %s%n",
+ path, component, component.getClass().getSimpleName(),
+ component.getDefaultModelObjectAsString());
}
});
}