Skip to content

Commit 2880280

Browse files
authored
Merge pull request #5204 from XiangRongLin/fix_before_all
Use @BeforeClass for ContentSettingsManagerTest.beforeClass
2 parents f590993 + e0ee3dc commit 2880280

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.SharedPreferences
44
import org.junit.Assert
55
import org.junit.Assume
66
import org.junit.Before
7+
import org.junit.BeforeClass
78
import org.junit.Test
89
import org.junit.runner.RunWith
910
import org.junit.runners.Suite
@@ -22,24 +23,27 @@ class ContentSettingsManagerTest {
2223
@RunWith(MockitoJUnitRunner::class)
2324
class ExportTest {
2425

25-
private lateinit var preferences: SharedPreferences
26-
private lateinit var newpipeDb: File
27-
private lateinit var newpipeSettings: File
28-
29-
@Before
30-
fun beforeClass() {
26+
companion object {
27+
private lateinit var newpipeDb: File
28+
private lateinit var newpipeSettings: File
3129

32-
val dbPath = javaClass.classLoader?.getResource("settings/newpipe.db")?.file
33-
val settingsPath = javaClass.classLoader?.getResource("settings/newpipe.settings")?.path
34-
Assume.assumeNotNull(dbPath)
35-
Assume.assumeNotNull(settingsPath)
30+
@JvmStatic
31+
@BeforeClass
32+
fun setupFiles() {
33+
val dbPath = ExportTest::class.java.classLoader?.getResource("settings/newpipe.db")?.file
34+
val settingsPath = ExportTest::class.java.classLoader?.getResource("settings/newpipe.settings")?.path
35+
Assume.assumeNotNull(dbPath)
36+
Assume.assumeNotNull(settingsPath)
3637

37-
newpipeDb = File(dbPath!!)
38-
newpipeSettings = File(settingsPath!!)
38+
newpipeDb = File(dbPath!!)
39+
newpipeSettings = File(settingsPath!!)
40+
}
3941
}
4042

43+
private lateinit var preferences: SharedPreferences
44+
4145
@Before
42-
fun before() {
46+
fun setupMocks() {
4347
preferences = Mockito.mock(SharedPreferences::class.java, Mockito.withSettings().stubOnly())
4448
}
4549

0 commit comments

Comments
 (0)