Clear all mocks after each test

common/common-test/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     }
     api(Lib.junit5())
     api(Lib.junit5("params"))
+    api(Lib.mockk())
     api(Lib.kluent().id) {
         exclude("org.mockito", "mockito-core")
         exclude("com.nhaarman.mockitokotlin2", "mockito-kotlin")

common/common-test/src/main/kotlin/ch/difty/scipamato/common/ClearAllMocksExtension.kt

@@ -0,0 +1,21 @@
+package ch.difty.scipamato.common
+
+import io.mockk.clearAllMocks
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+
+/**
+ * Junit extension that resets all mocks after every test execution.
+ * It should not be needed because MockkBean clears the mocks that have been created in the application context by
+ * default. Unfortunately, that doesn't work for nested tests due to a Spring Boot issue
+ * (see https://github.com/spring-projects/spring-boot/issues/12470). So, to make things easier, we keep using this
+ * extension.
+ * @author JB Nizet
+ *
+ * Taken from https://github.com/Ninja-Squad/springmockk/issues/12 - thanks to @jnizet
+ */
+class ClearAllMocksExtension : AfterTestExecutionCallback {
+    override fun afterTestExecution(context: ExtensionContext?) {
+        clearAllMocks()
+    }
+}

core/core-entity/src/test/kotlin/ch/difty/scipamato/core/entity/search/SearchOrderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.entity.search
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.common.entity.ScipamatoEntity.ScipamatoEntityFields.CREATED
 import ch.difty.scipamato.common.entity.ScipamatoEntity.ScipamatoEntityFields.MODIFIED
 import ch.difty.scipamato.core.entity.CoreEntity.CoreEntityFields.CREATOR_ID
@@ -21,7 +22,7 @@ import java.time.LocalDateTime
 
 private const val SO_NAME = "soName"
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SearchOrderTest {
 
     private val so = SearchOrder(10L, SO_NAME, 1, false, null, null)

core/core-web/src/test/kotlin/ch/difty/scipamato/core/config/ScipamatoCorePropertiesTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.config
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.common.config.MavenProperties
 import ch.difty.scipamato.core.logic.exporting.RisExporterStrategy
 import ch.difty.scipamato.core.logic.parsing.AuthorParserStrategy
@@ -14,7 +15,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ScipamatoCorePropertiesTest {
 
     private lateinit var prop: ScipamatoCoreProperties

core/core-web/src/test/kotlin/ch/difty/scipamato/core/logic/export/RisExporterConfigurationTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.logic.export
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.config.ApplicationCoreProperties
 import ch.difty.scipamato.core.logic.exporting.RisAdapterFactory
 import ch.difty.scipamato.core.logic.exporting.RisExporterConfiguration
@@ -13,7 +14,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class RisExporterConfigurationTest {
 
     private lateinit var conf: RisExporterConfiguration

core/core-web/src/test/kotlin/ch/difty/scipamato/core/logic/parsing/AuthorParserConfigurationTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.logic.parsing
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.config.ApplicationCoreProperties
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -10,7 +11,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class AuthorParserConfigurationTest {
 
     private lateinit var conf: AuthorParserConfiguration

core/core-web/src/test/kotlin/ch/difty/scipamato/core/pubmed/PubmedImportServiceTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.pubmed
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.config.ApplicationCoreProperties
 import ch.difty.scipamato.core.persistence.PaperService
 import ch.difty.scipamato.core.persistence.ServiceResult
@@ -17,7 +18,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.ArrayList
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class PubmedImportServiceTest {
 
     private lateinit var pubmedImporter: PubmedImporter

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/AbstractWicketTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.TestApplication
 import ch.difty.scipamato.common.DateTimeService
 import ch.difty.scipamato.common.navigator.ItemNavigator
@@ -32,7 +33,7 @@ import org.springframework.test.context.ActiveProfiles
 
 @SpringBootTest
 @ActiveProfiles("wickettest")
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 abstract class AbstractWicketTest {
 
     @Bean

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/common/SelfUpdateEventTest.kt

@@ -1,13 +1,14 @@
 package ch.difty.scipamato.core.web.common
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import org.amshove.kluent.shouldBeEqualTo
 import org.apache.wicket.ajax.AjaxRequestTarget
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SelfUpdateEventTest {
 
     @MockK

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/NewsletterChangeEventTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.paper
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import nl.jqno.equalsverifier.EqualsVerifier
@@ -9,7 +10,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class NewsletterChangeEventTest {
 
     private lateinit var e: NewsletterChangeEvent

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/PaperAttachmentProviderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.paper
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.entity.PaperAttachment
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
@@ -13,7 +14,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.ArrayList
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class PaperAttachmentProviderTest {
 
     private lateinit var provider: PaperAttachmentProvider

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/SearchConditionProviderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.paper
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.entity.search.SearchCondition
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
@@ -13,7 +14,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.ArrayList
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SearchConditionProviderTest {
 
     private lateinit var provider: SearchConditionProvider

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/common/NewFieldChangeEventTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.paper.common
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import io.mockk.confirmVerified
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -15,7 +16,7 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class NewFieldChangeEventTest {
 
     private lateinit var e: NewFieldChangeEvent

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/search/SearchOrderChangeEventTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.paper.search
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.web.paper.SearchOrderChangeEvent
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
@@ -13,7 +14,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SearchOrderChangeEventTest {
 
     private lateinit var e: SearchOrderChangeEvent

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/paper/search/ToggleExclusionsEventTest.kt

@@ -1,13 +1,14 @@
 package ch.difty.scipamato.core.web.paper.search
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import org.amshove.kluent.shouldBeEqualTo
 import org.apache.wicket.ajax.AjaxRequestTarget
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ToggleExclusionsEventTest {
 
     @MockK

core/core-web/src/test/kotlin/ch/difty/scipamato/core/web/security/ScipamatoUserDetailsServiceTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.core.web.security
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.core.entity.User
 import ch.difty.scipamato.core.persistence.UserService
 import ch.difty.scipamato.core.web.authentication.ScipamatoUserDetails
@@ -21,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.security.core.userdetails.UsernameNotFoundException
 import java.util.Optional
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ScipamatoUserDetailsServiceTest {
 
     private lateinit var service: ScipamatoUserDetailsService

public/public-persistence-jooq/src/test/kotlin/ch/difty/scipamato/publ/persistence/paper/JooqPublicPaperRepoTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.persistence.paper
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.common.persistence.JooqSortMapper
 import ch.difty.scipamato.publ.db.tables.Paper
 import ch.difty.scipamato.publ.db.tables.records.PaperRecord
@@ -19,7 +20,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
 @Suppress("SpellCheckingInspection")
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class JooqPublicPaperRepoTest {
 
     @MockK

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/ScipamatoPublicApplicationTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.common.logger
 import ch.difty.scipamato.publ.config.ScipamatoPublicProperties
 import io.mockk.every
@@ -10,7 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 
 private val log = logger()
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ScipamatoPublicApplicationTest {
 
     @MockK

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/config/ScipamatoPublicPropertiesTest.kt

@@ -2,6 +2,7 @@
 
 package ch.difty.scipamato.publ.config
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.common.config.MavenProperties
 import io.mockk.confirmVerified
 import io.mockk.every
@@ -14,7 +15,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ScipamatoPublicPropertiesTest {
 
     private lateinit var prop: ScipamatoPublicProperties

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/misc/ParentUrlLocaleExtractorTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.misc
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.publ.config.ScipamatoPublicProperties
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -10,7 +11,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.Locale
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class ParentUrlLocaleExtractorTest {
 
     private lateinit var localeExtractor: LocaleExtractor

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/font/IcoMoonFontResourceProviderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.web.font
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.publ.config.ApplicationPublicProperties
 import ch.difty.scipamato.publ.web.resources.IcoMoonCssResourceReference
 import io.mockk.every
@@ -13,7 +14,7 @@ import org.amshove.kluent.shouldBeTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class IcoMoonFontResourceProviderTest {
 
     private lateinit var provider: IcoMoonFontResourceProvider

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/font/MetaOTFontResourceProviderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.web.font
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.publ.config.ApplicationPublicProperties
 import ch.difty.scipamato.publ.web.resources.MetaOTCssResourceReference
 import io.mockk.every
@@ -13,7 +14,7 @@ import org.amshove.kluent.shouldBeTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class MetaOTFontResourceProviderTest {
 
     private lateinit var provider: MetaOTFontResourceProvider

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/font/SimplonFontResourceProviderTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.web.font
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import ch.difty.scipamato.publ.config.ApplicationPublicProperties
 import ch.difty.scipamato.publ.web.resources.SimplonCssResourceReference
 import io.mockk.every
@@ -13,7 +14,7 @@ import org.amshove.kluent.shouldBeTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SimplonFontResourceProviderTest {
 
     private lateinit var provider: SimplonFontResourceProvider

public/public-web/src/test/kotlin/ch/difty/scipamato/publ/web/paper/browse/SimpleFilterPanelChangeEventTest.kt

@@ -1,5 +1,6 @@
 package ch.difty.scipamato.publ.web.paper.browse
 
+import ch.difty.scipamato.common.ClearAllMocksExtension
 import io.mockk.confirmVerified
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -19,7 +20,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 private const val ID = "id"
 private const val MARKUP_ID = "mId"
 
-@ExtendWith(MockKExtension::class)
+@ExtendWith(MockKExtension::class, ClearAllMocksExtension::class)
 internal class SimpleFilterPanelChangeEventTest {
 
     private lateinit var e: SimpleFilterPanelChangeEvent