replace DynaTest with JUnit5

mvysny · Oct 25, 2024 · 61c2861 · 61c2861
1 parent e1b06ae
commit 61c2861
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/...bu-testing-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/AllTests.kt b/...bu-testing-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/AllTests.kt
@@ -25,6 +25,7 @@ open class AbstractAllTests10(val isModuleTest: Boolean) {
     @Nested inner class ComboBoxTests : AbstractComboBoxTests()
     @Nested inner class GridTests : AbstractGridTests()
     @Nested inner class TreeGridTests : AbstractTreeGridTests()
+    @Nested inner class LocatorAddonsTests : AbstractLocatorAddonsTests()
 }
 
 /**
@@ -37,9 +38,6 @@ fun DynaNodeGroup.allTests(isModuleTest: Boolean) {
         Locale.setDefault(Locale.ENGLISH)
     }
 
-    group("locator addons") {
-        locatorAddonsTests()
-    }
     group("locatorj") {
         locatorJTest()
     }

diff --git a/...g-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/LocatorAddonsTest.kt b/...g-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/LocatorAddonsTest.kt
@@ -11,27 +11,29 @@ import com.vaadin.flow.component.html.Span
 import com.vaadin.flow.component.icon.Icon
 import com.vaadin.flow.component.icon.VaadinIcon
 import com.vaadin.flow.component.textfield.TextField
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
 import kotlin.test.expect
 
 @Suppress("DEPRECATION")
-@DynaTestDsl
-internal fun DynaNodeGroup.locatorAddonsTests() {
+abstract class AbstractLocatorAddonsTests() {
+    @BeforeEach fun fakeVaadin() { MockVaadin.setup() }
+    @AfterEach fun tearDownVaadin() { MockVaadin.tearDown() }
 
-    beforeEach { MockVaadin.setup() }
-    afterEach { MockVaadin.tearDown() }
-
-    group("captionContains") {
-        test("fails when caption doesn't match") {
+    @Nested inner class captionContains {
+        @Test fun `fails when caption doesn't match`() {
             UI.getCurrent().button("bar")
             expectThrows<AssertionError>("and captionContains('foo')") {
                 _get<Button> { captionContains("foo") }
             }
         }
-        test("succeeds when caption matches") {
+        @Test fun `succeeds when caption matches`() {
             UI.getCurrent().add(Button("foo bar"))
             _get<Button> { captionContains("foo") }
         }
-        test("picks proper button when caption matches") {
+        @Test fun `picks proper button when caption matches`() {
             UI.getCurrent().apply {
                 verticalLayout {
                     button("foo bar")
@@ -42,18 +44,18 @@ internal fun DynaNodeGroup.locatorAddonsTests() {
         }
     }
 
-    group("labelContains") {
-        test("fails when caption doesn't match") {
+    @Nested inner class labelContains() {
+        @Test fun `fails when caption doesn't match`() {
             UI.getCurrent().button("foo")
             expectThrows<AssertionError>("and labelContains('foo')") {
                 _get<Button> { labelContains("foo") }
             }
         }
-        test("succeeds when caption matches") {
+        @Test fun `succeeds when caption matches`() {
             UI.getCurrent().add(TextField("foo bar"))
             _get<TextField> { labelContains("foo") }
         }
-        test("picks proper component when caption matches") {
+        @Test fun `picks proper component when caption matches`() {
             UI.getCurrent().apply {
                 verticalLayout {
                     textField("foo bar")
@@ -64,18 +66,18 @@ internal fun DynaNodeGroup.locatorAddonsTests() {
         }
     }
 
-    group("textContains") {
-        test("fails when text doesn't match") {
+    @Nested inner class textContains {
+        @Test fun `fails when text doesn't match`() {
             UI.getCurrent().span("bar")
             expectThrows<AssertionError>("and textContains('foo')") {
                 _get<Span> { textContains("foo") }
             }
         }
-        test("succeeds when text matches") {
+        @Test fun `succeeds when text matches`() {
             UI.getCurrent().span("foo bar")
             _get<Span> { textContains("foo") }
         }
-        test("picks proper span when text matches") {
+        @Test fun `picks proper span when text matches`() {
             UI.getCurrent().apply {
                 verticalLayout {
                     span("foo bar")
@@ -85,8 +87,8 @@ internal fun DynaNodeGroup.locatorAddonsTests() {
             expect("foo bar") { _get<Span> { textContains("foo") }.text }
         }
     }
-    group("iconIs") {
-        test("smoke") {
+    @Nested inner class iconIs {
+        @Test fun smoke() {
             UI.getCurrent().button("iconless")
             val btn: Button = UI.getCurrent().iconButton(VaadinIcon.VAADIN_H.create())
             UI.getCurrent().iconButton(VaadinIcon.HOURGLASS.create())