Skip to content

Commit a436731

Browse files
mbouilloudmbouilloud
authored
Merge pull request #316 from LesGolems/code-cleaning-2
Code cleaning 2
2 parents e589ca6 + b7fc17e commit a436731

233 files changed

Lines changed: 867 additions & 1336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/auth/FakeConnectedUser.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.sdp.ratemyepfl.backend.auth
22

3-
import com.github.sdp.ratemyepfl.backend.auth.ConnectedUser
43
import com.github.sdp.ratemyepfl.model.user.User
54
import javax.inject.Inject
65

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/QueryTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import dagger.hilt.android.testing.HiltAndroidRule
1212
import dagger.hilt.android.testing.HiltAndroidTest
1313
import kotlinx.coroutines.ExperimentalCoroutinesApi
1414
import kotlinx.coroutines.flow.collect
15-
import kotlinx.coroutines.tasks.await
1615
import kotlinx.coroutines.test.runTest
1716
import org.junit.Assert.assertEquals
1817
import org.junit.Before

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeCommentRepository.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.sdp.ratemyepfl.backend.database.fakes
22

33
import com.github.sdp.ratemyepfl.backend.database.post.CommentRepository
4-
import com.github.sdp.ratemyepfl.model.review.Comment
4+
import com.github.sdp.ratemyepfl.model.post.Comment
55
import com.github.sdp.ratemyepfl.model.time.DateTime
66
import kotlinx.coroutines.flow.Flow
77
import kotlinx.coroutines.flow.flow
@@ -12,7 +12,7 @@ class FakeCommentRepository @Inject constructor() : CommentRepository, FakeRepos
1212

1313
companion object {
1414
private val COMMENT_LIST = listOf(
15-
Comment("","id1", "comment1", DateTime.now(), "12345"),
15+
Comment("", "id1", "comment1", DateTime.now(), "12345"),
1616
Comment("", "id2", "comment2", DateTime.now()),
1717
Comment("", "id3", "comment3", DateTime.now()),
1818
)
@@ -23,7 +23,7 @@ class FakeCommentRepository @Inject constructor() : CommentRepository, FakeRepos
2323
}
2424

2525

26-
override fun getBySubjectId(id: String): Flow<List<Comment>> = flow {
26+
override fun getBySubjectId(id: String): Flow<List<Comment>> = flow {
2727
emit(elements.toList())
2828
}
2929

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeEventRepository.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import com.github.sdp.ratemyepfl.backend.database.LoaderRepository
44
import com.github.sdp.ratemyepfl.backend.database.reviewable.EventRepository
55
import com.github.sdp.ratemyepfl.backend.database.reviewable.ReviewableRepository
66
import com.github.sdp.ratemyepfl.model.items.Event
7-
import com.github.sdp.ratemyepfl.model.review.ReviewRating
7+
import com.github.sdp.ratemyepfl.model.post.ReviewRating
88
import com.github.sdp.ratemyepfl.model.time.Period
9-
import com.google.android.gms.tasks.Task
109
import kotlinx.coroutines.flow.Flow
1110
import javax.inject.Inject
1211

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeGradeInfoRepository.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package com.github.sdp.ratemyepfl.backend.database.fakes
33
import com.github.sdp.ratemyepfl.backend.database.GradeInfoRepository
44
import com.github.sdp.ratemyepfl.model.GradeInfo
55
import com.github.sdp.ratemyepfl.model.items.Reviewable
6-
import com.github.sdp.ratemyepfl.model.review.ReviewRating
7-
import com.google.android.gms.tasks.Task
8-
import org.mockito.Mockito
6+
import com.github.sdp.ratemyepfl.model.post.ReviewRating
97
import javax.inject.Inject
108

119
@Suppress("UNCHECKED_CAST")

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeImageStorage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FakeImageStorage @Inject constructor() : Storage<ImageFile> {
1717
companion object {
1818
val images = HashMap<String, ImageFile>()
1919

20-
val pictureIds = listOf(
20+
private val pictureIds = listOf(
2121
R.raw.room3,
2222
R.raw.room1,
2323
R.raw.room4,

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeReviewRepository.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.github.sdp.ratemyepfl.backend.database.fakes
22

3-
import com.github.sdp.ratemyepfl.backend.database.post.ReviewRepository
43
import com.github.sdp.ratemyepfl.backend.database.firebase.post.ReviewRepositoryImpl.Companion.toReview
5-
import com.github.sdp.ratemyepfl.model.review.Review
6-
import com.github.sdp.ratemyepfl.model.review.ReviewRating
4+
import com.github.sdp.ratemyepfl.backend.database.post.ReviewRepository
5+
import com.github.sdp.ratemyepfl.model.post.Review
6+
import com.github.sdp.ratemyepfl.model.post.ReviewRating
77
import com.github.sdp.ratemyepfl.model.time.DateTime
88
import com.google.firebase.firestore.DocumentSnapshot
99
import kotlinx.coroutines.flow.Flow

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeSubjectRepository.kt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package com.github.sdp.ratemyepfl.backend.database.fakes
22

33
import com.github.sdp.ratemyepfl.backend.database.post.SubjectRepository
4-
import com.github.sdp.ratemyepfl.model.review.Subject
5-
import com.github.sdp.ratemyepfl.model.review.SubjectKind
4+
import com.github.sdp.ratemyepfl.model.post.Subject
5+
import com.github.sdp.ratemyepfl.model.post.SubjectKind
66
import com.github.sdp.ratemyepfl.model.time.DateTime
7-
import com.google.android.gms.tasks.Task
87
import kotlinx.coroutines.flow.Flow
98
import kotlinx.coroutines.flow.flowOf
109
import javax.inject.Inject
1110

1211
class FakeSubjectRepository @Inject constructor() : SubjectRepository, FakeRepository<Subject>() {
1312

1413
companion object {
15-
const val FAKE_UID_1 = "ID1"
16-
const val FAKE_UID_2 = "ID2"
14+
private const val FAKE_UID_1 = "ID1"
15+
private const val FAKE_UID_2 = "ID2"
1716
const val FAKE_UID_3 = "ID3"
1817
const val FAKE_UID_4 = "ID4"
19-
val DATE = DateTime(2000, 1, 1, 0, 0)
18+
private val DATE = DateTime(2000, 1, 1, 0, 0)
2019

2120
val fakeList = listOf(
2221
Subject.Builder()

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/fakes/FakeUserRepository.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import com.github.sdp.ratemyepfl.backend.database.UserRepository
44
import com.github.sdp.ratemyepfl.backend.database.query.QueryResult
55
import com.github.sdp.ratemyepfl.model.items.Class
66
import com.github.sdp.ratemyepfl.model.user.User
7-
import com.google.android.gms.tasks.Task
8-
import com.google.android.gms.tasks.Tasks
97
import kotlinx.coroutines.flow.Flow
108
import kotlinx.coroutines.flow.flow
119
import javax.inject.Inject

‎app/src/androidTest/java/com/github/sdp/ratemyepfl/backend/database/firebase/GradeInfoRepositoryTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.github.sdp.ratemyepfl.backend.database.firebase.reviewable.ClassroomR
44
import com.github.sdp.ratemyepfl.model.GradeInfo
55
import com.github.sdp.ratemyepfl.model.ReviewInfo
66
import com.github.sdp.ratemyepfl.model.items.Classroom
7-
import com.github.sdp.ratemyepfl.model.review.ReviewRating
7+
import com.github.sdp.ratemyepfl.model.post.ReviewRating
88
import dagger.hilt.android.testing.HiltAndroidRule
99
import dagger.hilt.android.testing.HiltAndroidTest
1010
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -35,6 +35,7 @@ class GradeInfoRepositoryTest {
3535

3636
@Inject
3737
lateinit var gradeInfoRepo: GradeInfoRepositoryImpl
38+
3839
@Inject
3940
lateinit var classroomRepo: ClassroomRepositoryImpl
4041

0 commit comments

Comments
 (0)