refactor: change primary sorting criteria to dataInicio and update corresponding test assertions
This commit is contained in:
@@ -284,10 +284,10 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always sort by dataFim (predicted completion date) ascending, oldest first using dataFimMillis O(1)
|
// Always sort by dataInicio (start date) ascending, oldest first using dataInicioMillis O(1)
|
||||||
filtered.sortedWith { a1, a2 ->
|
filtered.sortedWith { a1, a2 ->
|
||||||
val p1 = a1.dataFimMillis
|
val p1 = a1.dataInicioMillis
|
||||||
val p2 = a2.dataFimMillis
|
val p2 = a2.dataInicioMillis
|
||||||
when {
|
when {
|
||||||
p1 == Long.MAX_VALUE && p2 == Long.MAX_VALUE -> a1.numeroOs.compareTo(a2.numeroOs)
|
p1 == Long.MAX_VALUE && p2 == Long.MAX_VALUE -> a1.numeroOs.compareTo(a2.numeroOs)
|
||||||
p1 == Long.MAX_VALUE -> 1
|
p1 == Long.MAX_VALUE -> 1
|
||||||
@@ -297,10 +297,10 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View
|
|||||||
if (comp != 0) {
|
if (comp != 0) {
|
||||||
comp
|
comp
|
||||||
} else {
|
} else {
|
||||||
val s1 = a1.dataInicioMillis
|
val f1 = a1.dataFimMillis
|
||||||
val s2 = a2.dataInicioMillis
|
val f2 = a2.dataFimMillis
|
||||||
val startComp = s1.compareTo(s2)
|
val endComp = f1.compareTo(f2)
|
||||||
if (startComp != 0) startComp else a1.numeroOs.compareTo(a2.numeroOs)
|
if (endComp != 0) endComp else a1.numeroOs.compareTo(a2.numeroOs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -414,10 +414,10 @@ class ExampleRobolectricTest {
|
|||||||
|
|
||||||
val filtered = viewModel.filteredActivities.value
|
val filtered = viewModel.filteredActivities.value
|
||||||
assertEquals(3, filtered.size)
|
assertEquals(3, filtered.size)
|
||||||
// Order by dataFim: OS-4 (14/08/26 07:00) -> OS-1024 (18/08/26 17:00) -> OS-1 (11/09/26 16:00)
|
// Order by dataInicio: OS-1 (04/08/26 07:00) -> OS-4 (14/08/26 07:00) -> OS-1024 (17/08/26 07:00)
|
||||||
assertEquals("OS-4", filtered[0].numeroOs)
|
assertEquals("OS-1", filtered[0].numeroOs)
|
||||||
assertEquals("OS-1024", filtered[1].numeroOs)
|
assertEquals("OS-4", filtered[1].numeroOs)
|
||||||
assertEquals("OS-1", filtered[2].numeroOs)
|
assertEquals("OS-1024", filtered[2].numeroOs)
|
||||||
|
|
||||||
collectionJob.cancel()
|
collectionJob.cancel()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user