Merge pull request #20 from incluedu/features/phollenstein/SBFX-38

SBFX-38: cleanup test code
incluedu · Dec 4, 2022 · e584cb9 · e584cb9
2 parents ae6e2b6 + a3a9366
commit e584cb9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/sbjfx-lib/build.gradle b/sbjfx-lib/build.gradle
@@ -20,11 +20,10 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.0'
-    testImplementation 'org.junit.platform:junit-platform-runner:1.9.0'
     testImplementation 'org.testfx:testfx-core:4.0.16-alpha'
     testImplementation 'org.testfx:testfx-junit5:4.0.16-alpha'
     testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
+    testImplementation 'io.mockk:mockk:1.13.3'
 }
 
 group = 'net.lustenauer'

diff --git a/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/IncorrectViewTest.kt b/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/IncorrectViewTest.kt
@@ -4,7 +4,7 @@ import javafx.application.Platform
 import javafx.stage.Stage
 import net.lustenauer.sbjfx.lib.jfxtest.SampleIncorrectView
 import net.lustenauer.sbjfx.lib.jfxtest.SpringJavaFxTestingBase
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
@@ -34,6 +34,6 @@ internal class IncorrectViewTest : SpringJavaFxTestingBase() {
             }
         }
         Thread.sleep(1000) // wait one second
-        assertEquals("Cannot load 'sampleincorrect'", thrown.message)
+        assertThat(thrown.message).isEqualTo("Cannot load 'sampleincorrect'")
     }
 }
diff --git a/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/PropertyReaderHelperTest.kt b/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/PropertyReaderHelperTest.kt
@@ -1,8 +1,6 @@
 package net.lustenauer.sbjfx.lib
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.collection.IsIterableContainingInAnyOrder
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.DisplayName
@@ -45,39 +43,40 @@ internal class PropertyReaderHelperTest {
     @Throws(Exception::class)
     fun singleValueTest() {
         val list = PropertyReaderHelper[envSingleEntryMock, "entry"]
-        assertThat(list, IsIterableContainingInAnyOrder.containsInAnyOrder("entry"))
+        assertThat(list).containsExactlyInAnyOrder("entry")
     }
 
     @Test
     @DisplayName("Multiple values")
     fun multipleValuesTest() {
         val list = PropertyReaderHelper[envArrayMock, "entry"]
-        assertThat(list, IsIterableContainingInAnyOrder.containsInAnyOrder("entry_0", "entry_1", "entry_2"))
+        assertThat(list).containsExactlyInAnyOrder("entry_0", "entry_1", "entry_2")
     }
 
     @Test
     @DisplayName("Set if existing key is present ")
     fun setIfExistingKeyIsPresentTest() {
         val testObject = TestObject()
         PropertyReaderHelper.setIfPresent(
-            envSingleEntryMock, "stringentry",
-            String::class.java
+            env = envSingleEntryMock,
+            key = "stringentry",
+            type = String::class.java
         ) { theEntryValue: String -> testObject.stringEntry = theEntryValue }
-        assertThat(testObject.stringEntry, CoreMatchers.`is`("entry"))
+        assertThat(testObject.stringEntry).isEqualTo("entry")
     }
 
     @Test
     @DisplayName("Set if existing key is not present ")
     fun setIfExistingKeyIsNotPresentTest() {
         val testObject = TestObject()
         PropertyReaderHelper.setIfPresent(
-            envSingleEntryMock,
-            "no_entry",
-            String::class.java
-        ) { theEntryValue: String? ->
+            env = envSingleEntryMock,
+            key = "no_entry",
+            type = String::class.java
+        ) { theEntryValue: String ->
             testObject.stringEntry = theEntryValue
         }
-        assertThat(testObject.stringEntry, CoreMatchers.`is`("UNSET"))
+        assertThat(testObject.stringEntry).isEqualTo("UNSET")
     }
 
     @Test
@@ -88,7 +87,6 @@ internal class PropertyReaderHelperTest {
     }
 
     internal class TestObject {
-        var stringEntry: String? = "UNSET"
-        var longEntry = 0L
+        var stringEntry: String = "UNSET"
     }
 }
diff --git a/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/SampleViewTest.kt b/sbjfx-lib/src/test/kotlin/net/lustenauer/sbjfx/lib/SampleViewTest.kt
@@ -42,7 +42,6 @@ internal class SampleViewTest : SpringJavaFxTestingBase() {
     @DisplayName("Show view given stage")
     fun showViewGivenStageTest() {
         Platform.runLater { sampleView.showView(stage, Modality.NONE) }
-        Thread.sleep(1000)
         WaitForAsyncUtils.waitForFxEvents()
         FxAssert.verifyThat(sampleView.view, NodeMatchers.isVisible())
     }