Reorganise test helpers

FWDekker · Sep 16, 2023 · f144fce · f144fce
1 parent 9db39ae
commit f144fce
Show file tree

Hide file tree

Showing 55 changed files with 377 additions and 301 deletions.
diff --git a/.config/detekt/.detekt.yml b/.config/detekt/.detekt.yml
@@ -18,7 +18,7 @@ complexity:
     active: false
   # [Exception] Acceptable for helper files.
   TooManyFunctions:
-    excludes: '**/*Helper.kt'
+    excludes: '**/*Helpers.kt'
 
 formatting:
   # [Disagree] Acceptable for many short arguments.

diff --git a/...lin/com/fwdekker/randomness/ListHelper.kt → ...in/com/fwdekker/randomness/ListHelpers.kt b/...lin/com/fwdekker/randomness/ListHelper.kt → ...in/com/fwdekker/randomness/ListHelpers.kt
diff --git a/...r/randomness/ui/InterfaceBuilderHelper.kt → .../randomness/ui/InterfaceBuilderHelpers.kt b/...r/randomness/ui/InterfaceBuilderHelper.kt → .../randomness/ui/InterfaceBuilderHelpers.kt
diff --git a/.../fwdekker/randomness/ui/ListenerHelper.kt → ...fwdekker/randomness/ui/ListenerHelpers.kt b/.../fwdekker/randomness/ui/ListenerHelper.kt → ...fwdekker/randomness/ui/ListenerHelpers.kt
@@ -33,12 +33,14 @@ fun addChangeListenerTo(vararg components: Any, listener: () -> Unit) {
                 component.addActionListener { listener() }
                 addChangeListenerTo(component.editor.editorComponent, listener = listener)
             }
+
             is JSpinner -> component.addChangeListener { listener() }
             is JTextComponent -> addChangeListenerTo(component.document, listener = listener)
             is JTree -> {
                 component.model.addTreeModelListener(SimpleTreeModelListener { listener() })
                 component.addTreeSelectionListener { listener() }
             }
+
             is SchemeEditor<*> -> component.addChangeListener(listener)
             else -> Unit
         }

diff --git a/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt b/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt
diff --git a/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt b/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt
@@ -1,5 +1,6 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.guiRun
 import com.intellij.ui.dsl.builder.MutableProperty
 import io.kotest.assertions.withClue
 import io.kotest.core.factory.TestFactory

diff --git a/src/test/kotlin/com/fwdekker/randomness/ErrorReporterTest.kt b/src/test/kotlin/com/fwdekker/randomness/ErrorReporterTest.kt
@@ -1,5 +1,7 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import io.kotest.core.NamedTag

diff --git a/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt b/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt
@@ -1,5 +1,7 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.guiGet
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec

diff --git a/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt b/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt
@@ -1,5 +1,6 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.DummyInsertAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.Presentation

diff --git a/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt
@@ -1,5 +1,13 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.DummyDecoratorScheme
+import com.fwdekker.randomness.testhelpers.DummyDecoratorSchemeEditor
+import com.fwdekker.randomness.testhelpers.DummyScheme
+import com.fwdekker.randomness.testhelpers.DummySchemeEditor
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.guiGet
+import com.fwdekker.randomness.testhelpers.guiRun
 import com.fwdekker.randomness.ui.withName
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory

diff --git a/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt
@@ -1,5 +1,7 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.DummyDecoratorScheme
+import com.fwdekker.randomness.testhelpers.DummyScheme
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec

diff --git a/src/test/kotlin/com/fwdekker/randomness/SettingsTest.kt b/src/test/kotlin/com/fwdekker/randomness/SettingsTest.kt
@@ -2,6 +2,8 @@ package com.fwdekker.randomness
 
 import com.fwdekker.randomness.template.Template
 import com.fwdekker.randomness.template.TemplateList
+import com.fwdekker.randomness.testhelpers.DummyState
+import com.fwdekker.randomness.testhelpers.shouldValidateAsBundle
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row

diff --git a/src/test/kotlin/com/fwdekker/randomness/StateTest.kt b/src/test/kotlin/com/fwdekker/randomness/StateTest.kt
@@ -1,5 +1,6 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.DummyState
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldContainExactly

diff --git a/src/test/kotlin/com/fwdekker/randomness/StateTestFactory.kt b/src/test/kotlin/com/fwdekker/randomness/StateTestFactory.kt
@@ -1,5 +1,6 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
 import io.kotest.core.spec.style.funSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe

diff --git a/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt
@@ -1,14 +1,14 @@
 package com.fwdekker.randomness.affix
 
-import com.fwdekker.randomness.afterNonContainer
-import com.fwdekker.randomness.beforeNonContainer
 import com.fwdekker.randomness.editorApplyTestFactory
 import com.fwdekker.randomness.editorFieldsTestFactory
-import com.fwdekker.randomness.guiGet
-import com.fwdekker.randomness.guiRun
-import com.fwdekker.randomness.prop
-import com.fwdekker.randomness.requireEnabledIs
-import com.fwdekker.randomness.textProp
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.guiGet
+import com.fwdekker.randomness.testhelpers.guiRun
+import com.fwdekker.randomness.testhelpers.prop
+import com.fwdekker.randomness.testhelpers.requireEnabledIs
+import com.fwdekker.randomness.testhelpers.textProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.ui.layout.selected
@@ -113,7 +113,7 @@ object AffixDecoratorEditorTest : FunSpec({
                     row(true, true, true, true),
                 )
             ) { (predicateState, checkboxState, expectedCheckboxEnabled, expectedDescriptorEnabled) ->
-                val predicate = if (predicateState == null) null else toggle.selected
+                val predicate = predicateState?.let { toggle.selected }
 
                 frame.cleanUp()
                 editor = guiGet { AffixDecoratorEditor(scheme, presets = listOf("."), enabledIf = predicate) }

diff --git a/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorTest.kt b/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorTest.kt
@@ -1,7 +1,7 @@
 package com.fwdekker.randomness.affix
 
-import com.fwdekker.randomness.shouldValidateAsBundle
 import com.fwdekker.randomness.stateDeepCopyTestFactory
+import com.fwdekker.randomness.testhelpers.shouldValidateAsBundle
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row

diff --git a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
@@ -1,16 +1,16 @@
 package com.fwdekker.randomness.array
 
-import com.fwdekker.randomness.afterNonContainer
-import com.fwdekker.randomness.beforeNonContainer
 import com.fwdekker.randomness.editorApplyTestFactory
 import com.fwdekker.randomness.editorFieldsTestFactory
-import com.fwdekker.randomness.guiGet
-import com.fwdekker.randomness.guiRun
-import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.matcher
-import com.fwdekker.randomness.prop
-import com.fwdekker.randomness.textProp
-import com.fwdekker.randomness.valueProp
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.guiGet
+import com.fwdekker.randomness.testhelpers.guiRun
+import com.fwdekker.randomness.testhelpers.isSelectedProp
+import com.fwdekker.randomness.testhelpers.matcher
+import com.fwdekker.randomness.testhelpers.prop
+import com.fwdekker.randomness.testhelpers.textProp
+import com.fwdekker.randomness.testhelpers.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.ui.TitledSeparator

diff --git a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt
@@ -1,8 +1,8 @@
 package com.fwdekker.randomness.array
 
 import com.fwdekker.randomness.affix.AffixDecorator
-import com.fwdekker.randomness.shouldValidateAsBundle
 import com.fwdekker.randomness.stateDeepCopyTestFactory
+import com.fwdekker.randomness.testhelpers.shouldValidateAsBundle
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row

diff --git a/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeEditorTest.kt
@@ -1,15 +1,15 @@
 package com.fwdekker.randomness.datetime
 
-import com.fwdekker.randomness.afterNonContainer
-import com.fwdekker.randomness.beforeNonContainer
-import com.fwdekker.randomness.dateTimeProp
 import com.fwdekker.randomness.editorApplyTestFactory
 import com.fwdekker.randomness.editorFieldsTestFactory
-import com.fwdekker.randomness.guiGet
-import com.fwdekker.randomness.guiRun
-import com.fwdekker.randomness.prop
-import com.fwdekker.randomness.textProp
-import com.fwdekker.randomness.valueProp
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.dateTimeProp
+import com.fwdekker.randomness.testhelpers.guiGet
+import com.fwdekker.randomness.testhelpers.guiRun
+import com.fwdekker.randomness.testhelpers.prop
+import com.fwdekker.randomness.testhelpers.textProp
+import com.fwdekker.randomness.testhelpers.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import io.kotest.core.NamedTag

diff --git a/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt
@@ -1,8 +1,8 @@
 package com.fwdekker.randomness.datetime
 
 import com.fwdekker.randomness.integer.IntegerScheme
-import com.fwdekker.randomness.shouldValidateAsBundle
 import com.fwdekker.randomness.stateDeepCopyTestFactory
+import com.fwdekker.randomness.testhelpers.shouldValidateAsBundle
 import io.kotest.assertions.withClue
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec

diff --git a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt
@@ -1,15 +1,15 @@
 package com.fwdekker.randomness.decimal
 
-import com.fwdekker.randomness.afterNonContainer
-import com.fwdekker.randomness.beforeNonContainer
 import com.fwdekker.randomness.editorApplyTestFactory
 import com.fwdekker.randomness.editorFieldsTestFactory
-import com.fwdekker.randomness.guiGet
-import com.fwdekker.randomness.guiRun
-import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.prop
-import com.fwdekker.randomness.textProp
-import com.fwdekker.randomness.valueProp
+import com.fwdekker.randomness.testhelpers.afterNonContainer
+import com.fwdekker.randomness.testhelpers.beforeNonContainer
+import com.fwdekker.randomness.testhelpers.guiGet
+import com.fwdekker.randomness.testhelpers.guiRun
+import com.fwdekker.randomness.testhelpers.isSelectedProp
+import com.fwdekker.randomness.testhelpers.prop
+import com.fwdekker.randomness.testhelpers.textProp
+import com.fwdekker.randomness.testhelpers.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import io.kotest.core.NamedTag

diff --git a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt
@@ -2,8 +2,8 @@ package com.fwdekker.randomness.decimal
 
 import com.fwdekker.randomness.affix.AffixDecorator
 import com.fwdekker.randomness.array.ArrayDecorator
-import com.fwdekker.randomness.shouldValidateAsBundle
 import com.fwdekker.randomness.stateDeepCopyTestFactory
+import com.fwdekker.randomness.testhelpers.shouldValidateAsBundle
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row