Skip to content

Commit 77e2680

Browse files
hermannakoshermannakos
authored
[MBL-19334][All] Crash fixes (#3251)
refs: MBL-19334 affects: Student, Teacher, Parent release note: Stability improvements. test plan: The crashes are not really reproducible. These are supposed fixes. Smoke test.
1 parent 600005c commit 77e2680

File tree

42 files changed

+522
-226
lines changed

Some content is hidden

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

42 files changed

+522
-226
lines changed

‎apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentInboxComposeInteractionTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
1313
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
1414
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
1515
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
16+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
1617
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
1718
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
1819
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionDetailsManager
@@ -22,6 +23,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
2223
import com.instructure.canvasapi2.di.GraphQlApiModule
2324
import com.instructure.canvasapi2.managers.CommentLibraryManager
2425
import com.instructure.canvasapi2.managers.InboxSettingsManager
26+
import com.instructure.canvasapi2.managers.PostPolicyManager
2527
import com.instructure.canvasapi2.managers.SubmissionRubricManager
2628
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
2729
import com.instructure.canvasapi2.managers.graphql.SubmissionCommentsManager
@@ -90,6 +92,10 @@ class ParentInboxComposeInteractionTest: InboxComposeInteractionTest() {
9092
@JvmField
9193
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
9294

95+
@BindValue
96+
@JvmField
97+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
98+
9399
@Test
94100
fun testParentComposeDefaultValues() {
95101
val data = initData(canSendToAll = true)

‎apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentInboxSignatureInteractionTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.instructure.canvas.espresso.mockCanvas.MockCanvas
2424
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2525
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2626
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
27+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
2728
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
2829
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
2930
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionDetailsManager
@@ -33,6 +34,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3334
import com.instructure.canvasapi2.di.GraphQlApiModule
3435
import com.instructure.canvasapi2.managers.CommentLibraryManager
3536
import com.instructure.canvasapi2.managers.InboxSettingsManager
37+
import com.instructure.canvasapi2.managers.PostPolicyManager
3638
import com.instructure.canvasapi2.managers.SubmissionRubricManager
3739
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
3840
import com.instructure.canvasapi2.managers.graphql.SubmissionCommentsManager
@@ -86,6 +88,10 @@ class ParentInboxSignatureInteractionTest : InboxSignatureInteractionTest() {
8688
@JvmField
8789
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
8890

91+
@BindValue
92+
@JvmField
93+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
94+
8995
private val dashboardPage = DashboardPage()
9096
private val leftSideNavigationDrawerPage = LeftSideNavigationDrawerPage()
9197

‎apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentInboxComposeInteractionTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
2828
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2929
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
3030
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
31+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
3132
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
3233
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
3334
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionDetailsManager
@@ -37,6 +38,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3738
import com.instructure.canvasapi2.di.GraphQlApiModule
3839
import com.instructure.canvasapi2.managers.CommentLibraryManager
3940
import com.instructure.canvasapi2.managers.InboxSettingsManager
41+
import com.instructure.canvasapi2.managers.PostPolicyManager
4042
import com.instructure.canvasapi2.managers.SubmissionRubricManager
4143
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
4244
import com.instructure.canvasapi2.managers.graphql.SubmissionCommentsManager
@@ -99,6 +101,10 @@ class StudentInboxComposeInteractionTest: InboxComposeInteractionTest() {
99101
@JvmField
100102
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
101103

104+
@BindValue
105+
@JvmField
106+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
107+
102108
override fun goToInboxCompose(data: MockCanvas) {
103109
val parent = data.parents.first()
104110
val token = data.tokenFor(parent)!!

‎apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentInboxSignatureInteractionTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.instructure.canvas.espresso.mockCanvas.MockCanvas
2424
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2525
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2626
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
27+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
2728
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
2829
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
2930
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionDetailsManager
@@ -33,6 +34,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3334
import com.instructure.canvasapi2.di.GraphQlApiModule
3435
import com.instructure.canvasapi2.managers.CommentLibraryManager
3536
import com.instructure.canvasapi2.managers.InboxSettingsManager
37+
import com.instructure.canvasapi2.managers.PostPolicyManager
3638
import com.instructure.canvasapi2.managers.SubmissionRubricManager
3739
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
3840
import com.instructure.canvasapi2.managers.graphql.SubmissionCommentsManager
@@ -85,6 +87,10 @@ class StudentInboxSignatureInteractionTest : InboxSignatureInteractionTest() {
8587
@JvmField
8688
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
8789

90+
@BindValue
91+
@JvmField
92+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
93+
8894
private val leftSideNavigationDrawerPage = LeftSideNavigationDrawerPage()
8995

9096
override val activityRule = StudentActivityTestRule(LoginActivity::class.java)

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/CommentLibraryPageTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment
2929
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
3030
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
3131
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
32+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
3233
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
3334
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
3435
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -39,6 +40,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3940
import com.instructure.canvasapi2.di.GraphQlApiModule
4041
import com.instructure.canvasapi2.managers.CommentLibraryManager
4142
import com.instructure.canvasapi2.managers.InboxSettingsManager
43+
import com.instructure.canvasapi2.managers.PostPolicyManager
4244
import com.instructure.canvasapi2.managers.StudentContextManager
4345
import com.instructure.canvasapi2.managers.SubmissionRubricManager
4446
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -65,6 +67,10 @@ class CommentLibraryPageTest : TeacherComposeTest() {
6567
@JvmField
6668
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
6769

70+
@BindValue
71+
@JvmField
72+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
73+
6874
@BindValue
6975
@JvmField
7076
val inboxSettingsManager: InboxSettingsManager = FakeInboxSettingsManager()

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/PersonContextPageTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.instructure.canvas.espresso.mockCanvas.addSubmissionsForAssignment
2222
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2323
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2424
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
25+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
2526
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
2627
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
2728
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -32,6 +33,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3233
import com.instructure.canvasapi2.di.GraphQlApiModule
3334
import com.instructure.canvasapi2.managers.CommentLibraryManager
3435
import com.instructure.canvasapi2.managers.InboxSettingsManager
36+
import com.instructure.canvasapi2.managers.PostPolicyManager
3537
import com.instructure.canvasapi2.managers.StudentContextManager
3638
import com.instructure.canvasapi2.managers.SubmissionRubricManager
3739
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -64,6 +66,10 @@ class PersonContextPageTest : TeacherTest() {
6466
@JvmField
6567
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
6668

69+
@BindValue
70+
@JvmField
71+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
72+
6773
@BindValue
6874
@JvmField
6975
val inboxSettingsManager: InboxSettingsManager = FakeInboxSettingsManager()

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/SpeedGraderFilesPageTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsMan
2424
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2525
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCustomGradeStatusesManager
2626
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
27+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
2728
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
2829
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
2930
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -35,6 +36,7 @@ import com.instructure.canvasapi2.di.GraphQlApiModule
3536
import com.instructure.canvasapi2.di.graphql.CustomGradeStatusModule
3637
import com.instructure.canvasapi2.managers.CommentLibraryManager
3738
import com.instructure.canvasapi2.managers.InboxSettingsManager
39+
import com.instructure.canvasapi2.managers.PostPolicyManager
3840
import com.instructure.canvasapi2.managers.StudentContextManager
3941
import com.instructure.canvasapi2.managers.SubmissionRubricManager
4042
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -66,6 +68,10 @@ class SpeedGraderFilesPageTest : TeacherComposeTest() {
6668
@JvmField
6769
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
6870

71+
@BindValue
72+
@JvmField
73+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
74+
6975
@BindValue
7076
@JvmField
7177
val inboxSettingsManager: InboxSettingsManager = FakeInboxSettingsManager()

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/SpeedGraderGradePageTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsMan
2727
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2828
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCustomGradeStatusesManager
2929
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
30+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
3031
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
3132
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
3233
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -38,6 +39,7 @@ import com.instructure.canvasapi2.di.GraphQlApiModule
3839
import com.instructure.canvasapi2.di.graphql.CustomGradeStatusModule
3940
import com.instructure.canvasapi2.managers.CommentLibraryManager
4041
import com.instructure.canvasapi2.managers.InboxSettingsManager
42+
import com.instructure.canvasapi2.managers.PostPolicyManager
4143
import com.instructure.canvasapi2.managers.StudentContextManager
4244
import com.instructure.canvasapi2.managers.SubmissionRubricManager
4345
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -75,6 +77,10 @@ class SpeedGraderGradePageTest : TeacherComposeTest() {
7577
@JvmField
7678
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
7779

80+
@BindValue
81+
@JvmField
82+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
83+
7884
@BindValue
7985
@JvmField
8086
val inboxSettingsManager: InboxSettingsManager = FakeInboxSettingsManager()

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/SpeedGraderPageTest.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.instructure.canvas.espresso.mockCanvas.addSubmissionsForAssignment
2323
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2424
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
2525
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
26+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
2627
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
2728
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
2829
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -33,6 +34,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3334
import com.instructure.canvasapi2.di.GraphQlApiModule
3435
import com.instructure.canvasapi2.managers.CommentLibraryManager
3536
import com.instructure.canvasapi2.managers.InboxSettingsManager
37+
import com.instructure.canvasapi2.managers.PostPolicyManager
3638
import com.instructure.canvasapi2.managers.StudentContextManager
3739
import com.instructure.canvasapi2.managers.SubmissionRubricManager
3840
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -62,6 +64,10 @@ class SpeedGraderPageTest : TeacherComposeTest() {
6264
@JvmField
6365
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
6466

67+
@BindValue
68+
@JvmField
69+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
70+
6571
@BindValue
6672
@JvmField
6773
val inboxSettingsManager: InboxSettingsManager = FakeInboxSettingsManager()
@@ -203,8 +209,8 @@ class SpeedGraderPageTest : TeacherComposeTest() {
203209
assignmentId = assignment.id,
204210
userId = student.id,
205211
types = submissionTypesRaw,
206-
body = if(submissionTypesRaw.contains(Assignment.SubmissionType.ONLINE_URL.apiString)) null else "AssignmentBody $index",
207-
url = if(submissionTypesRaw.contains(Assignment.SubmissionType.ONLINE_URL.apiString)) "www.google.com" else null
212+
body = if(submissionTypesRaw.contains(ONLINE_URL.apiString)) null else "AssignmentBody $index",
213+
url = if(submissionTypesRaw.contains(ONLINE_URL.apiString)) "www.google.com" else null
208214
)
209215
}
210216
}

‎apps/teacher/src/androidTest/java/com/instructure/teacher/ui/TeacherInboxComposeInteractionTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
2828
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeAssignmentDetailsManager
2929
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeCommentLibraryManager
3030
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeInboxSettingsManager
31+
import com.instructure.canvas.espresso.mockCanvas.fakes.FakePostPolicyManager
3132
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeStudentContextManager
3233
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionCommentsManager
3334
import com.instructure.canvas.espresso.mockCanvas.fakes.FakeSubmissionContentManager
@@ -38,6 +39,7 @@ import com.instructure.canvas.espresso.mockCanvas.init
3839
import com.instructure.canvasapi2.di.GraphQlApiModule
3940
import com.instructure.canvasapi2.managers.CommentLibraryManager
4041
import com.instructure.canvasapi2.managers.InboxSettingsManager
42+
import com.instructure.canvasapi2.managers.PostPolicyManager
4143
import com.instructure.canvasapi2.managers.StudentContextManager
4244
import com.instructure.canvasapi2.managers.SubmissionRubricManager
4345
import com.instructure.canvasapi2.managers.graphql.AssignmentDetailsManager
@@ -76,6 +78,10 @@ class TeacherInboxComposeInteractionTest: InboxComposeInteractionTest() {
7678
@JvmField
7779
val commentLibraryManager: CommentLibraryManager = FakeCommentLibraryManager()
7880

81+
@BindValue
82+
@JvmField
83+
val postPolicyManager: PostPolicyManager = FakePostPolicyManager()
84+
7985
@BindValue
8086
@JvmField
8187
val personContextManager: StudentContextManager = FakeStudentContextManager()

0 commit comments

Comments
 (0)