Skip to content

Commit c5654af

Browse files
committed
Switching off vintage test runner.
1 parent f7baa77 commit c5654af

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757

5858
// Testing
5959
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
60-
testImplementation "org.junit.vintage:junit-vintage-engine:${junitVersion}"
60+
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
6161
testImplementation 'org.mockito:mockito-core:4.2.0'
6262
testImplementation "org.hamcrest:hamcrest-core:2.2"
6363
testImplementation "io.mockk:mockk:1.12.1"

src/test/kotlin/com/wikia/tibia/objects/LootStatisticsItemTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.wikia.tibia.objects
22

33
import org.hamcrest.MatcherAssert.assertThat
44
import org.hamcrest.Matchers.`is`
5-
import org.junit.Test
5+
import org.junit.jupiter.api.Test
66

77
class LootStatisticsItemTest {
88

src/test/kotlin/com/wikia/tibia/objects/LootWrapperTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.wikia.tibia.objects
22

33
import org.hamcrest.MatcherAssert.assertThat
44
import org.hamcrest.Matchers.`is`
5-
import org.junit.Test
5+
import org.junit.jupiter.api.Test
66

77
class LootWrapperTest {
88

src/test/kotlin/com/wikia/tibia/objects/PercentageTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.wikia.tibia.objects
22

33
import org.hamcrest.MatcherAssert.assertThat
44
import org.hamcrest.Matchers.`is`
5-
import org.junit.Test
5+
import org.junit.jupiter.api.Test
66

77
class PercentageTest {
88

src/test/kotlin/com/wikia/tibia/repositories/CreatureRepositoryTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.wikia.tibia.objects.Creature
55
import io.vavr.control.Try
66
import org.hamcrest.MatcherAssert
77
import org.hamcrest.Matchers
8-
import org.junit.Before
9-
import org.junit.Test
8+
import org.junit.jupiter.api.BeforeEach
9+
import org.junit.jupiter.api.Test
1010
import org.mockito.Mock
1111
import org.mockito.Mockito.mock
1212
import org.mockito.Mockito.`when`
@@ -19,7 +19,7 @@ class CreatureRepositoryTest {
1919
private lateinit var creatureRepository: CreatureRepository
2020

2121
@Suppress("UNCHECKED_CAST")
22-
@Before
22+
@BeforeEach
2323
fun setup() {
2424
creatureGateway = mock(WikiObjectGateway::class.java) as WikiObjectGateway<Creature>
2525
creatureRepository = CreatureRepository()

src/test/kotlin/com/wikia/tibia/repositories/LootRepositoryTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import org.hamcrest.MatcherAssert.assertThat
1010
import org.hamcrest.Matchers.instanceOf
1111
import org.hamcrest.Matchers.`is`
1212
import org.hamcrest.Matchers.nullValue
13-
import org.junit.Before
14-
import org.junit.Test
13+
import org.junit.jupiter.api.BeforeEach
14+
import org.junit.jupiter.api.Test
1515
import org.mockito.Mock
1616
import org.mockito.Mockito.mock
1717
import org.mockito.Mockito.`when`
@@ -22,7 +22,7 @@ internal class LootRepositoryTest {
2222
private lateinit var lootGateway: LootGateway
2323
private lateinit var lootRepository: LootRepository
2424

25-
@Before
25+
@BeforeEach
2626
fun setup() {
2727
lootGateway = mock(LootGateway::class.java)
2828
lootRepository = LootRepository(lootGateway)

src/test/kotlin/com/wikia/tibia/usecases/BuildingRentsTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import com.wikia.tibia.repositories.InputRepository
1212
import io.vavr.control.Try
1313
import org.hamcrest.MatcherAssert.assertThat
1414
import org.hamcrest.Matchers.`is`
15-
import org.junit.Before
16-
import org.junit.Ignore
17-
import org.junit.Test
15+
import org.junit.jupiter.api.BeforeEach
16+
import org.junit.jupiter.api.Disabled
17+
import org.junit.jupiter.api.Test
1818
import org.mockito.ArgumentMatchers.anyBoolean
1919
import org.mockito.ArgumentMatchers.anyString
2020
import org.mockito.Mock
@@ -32,13 +32,13 @@ class BuildingRentsTest {
3232
private lateinit var buildingRepository: BuildingRepository
3333
private lateinit var target: BuildingRents
3434

35-
@Before
35+
@BeforeEach
3636
fun setup() {
3737
inputRepository = mock(InputRepository::class.java)
3838
buildingRepository = mock(BuildingRepository::class.java)
3939
}
4040

41-
@Ignore
41+
@Disabled
4242
@Test
4343
fun `should update rent to buildings - production`() {
4444
// given

src/test/kotlin/com/wikia/tibia/usecases/NullEditWikiObjectsTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import com.wikia.tibia.repositories.OutfitRepository
1717
import com.wikia.tibia.repositories.QuestRepository
1818
import com.wikia.tibia.repositories.SpellRepository
1919
import com.wikia.tibia.repositories.StreetRepository
20-
import org.junit.Before
21-
import org.junit.Ignore
22-
import org.junit.Test
20+
import org.junit.jupiter.api.BeforeEach
21+
import org.junit.jupiter.api.Disabled
22+
import org.junit.jupiter.api.Test
2323

24-
@Ignore
24+
@Disabled
2525
class NullEditWikiObjectsTest {
2626
private lateinit var target: NullEditWikiObjects
2727

28-
@Before
28+
@BeforeEach
2929
fun setup() {
3030
target = NullEditWikiObjects(
3131
achievementRepository = AchievementRepository(),

0 commit comments

Comments
 (0)