Clean up progress DTOs
This commit is contained in:
20 files changed
+84
-207
No files matched your search
@@ -7,7 +7,8 @@ import eu.depau.etchdroid.AppBuildConfig
|
||||
import eu.depau.etchdroid.db.EtchDroidDatabase
|
||||
import eu.depau.etchdroid.db.entity.Job
|
||||
import eu.depau.etchdroid.db.repository.JobRepository
|
||||
import eu.depau.etchdroid.services.dto.JobServiceIntentDTO
|
||||
import eu.depau.etchdroid.services.job.JobService
|
||||
import eu.depau.etchdroid.services.job.dto.JobServiceIntentDTO
|
||||
import eu.depau.etchdroid.testutils.job.MockJobAction
|
||||
import eu.depau.etchdroid.testutils.worker.MockJobWorker
|
||||
import eu.depau.etchdroid.utils.job.impl.JobProcedure
|
||||
|
||||
@@ -5,8 +5,6 @@ import eu.depau.etchdroid.testutils.worker.MockJobWorker
|
||||
import eu.depau.etchdroid.utils.StringResBuilder
|
||||
import eu.depau.etchdroid.utils.job.IJobAction
|
||||
import eu.depau.etchdroid.utils.worker.IAsyncWorker
|
||||
import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO
|
||||
import eu.depau.etchdroid.utils.worker.enums.RateUnit
|
||||
import eu.depau.kotlet.android.parcelable.KotletParcelable
|
||||
import eu.depau.kotlet.android.parcelable.parcelableCreator
|
||||
import org.mockito.Mockito
|
||||
@@ -22,19 +20,13 @@ class MockJobAction(
|
||||
)
|
||||
|
||||
private val lazyWorker by lazy {
|
||||
Mockito.spy(
|
||||
MockJobWorker(
|
||||
// TODO: fix update dto so it doesn't have excess fields
|
||||
ProgressUpdateDTO(
|
||||
-1, 0, 0.0,
|
||||
0.0, 0, 0.0,
|
||||
RateUnit.FURLONGS_PER_FORTNIGHT
|
||||
)
|
||||
)
|
||||
)
|
||||
Mockito.spy(MockJobWorker())
|
||||
}
|
||||
|
||||
override fun getWorker(): IAsyncWorker = lazyWorker
|
||||
override fun getWorker(): IAsyncWorker {
|
||||
println("Retrieved worker for Action with nameResId $nameResId")
|
||||
return lazyWorker
|
||||
}
|
||||
|
||||
/**
|
||||
* Check action preconditions and return a list of StringResBuilders, which will then be
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package eu.depau.etchdroid.testutils.worker
|
||||
|
||||
import eu.depau.etchdroid.utils.worker.dto.ProgressUpdateDTO
|
||||
import eu.depau.etchdroid.utils.worker.enums.RateUnit
|
||||
import eu.depau.etchdroid.utils.worker.impl.AbstractAutoProgressAsyncWorker
|
||||
import eu.depau.etchdroid.utils.worker.impl.UPDATE_INTERVAL
|
||||
|
||||
open class MockJobWorker(override val progressUpdateDTO: ProgressUpdateDTO) : AbstractAutoProgressAsyncWorker(10) {
|
||||
open class MockJobWorker : AbstractAutoProgressAsyncWorker(10, RateUnit.FURLONGS_PER_FORTNIGHT) {
|
||||
var counter = 0
|
||||
val steps = 10
|
||||
val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong()
|
||||
private val sleepTime = (UPDATE_INTERVAL * 2.2 / steps).toLong()
|
||||
|
||||
/**
|
||||
* Make the worker do one step. Returns whether there are more steps to do
|
||||
@@ -16,6 +15,7 @@ open class MockJobWorker(override val progressUpdateDTO: ProgressUpdateDTO) : Ab
|
||||
*/
|
||||
override fun runStep(): Boolean {
|
||||
counter++
|
||||
println("Worker counts $counter/$steps")
|
||||
Thread.sleep(sleepTime)
|
||||
return counter < steps
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user