Skip to content

Commit 99b338e

Browse files
committed
Add tests for miscellaneous classes
Such as helper classes and such.
1 parent 8d27c30 commit 99b338e

18 files changed

+724
-265
lines changed

src/main/kotlin/com/fwdekker/randomness/Scheme.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ abstract class Scheme {
3535
*/
3636
@get:Transient
3737
open val icon: Icon?
38-
get() = if (decorator?.enabled == true) icons?.Array
39-
else icons?.Base
38+
get() =
39+
if (decorator?.enabled == true) icons?.Array
40+
else icons?.Base
4041

4142
/**
4243
* The random number generator used to generate random values.

src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class TemplateSettingsAction(private val template: Template? = null) : AnAction(
102102
override fun update(event: AnActionEvent) {
103103
super.update(event)
104104

105-
event.presentation.text = "${template?.name ?: "Template"} Settings"
106105
event.presentation.icon = template?.icons?.Settings ?: RandomnessIcons.Data.Settings
106+
event.presentation.text = "${template?.name ?: "Template"} Settings"
107107
}
108108

109109
/**

src/main/kotlin/com/fwdekker/randomness/ui/ListenerHelper.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import javax.swing.text.Document
2121
* @param listener the listener to invoke whenever any of the given components changes state
2222
*/
2323
@Suppress("SpreadOperator") // Acceptable because this method is called rarely
24-
fun addChangeListenerTo(vararg components: Any?, listener: () -> Unit) {
24+
fun addChangeListenerTo(vararg components: Any, listener: () -> Unit) {
2525
components.forEach { component ->
2626
when (component) {
2727
is ActivityTableModelEditor<*> -> component.addChangeListener(listener)
@@ -31,7 +31,7 @@ fun addChangeListenerTo(vararg components: Any?, listener: () -> Unit) {
3131
is JSpinner -> component.addChangeListener { listener() }
3232
is JTextField -> component.addChangeListener { listener() }
3333
is SchemeEditor<*> -> component.addChangeListener { listener() }
34-
else -> throw IllegalArgumentException("Unknown component type '${component?.javaClass?.canonicalName}'.")
34+
else -> throw IllegalArgumentException("Unknown component type '${component.javaClass.canonicalName}'.")
3535
}
3636
}
3737
}
@@ -70,6 +70,7 @@ fun JTextField.addChangeListener(changeListener: (JTextField) -> Unit) {
7070
this.document.addDocumentListener(dl)
7171
}
7272

73+
7374
/**
7475
* A [MouseListener] that listens only to mouse clicks.
7576
*

src/test/kotlin/com/fwdekker/randomness/CapitalizationModeTest.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ object CapitalizationModeTest : Spek({
5252
.isEqualToIgnoringCase("GHmdukhNqua")
5353
}
5454
}
55+
56+
describe("dummy mode") {
57+
it("does nothing to a string") {
58+
assertThat(CapitalizationMode.DUMMY.transform.invoke("i4Oh51O")).isEqualTo("i4Oh51O")
59+
}
60+
}
5561
}
5662

5763
describe("descriptor") {
@@ -72,9 +78,9 @@ object CapitalizationModeTest : Spek({
7278
}
7379

7480
it("throws an exception if the descriptor is not recognized") {
75-
assertThatThrownBy { CapitalizationMode.getMode("") }
81+
assertThatThrownBy { CapitalizationMode.getMode("river") }
7682
.isInstanceOf(IllegalArgumentException::class.java)
77-
.hasMessage("There does not exist a capitalization mode with name ``.")
83+
.hasMessage("There does not exist a capitalization mode with name `river`.")
7884
.hasNoCause()
7985
}
8086
}

src/test/kotlin/com/fwdekker/randomness/Dummies.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.fwdekker.randomness
33
import com.fwdekker.randomness.array.ArraySchemeDecorator
44
import com.fwdekker.randomness.array.ArraySchemeDecoratorEditor
55
import com.fwdekker.randomness.ui.addChangeListenerTo
6+
import icons.RandomnessIcons
67
import java.awt.BorderLayout
78
import javax.swing.Icon
89
import javax.swing.JPanel
@@ -20,7 +21,8 @@ data class DummyScheme(
2021
var literals: List<String> = listOf(DEFAULT_OUTPUT),
2122
override var decorator: ArraySchemeDecorator = ArraySchemeDecorator()
2223
) : Scheme() {
23-
override val name = "Dummy"
24+
override var icons: RandomnessIcons? = RandomnessIcons.Data
25+
override var name = "Dummy"
2426

2527

2628
override fun generateUndecoratedStrings(count: Int) = List(count) { literals[it % literals.size] }
@@ -81,6 +83,8 @@ class DummySchemeEditor(scheme: DummyScheme = DummyScheme()) : SchemeEditor<Dumm
8183

8284

8385
override fun loadScheme(scheme: DummyScheme) {
86+
super.loadScheme(scheme)
87+
8488
literalsInput.text = scheme.literals.joinToString(separator = ",")
8589
arrayDecoratorEditor.loadScheme(scheme.decorator)
8690
}

src/test/kotlin/com/fwdekker/randomness/InsertActionIntegrationTest.kt

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)