mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-02-22 08:08:29 +00:00
Consolidate setup methods
This commit is contained in:
parent
b73d4a7022
commit
29043e1684
@ -42,33 +42,30 @@ class Environment : BaseTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun setupMagisk() {
|
||||
fun setupEnvironment() {
|
||||
runBlocking {
|
||||
assertTrue(
|
||||
"Magisk setup failed",
|
||||
MagiskInstaller.Emulator(TimberLog, TimberLog).exec()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun setupLsposed() {
|
||||
assumeTrue(lsposed())
|
||||
|
||||
val notify = object : DownloadNotifier {
|
||||
override val context = appContext
|
||||
override fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit) {}
|
||||
}
|
||||
val processor = DownloadProcessor(notify)
|
||||
val zip = appContext.cachedFile("lsposed.zip")
|
||||
runBlocking {
|
||||
testContext.assets.open("lsposed.zip").use {
|
||||
processor.handleModule(it, zip.toUri())
|
||||
if (lsposed()) {
|
||||
val notify = object : DownloadNotifier {
|
||||
override val context = appContext
|
||||
override fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit) {}
|
||||
}
|
||||
val processor = DownloadProcessor(notify)
|
||||
val zip = appContext.cachedFile("lsposed.zip")
|
||||
runBlocking {
|
||||
testContext.assets.open("lsposed.zip").use {
|
||||
processor.handleModule(it, zip.toUri())
|
||||
}
|
||||
assertTrue(
|
||||
"LSPosed installation failed",
|
||||
FlashZip(zip.toUri(), TimberLog, TimberLog).exec()
|
||||
)
|
||||
}
|
||||
assertTrue(
|
||||
"LSPosed installation failed",
|
||||
FlashZip(zip.toUri(), TimberLog, TimberLog).exec()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -53,9 +53,7 @@ run_setup() {
|
||||
local app='com.topjohnwu.magisk.test/com.topjohnwu.magisk.test.AppTestRunner'
|
||||
|
||||
# Run setup through the test app
|
||||
am_instrument '.Environment#setupMagisk' $app
|
||||
# Install LSPosed
|
||||
am_instrument '.Environment#setupLsposed' $app
|
||||
am_instrument '.Environment#setupEnvironment' $app
|
||||
}
|
||||
|
||||
run_tests() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user