Skip to content

Commit bbb6530

Browse files
committed
fix: replace @MockBean with @MockitoBean and improve test configurations
1 parent 4c8c496 commit bbb6530

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

backend/data/src/test/kotlin/io/tolgee/email/EmailGlobalVariablesProviderTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ import io.tolgee.testing.assert
2525
import org.junit.jupiter.api.Test
2626
import org.mockito.kotlin.whenever
2727
import org.springframework.beans.factory.annotation.Autowired
28-
import org.springframework.boot.test.mock.mockito.MockBean
28+
import org.springframework.test.context.bean.override.mockito.MockitoBean
2929
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig
3030

3131
@SpringJUnitConfig(EmailGlobalVariablesProvider::class)
3232
class EmailGlobalVariablesProviderTest {
33-
@MockBean
33+
@MockitoBean
3434
private lateinit var publicBillingConfProvider: PublicBillingConfProvider
3535

36-
@MockBean
36+
@MockitoBean
3737
private lateinit var tolgeeProperties: TolgeeProperties
3838

39-
@MockBean
39+
@MockitoBean
4040
private lateinit var frontendUrlProvider: FrontendUrlProvider
4141

4242
@Autowired

backend/data/src/test/kotlin/io/tolgee/email/EmailServiceTest.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.tolgee.email
1818

19-
import io.tolgee.configuration.tolgee.SmtpProperties
2019
import io.tolgee.configuration.tolgee.TolgeeProperties
2120
import io.tolgee.testing.assert
2221
import jakarta.mail.internet.MimeMessage
@@ -31,22 +30,22 @@ import org.mockito.junit.jupiter.MockitoExtension
3130
import org.mockito.kotlin.verify
3231
import org.mockito.kotlin.whenever
3332
import org.springframework.beans.factory.annotation.Autowired
34-
import org.springframework.boot.test.mock.mockito.MockBean
3533
import org.springframework.mail.javamail.JavaMailSender
3634
import org.springframework.mail.javamail.JavaMailSenderImpl
35+
import org.springframework.test.context.bean.override.mockito.MockitoBean
3736
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig
3837
import java.util.Locale
3938

4039
@ExtendWith(MockitoExtension::class)
4140
@SpringJUnitConfig(EmailService::class, EmailTemplateConfig::class, EmailTemplateTestConfig::class)
4241
class EmailServiceTest {
43-
@MockBean
42+
@Autowired
4443
private lateinit var tolgeeProperties: TolgeeProperties
4544

46-
@MockBean
45+
@MockitoBean
4746
private lateinit var mailSender: JavaMailSender
4847

49-
@MockBean
48+
@MockitoBean
5049
private lateinit var emailGlobalVariablesProvider: EmailGlobalVariablesProvider
5150

5251
@Autowired
@@ -58,9 +57,7 @@ class EmailServiceTest {
5857
@BeforeEach
5958
fun beforeEach() {
6059
val sender = JavaMailSenderImpl()
61-
val smtp = SmtpProperties()
62-
smtp.from = "Tolgee Test <robomouse+test@tolgee.test>"
63-
whenever(tolgeeProperties.smtp).thenReturn(smtp)
60+
tolgeeProperties.smtp.from = "Tolgee Test <robomouse+test@tolgee.test>"
6461
whenever(mailSender.createMimeMessage()).let {
6562
val msg = sender.createMimeMessage()
6663
it.thenReturn(msg)

backend/data/src/test/kotlin/io/tolgee/email/EmailTemplateTestConfig.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.tolgee.email
22

33
import com.transferwise.icu.ICUReloadableResourceBundleMessageSource
4+
import io.tolgee.configuration.tolgee.TolgeeProperties
45
import org.springframework.boot.test.context.TestConfiguration
56
import org.springframework.context.MessageSource
67
import org.springframework.context.annotation.Bean
@@ -9,6 +10,9 @@ import java.util.Locale
910

1011
@TestConfiguration
1112
class EmailTemplateTestConfig {
13+
@Bean
14+
fun tolgeeProperties(): TolgeeProperties = TolgeeProperties()
15+
1216
@Bean("emailIcuMessageSource")
1317
@Primary
1418
fun testMessageSource(): MessageSource {

0 commit comments

Comments
 (0)