Skip to content

test: fix JUnit 5 unit test module tests #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caalador merged 1 commit into from
Jan 26, 2026
Merged

test: fix JUnit 5 unit test module tests #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...t-junit5/src/test/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIteratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout
import com.vaadin.flow.component.orderedlayout.VerticalLayout
import com.github.mvysny.dynatest.DynaNodeGroup
import com.github.mvysny.dynatest.expectList
import com.vaadin.flow.component.Text

fun DynaNodeGroup.depthFirstTreeIteratorTests() {
test("DepthFirstTreeIterator") {
Expand All @@ -28,7 +29,13 @@ fun DynaNodeGroup.depthFirstTreeIteratorTests() {
val expected = mutableListOf<Component>()
val root = VerticalLayout().apply {
expected.add(this)
add(Button("Foo").apply { expected.add(this) })
add(Button("Foo").apply {
expected.add(this)
// In Vaadin 25.1, Button also has a text node
this.children.filter { it is Text }
.findFirst()
.ifPresent { expected.add(it) }
})
add(HorizontalLayout().apply {
expected.add(this)
add(Span().apply { expected.add(this) })
Expand Down
5 changes: 4 additions & 1 deletion ...n-testbench-unit-junit5/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,10 @@ internal fun DynaNodeGroup.locatorTest() {
_get<Button> { caption = "Click Me" }.click()
expectAfterLookupCalled()

expect("Thanks Baron Vladimir Harkonnen, it works!") { _get<Text>().text }
expect("Thanks Baron Vladimir Harkonnen, it works!") { _get<Text>{
// Since Vaadin 25.1, Button contains a Text child
this.predicates.add { textComponent -> textComponent.parent.filter { (it is Button) }.isEmpty }
}.text }
expectAfterLookupCalled()
_get<TextField> { value = "Baron Vladimir Harkonnen" } // test lookup by value
expectAfterLookupCalled()
Expand Down
Loading