sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Change all entities ids from string to int (#167)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-10-20 17:57:24 +02:00
committed by Rafał Borcz
parent 27f6fc7e04
commit f35d9d4b93
35 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
View File

@ -36,9 +36,9 @@ class AttendanceRemoteTest {
getAttendance("2018-09-17")
))
every { mockApi.diaryId } returns "1"
every { semesterMock.studentId } returns "1"
every { semesterMock.diaryId } returns "1"
every { mockApi.diaryId } returns 1
every { semesterMock.studentId } returns 1
every { semesterMock.diaryId } returns 1
val attendance = AttendanceRemote(mockApi).getAttendance(semesterMock,
LocalDate.of(2018, 9, 10),

6
app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
View File

@ -36,9 +36,9 @@ class ExamRemoteTest {
getExam("2018-09-17")
))
every { mockApi.diaryId } returns "1"
every { semesterMock.studentId } returns "1"
every { semesterMock.diaryId } returns "1"
every { mockApi.diaryId } returns 1
every { semesterMock.studentId } returns 1
every { semesterMock.diaryId } returns 1
val exams = ExamRemote(mockApi).getExams(semesterMock,
LocalDate.of(2018, 9, 10),

2
app/src/test/java/io/github/wulkanowy/data/repositories/remote/SessionRemoteTest.kt
View File

@ -22,7 +22,7 @@ class SessionRemoteTest {
@Test
fun testRemoteAll() {
doReturn(Single.just(listOf(Pupil("", "", "", "test", "", "", Api.LoginType.AUTO))))
doReturn(Single.just(listOf(Pupil("", "", 1, "test", "", "", Api.LoginType.AUTO))))
.`when`(mockApi).getPupils()
val students = SessionRemote(mockApi).getConnectedStudents("", "", "", "http://fakelog.cf").blockingGet()

6
app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
View File

@ -36,9 +36,9 @@ class TimetableRemoteTest {
getTimetable("2018-09-17")
))
every { mockApi.diaryId } returns "1"
every { semesterMock.studentId } returns "1"
every { semesterMock.diaryId } returns "1"
every { mockApi.diaryId } returns 1
every { semesterMock.studentId } returns 1
every { semesterMock.diaryId } returns 1
val timetable = TimetableRemote(mockApi).getTimetable(semesterMock,
LocalDate.of(2018, 9, 10),

18
app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
View File

@ -13,19 +13,19 @@ class GradeExtensionTest {
fun calcWeightedAverage() {
val localDate = mock(LocalDate::class.java)
assertEquals(3.47, listOf(
Grade("", "", "", "", 5, 0.33
Grade(1, 1, "", "", 5, 0.33
, "", "", "", "", "",
6, localDate, ""),
Grade("", "", "", "", 5, -0.33
Grade(1, 1, "", "", 5, -0.33
, "", "", "", "", "",
5, localDate, ""),
Grade("", "", "", "", 4, 0.0
Grade(1, 1, "", "", 4, 0.0
, "", "", "", "", "",
1, localDate, ""),
Grade("", "", "", "", 1, 0.5
Grade(1, 1, "", "", 1, 0.5
, "", "", "", "", "",
9, localDate, ""),
Grade("", "", "", "", 0, 0.0
Grade(1, 1, "", "", 0, 0.0
, "", "", "", "", "",
0, localDate, "")
).calcAverage(), 0.005)
@ -34,10 +34,10 @@ class GradeExtensionTest {
@Test
fun calcSummaryAverage() {
assertEquals(2.5, listOf(
GradeSummary("", "", "", "", "5"),
GradeSummary("", "", "", "", "-5"),
GradeSummary("", "", "", "", "test"),
GradeSummary("", "", "", "", "0")
GradeSummary(1, 1, "", "", "5"),
GradeSummary(1, 1, "", "", "-5"),
GradeSummary(1, 1, "", "", "test"),
GradeSummary(1, 1, "", "", "0")
).calcAverage(), 0.005)
}
}