From 9d27723f30a3582bc50668f6d51eadb06921c257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 22 Dec 2019 20:19:31 +0100 Subject: [PATCH] =?UTF-8?q?Don't=20copy=20teacher=20from=20previous=20less?= =?UTF-8?q?on=20with=20changes=20if=20new=20one=E2=80=A6=20(#622)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timetable/TimetableRepositoryTest.kt | 63 +++++++++++++------ .../timetable/TimetableRepository.kt | 2 +- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt index 073f822a..565425d4 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt @@ -6,7 +6,6 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SdkSuppress import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings -import io.github.wulkanowy.data.SdkHelper import io.github.wulkanowy.data.db.AppDatabase import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy @@ -14,9 +13,6 @@ import io.github.wulkanowy.sdk.Sdk import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK -import io.mockk.impl.annotations.SpyK -import io.mockk.just -import io.mockk.runs import io.reactivex.Single import org.junit.After import org.junit.Before @@ -94,27 +90,58 @@ class TimetableRepositoryTest { @Test fun copyTeacherToCompletedFromPrevious() { timetableLocal.saveTimetable(listOf( - createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda", "Jan Garnkiewicz", false), - createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia", "Paweł Jumper", false), - createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F", "", true), - createTimetableLocal(of(2019, 3, 5, 10, 30), 4, "213", "W-F", "", false) + createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false), + createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false), + createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true), + createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true), + + createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false), + createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false), + createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true), + createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true), + + createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false), + createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false), + createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true), + createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true) )) every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf( - createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda", "", true), // should override local - createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia", "", false), - createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F", "Jan Garnkiewicz", false), - createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F", "Paweł Jumper", false) + createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false), + createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true), + createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false), + createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true), + + createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false), + createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true), + createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false), + createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true), + + createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false), + createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true), + createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false), + createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true) )) val lessons = TimetableRepository(settings, timetableLocal, timetableRemote) - .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true) + .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true) .blockingGet() - assertEquals(4, lessons.size) - assertEquals("", lessons[0].teacher) - assertEquals("Paweł Jumper", lessons[1].teacher) - assertEquals("Jan Garnkiewicz", lessons[2].teacher) - assertEquals("Paweł Jumper", lessons[3].teacher) + assertEquals(12, lessons.size) + + assertEquals("Paweł Poniedziałkowski", lessons[0].teacher) + assertEquals("Jakub Wtorkowski", lessons[1].teacher) + assertEquals("Joanna Poniedziałkowska", lessons[2].teacher) + assertEquals("Joanna Wtorkowska", lessons[3].teacher) + + assertEquals("Joanna Wtorkowska", lessons[4].teacher) + assertEquals("", lessons[5].teacher) + assertEquals("", lessons[6].teacher) + assertEquals("", lessons[7].teacher) + + assertEquals("Paweł Środowski", lessons[8].teacher) + assertEquals("Paweł Czwartkowski", lessons[9].teacher) + assertEquals("Paweł Środowski", lessons[10].teacher) + assertEquals("Paweł Czwartkowski", lessons[11].teacher) } } diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt index e10e958e..20e183c2 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt @@ -36,7 +36,7 @@ class TimetableRepository @Inject constructor( old.singleOrNull { new.start == it.start }?.let { old -> return@map new.copy( room = if (new.room.isEmpty()) old.room else new.room, - teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher + teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher ) } }