diff --git a/android-vault b/android-vault index ddd561a8ef..15225ede6c 160000 --- a/android-vault +++ b/android-vault @@ -1 +1 @@ -Subproject commit ddd561a8ef8289f2ed248925679827b2da5ab016 +Subproject commit 15225ede6c44da8265e5cdaea34d49dbc47cb8f5 diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle index 823d43f00f..5fd86f30e5 100644 --- a/apps/flutter_parent/android/app/build.gradle +++ b/apps/flutter_parent/android/app/build.gradle @@ -104,7 +104,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation "com.squareup.okhttp3:okhttp:4.9.1" implementation 'org.jsoup:jsoup:1.11.3' implementation 'com.google.gms:google-services:4.3.14' diff --git a/apps/flutter_parent/android/app/src/main/AndroidManifest.xml b/apps/flutter_parent/android/app/src/main/AndroidManifest.xml index 7968bc38fe..92cc44acbe 100644 --- a/apps/flutter_parent/android/app/src/main/AndroidManifest.xml +++ b/apps/flutter_parent/android/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ - + diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart index 53eda6d918..86768767b3 100644 --- a/apps/flutter_parent/lib/l10n/app_localizations.dart +++ b/apps/flutter_parent/lib/l10n/app_localizations.dart @@ -989,11 +989,18 @@ class AppLocalizations { desc: 'Screen reader-friendly replacement for the "-" character in letter grades like "A-"', ); - String latePenalty(String pointsLost) => Intl.message( - 'Late penalty (-$pointsLost)', + String yourGrade(String pointsAchieved) => Intl.message( + 'Your grade: $pointsAchieved', + desc: 'Text displayed when a late penalty has been applied to the assignment, this is the achieved score without the penalty', + args: [pointsAchieved], + name: 'yourGrade', + ); + + String latePenaltyUpdated(String pointsLost) => Intl.message( + 'Late Penalty: -$pointsLost pts', desc: 'Text displayed when a late penalty has been applied to the assignment', args: [pointsLost], - name: 'latePenalty', + name: 'latePenaltyUpdated', ); String finalGrade(String grade) => Intl.message( diff --git a/apps/flutter_parent/lib/l10n/res/intl_id.arb b/apps/flutter_parent/lib/l10n/res/intl_id.arb index 8d63ed0338..5975fdcc49 100644 --- a/apps/flutter_parent/lib/l10n/res/intl_id.arb +++ b/apps/flutter_parent/lib/l10n/res/intl_id.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2022-10-28T11:03:07.232972", + "@@last_modified": "2023-08-25T11:04:20.901151", "alertsLabel": "Peringatan", "@alertsLabel": { "description": "The label for the Alerts tab", @@ -182,6 +182,19 @@ "points": {} } }, + "calendarDaySemanticsLabel": "{eventCount,plural, =1{{date}, {eventCount} acara}other{{date}, {eventCount} acara}}", + "@calendarDaySemanticsLabel": { + "description": "Screen reader label used for calendar day, reads the date and count of events", + "type": "text", + "placeholders_order": [ + "date", + "eventCount" + ], + "placeholders": { + "date": {}, + "eventCount": {} + } + }, "No Events Today!": "Tidak Ada Acara Hari Ini!", "@No Events Today!": { "description": "Title displayed when there are no calendar events for the current day", @@ -2666,5 +2679,75 @@ "type": "text", "placeholders_order": [], "placeholders": {} + }, + "Acceptable Use Policy": "Kebijakan Penggunaan yang Dapat Diterima", + "@Acceptable Use Policy": { + "description": "title for the acceptable use policy screen", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Submit": "Serahkan", + "@Submit": { + "description": "submit button title for acceptable use policy screen", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": "Anda pengguna baru atau Kebijakan Penggunaan yang Dapat Diterima telah berubah sejak Anda terakhir kali menyetujuinya. Silakan setujui Kebijakan Penggunaan yang Dapat Diterima sebelum Anda melanjutkan.", + "@Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": { + "description": "acceptable use policy screen description", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "I agree to the Acceptable Use Policy.": "Saya menyetujui Kebijakan Penggunaan yang Dapat Diterima.", + "@I agree to the Acceptable Use Policy.": { + "description": "acceptable use policy switch title", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "About": "Tentang", + "@About": { + "description": "Title for about menu item in settings", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "App": "App", + "@App": { + "description": "Title for App field on about page", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Login ID": "ID Login", + "@Login ID": { + "description": "Title for Login ID field on about page", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Email": "Email", + "@Email": { + "description": "Title for Email field on about page", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Version": "Versi", + "@Version": { + "description": "Title for Version field on about page", + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "Instructure logo": "Logo Instructure", + "@Instructure logo": { + "description": "Semantics label for the Instructure logo on the about page", + "type": "text", + "placeholders_order": [], + "placeholders": {} } } \ No newline at end of file diff --git a/apps/flutter_parent/lib/l10n/res/intl_ja.arb b/apps/flutter_parent/lib/l10n/res/intl_ja.arb index 4a6e294d49..cf1ca754a3 100644 --- a/apps/flutter_parent/lib/l10n/res/intl_ja.arb +++ b/apps/flutter_parent/lib/l10n/res/intl_ja.arb @@ -171,7 +171,7 @@ "placeholders_order": [], "placeholders": {} }, - "pointsPossible": "{points}の可能なポイント", + "pointsPossible": "配点 {points}", "@pointsPossible": { "description": "Screen reader label used for the points possible for an assignment, quiz, etc.", "type": "text", diff --git a/apps/flutter_parent/lib/models/assignment.dart b/apps/flutter_parent/lib/models/assignment.dart index 6175b081eb..3947713bdf 100644 --- a/apps/flutter_parent/lib/models/assignment.dart +++ b/apps/flutter_parent/lib/models/assignment.dart @@ -145,7 +145,7 @@ abstract class Assignment implements Built { SubmissionStatus getStatus({required String? studentId}) { final submission = this.submission(studentId); - if (!isSubmittable()) { + if (!isSubmittable() && submission == null) { return SubmissionStatus.NONE; } else if (submission?.isLate == true) { return SubmissionStatus.LATE; diff --git a/apps/flutter_parent/lib/models/grade_cell_data.dart b/apps/flutter_parent/lib/models/grade_cell_data.dart index 642c29700e..f30b60241f 100644 --- a/apps/flutter_parent/lib/models/grade_cell_data.dart +++ b/apps/flutter_parent/lib/models/grade_cell_data.dart @@ -40,6 +40,7 @@ abstract class GradeCellData implements Built 0.0) { grade = ''; // Grade will be shown in the 'final grade' text var pointsDeducted = NumberFormat.decimalPattern().format(submission.pointsDeducted ?? 0.0); - latePenalty = l10n.latePenalty(pointsDeducted); + var pointsAchieved = NumberFormat.decimalPattern().format(submission.enteredScore); + yourGrade = l10n.yourGrade(pointsAchieved); + latePenalty = l10n.latePenaltyUpdated(pointsDeducted); finalGrade = l10n.finalGrade(submission.grade ?? grade); } @@ -166,6 +171,7 @@ abstract class GradeCellData implements Built _$this._outOf; set outOf(String? outOf) => _$this._outOf = outOf; + String? _yourGrade; + String? get yourGrade => _$this._yourGrade; + set yourGrade(String? yourGrade) => _$this._yourGrade = yourGrade; + String? _latePenalty; String? get latePenalty => _$this._latePenalty; set latePenalty(String? latePenalty) => _$this._latePenalty = latePenalty; @@ -221,6 +233,7 @@ class GradeCellDataBuilder _grade = $v.grade; _gradeContentDescription = $v.gradeContentDescription; _outOf = $v.outOf; + _yourGrade = $v.yourGrade; _latePenalty = $v.latePenalty; _finalGrade = $v.finalGrade; _$v = null; @@ -264,6 +277,7 @@ class GradeCellDataBuilder grade: BuiltValueNullFieldError.checkNotNull(grade, r'GradeCellData', 'grade'), gradeContentDescription: BuiltValueNullFieldError.checkNotNull(gradeContentDescription, r'GradeCellData', 'gradeContentDescription'), outOf: BuiltValueNullFieldError.checkNotNull(outOf, r'GradeCellData', 'outOf'), + yourGrade: BuiltValueNullFieldError.checkNotNull(yourGrade, r'GradeCellData', 'yourGrade'), latePenalty: BuiltValueNullFieldError.checkNotNull(latePenalty, r'GradeCellData', 'latePenalty'), finalGrade: BuiltValueNullFieldError.checkNotNull(finalGrade, r'GradeCellData', 'finalGrade')); replace(_$result); diff --git a/apps/flutter_parent/lib/screens/account_creation/account_creation_interactor.dart b/apps/flutter_parent/lib/screens/account_creation/account_creation_interactor.dart index 584172d22a..e042eeba79 100644 --- a/apps/flutter_parent/lib/screens/account_creation/account_creation_interactor.dart +++ b/apps/flutter_parent/lib/screens/account_creation/account_creation_interactor.dart @@ -35,6 +35,6 @@ class AccountCreationInteractor { } launchPrivacyPolicy() { - locator().launch('https://www.instructure.com/canvas/privacy'); + locator().launch('https://www.instructure.com/policies/product-privacy-policy'); } } diff --git a/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart b/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart index 9043221d75..2814bad688 100644 --- a/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart +++ b/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart @@ -142,7 +142,8 @@ class _AssignmentDetailsScreenState extends State { final assignment = snapshot.data!.assignment!; final submission = assignment.submission(_currentStudent?.id); final fullyLocked = assignment.isFullyLocked; - final showStatus = assignment.isSubmittable() || submission?.isGraded() == true; + final missing = submission?.missing == true; + final showStatus = missing || assignment.isSubmittable() || submission?.isGraded() == true; final submitted = submission?.submittedAt != null; final submittedColor = submitted ? ParentTheme.of(context)?.successColor : textTheme.bodySmall?.color; @@ -172,9 +173,9 @@ class _AssignmentDetailsScreenState extends State { if (showStatus) SizedBox(width: 8), if (showStatus) Text( - !submitted - ? l10n.assignmentNotSubmittedLabel - : submission?.isGraded() == true ? l10n.assignmentGradedLabel : l10n.assignmentSubmittedLabel, + missing ? l10n.assignmentMissingSubmittedLabel : + !submitted ? l10n.assignmentNotSubmittedLabel : + submission?.isGraded() == true ? l10n.assignmentGradedLabel : l10n.assignmentSubmittedLabel, style: textTheme.bodySmall?.copyWith( color: submittedColor, ), diff --git a/apps/flutter_parent/lib/screens/assignments/grade_cell.dart b/apps/flutter_parent/lib/screens/assignments/grade_cell.dart index 9d8bb559bf..d8bac77e11 100644 --- a/apps/flutter_parent/lib/screens/assignments/grade_cell.dart +++ b/apps/flutter_parent/lib/screens/assignments/grade_cell.dart @@ -18,6 +18,7 @@ import 'package:flutter_parent/models/assignment.dart'; import 'package:flutter_parent/models/course.dart'; import 'package:flutter_parent/models/grade_cell_data.dart'; import 'package:flutter_parent/models/submission.dart'; +import 'package:flutter_parent/utils/design/parent_colors.dart'; import 'package:flutter_parent/utils/design/parent_theme.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; @@ -134,37 +135,49 @@ class GradeCell extends StatelessWidget { ], ), if (!_isGradedRestrictQuantitativeData) SizedBox(width: 16), - if (!_isGradedRestrictQuantitativeData) Expanded( - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (data.grade.isNotEmpty) - Text( - data.grade, - key: Key('grade-cell-grade'), - style: Theme.of(context).textTheme.headlineMedium, - semanticsLabel: data.gradeContentDescription, - ), - if (data.outOf.isNotEmpty) Text(data.outOf, key: Key('grade-cell-out-of')), - if (data.latePenalty.isNotEmpty) - Text( - data.latePenalty, - style: TextStyle(color: data.accentColor), - key: Key('grade-cell-late-penalty'), - ), - if (data.finalGrade.isNotEmpty) - Padding( - padding: const EdgeInsets.only(top: 8), - child: Text( - data.finalGrade, - key: Key('grade-cell-final-grade'), - style: Theme.of(context).textTheme.titleMedium, + if (!_isGradedRestrictQuantitativeData) + Expanded( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (data.grade.isNotEmpty) + Text( + data.grade, + key: Key('grade-cell-grade'), + style: Theme.of(context).textTheme.headlineMedium, + semanticsLabel: data.gradeContentDescription, + ), + if (data.outOf.isNotEmpty) Text(data.outOf, key: Key('grade-cell-out-of')), + if (data.yourGrade.isNotEmpty) + Padding( + padding: const EdgeInsets.only(top: 4), + child: Text( + data.yourGrade, + key: Key('grade-cell-your-grade'), + ), + ), + if (data.latePenalty.isNotEmpty) + Padding( + padding: const EdgeInsets.only(top: 4), + child: Text( + data.latePenalty, + style: TextStyle(color: ParentColors.failure), + key: Key('grade-cell-late-penalty'), + ), + ), + if (data.finalGrade.isNotEmpty) + Padding( + padding: const EdgeInsets.only(top: 4), + child: Text( + data.finalGrade, + key: Key('grade-cell-final-grade'), + style: Theme.of(context).textTheme.titleMedium, + ), ), - ), - ], + ], + ), ), - ), ], ); } diff --git a/apps/flutter_parent/lib/screens/courses/courses_screen.dart b/apps/flutter_parent/lib/screens/courses/courses_screen.dart index c3484287c7..36ab053186 100644 --- a/apps/flutter_parent/lib/screens/courses/courses_screen.dart +++ b/apps/flutter_parent/lib/screens/courses/courses_screen.dart @@ -130,11 +130,14 @@ class _CoursesScreenState extends State { // If there is no current grade, return 'No grade' // Otherwise, we have a grade, so check if we have the actual grade string // or a score + var formattedScore = (grade.currentScore() != null && !(course.settings?.restrictQuantitativeData ?? false)) + ? format.format(grade.currentScore()! / 100) + : ''; var text = grade.noCurrentGrade() ? L10n(context).noGrade : grade.currentGrade()?.isNotEmpty == true - ? grade.currentGrade()! - : format.format(grade.currentScore()! / 100); + ? "${grade.currentGrade()}${formattedScore.isNotEmpty ? ' $formattedScore' : ''}" + : formattedScore; return Text( text, diff --git a/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart b/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart index 97e7c9222e..4163980c2a 100644 --- a/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart +++ b/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart @@ -255,22 +255,25 @@ class _CourseGradeHeader extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(L10n(context).courseTotalGradeLabel, style: textTheme.bodyMedium), - Text(_courseGrade(context, grade), style: textTheme.bodyMedium, key: Key("total_grade")), + Text(_courseGrade(context, grade, model.courseSettings?.restrictQuantitativeData ?? false), style: textTheme.bodyMedium, key: Key("total_grade")), ], ), ); } - String _courseGrade(BuildContext context, CourseGrade grade) { + String _courseGrade(BuildContext context, CourseGrade grade, bool restrictQuantitativeData) { final format = NumberFormat.percentPattern(); format.maximumFractionDigits = 2; if (grade.noCurrentGrade()) { return L10n(context).noGrade; } else { + var formattedScore = (grade.currentScore() != null && restrictQuantitativeData == false) + ? format.format(grade.currentScore()! / 100) + : ''; return grade.currentGrade()?.isNotEmpty == true - ? grade.currentGrade()! - : format.format(grade.currentScore()! / 100); // format multiplies by 100 for percentages + ? "${grade.currentGrade()}${formattedScore.isNotEmpty ? ' $formattedScore' : ''}" + : formattedScore; } } } @@ -375,7 +378,7 @@ class _AssignmentRow extends StatelessWidget { final submission = assignment.submission(studentId); - final restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?? false; + final restrictQuantitativeData = course.settings?.restrictQuantitativeData ?? false; if (submission?.excused ?? false) { text = restrictQuantitativeData diff --git a/apps/flutter_parent/lib/screens/settings/legal_screen.dart b/apps/flutter_parent/lib/screens/settings/legal_screen.dart index c6b56ff3cd..90323f5401 100644 --- a/apps/flutter_parent/lib/screens/settings/legal_screen.dart +++ b/apps/flutter_parent/lib/screens/settings/legal_screen.dart @@ -34,7 +34,7 @@ class LegalScreen extends StatelessWidget { children: [ _LegalRow( label: l10n.privacyPolicy, - onTap: () => locator().launch('https://www.instructure.com/canvas/privacy'), + onTap: () => locator().launch('https://www.instructure.com/policies/product-privacy-policy'), icon: CanvasIcons.admin, ), _LegalRow( diff --git a/apps/flutter_parent/lib/utils/alert_helper.dart b/apps/flutter_parent/lib/utils/alert_helper.dart index c4403e4b95..236a005483 100644 --- a/apps/flutter_parent/lib/utils/alert_helper.dart +++ b/apps/flutter_parent/lib/utils/alert_helper.dart @@ -27,7 +27,7 @@ class AlertsHelper { filteredList.add(element); } else { Course? course = await locator().getCourse(courseId, forceRefresh: false); - if (course?.settings?.restrictQuantitativeData == false) { + if (!(course?.settings?.restrictQuantitativeData ?? false)) { filteredList.add(element); } } diff --git a/apps/flutter_parent/pubspec.yaml b/apps/flutter_parent/pubspec.yaml index 013bf5be43..0c370d64e5 100644 --- a/apps/flutter_parent/pubspec.yaml +++ b/apps/flutter_parent/pubspec.yaml @@ -25,7 +25,7 @@ description: Canvas Parent # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.9.1+49 +version: 3.10.0+50 module: androidX: true diff --git a/apps/flutter_parent/test/screens/account_creation/account_creation_interactor_test.dart b/apps/flutter_parent/test/screens/account_creation/account_creation_interactor_test.dart index 600529acca..0569a4a601 100644 --- a/apps/flutter_parent/test/screens/account_creation/account_creation_interactor_test.dart +++ b/apps/flutter_parent/test/screens/account_creation/account_creation_interactor_test.dart @@ -57,7 +57,7 @@ void main() { test('launchPrivacyPolicy calls the url launcher', () { AccountCreationInteractor().launchPrivacyPolicy(); verify( - launcher.launch('https://www.instructure.com/canvas/privacy'), + launcher.launch('https://www.instructure.com/policies/product-privacy-policy'), ).called(1); }); } diff --git a/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart b/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart index 134975c7df..2fe2782299 100644 --- a/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart +++ b/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart @@ -250,10 +250,11 @@ void main() { ..grade = '79' ..score = 79.0); var expected = baseGradedState.rebuild((b) => b - ..graphPercent = 0.85 - ..score = '85' + ..graphPercent = 0.79 + ..score = '79' ..showPointsLabel = true - ..latePenalty = 'Late penalty (-6)' + ..yourGrade = 'Your grade: 85' + ..latePenalty = 'Late Penalty: -6 pts' ..finalGrade = 'Final Grade: 79'); var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n); expect(actual, expected); diff --git a/apps/flutter_parent/test/screens/assignments/grade_cell_widget_test.dart b/apps/flutter_parent/test/screens/assignments/grade_cell_widget_test.dart index 37bd688ec3..3cc7c10885 100644 --- a/apps/flutter_parent/test/screens/assignments/grade_cell_widget_test.dart +++ b/apps/flutter_parent/test/screens/assignments/grade_cell_widget_test.dart @@ -16,6 +16,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_parent/l10n/app_localizations.dart'; import 'package:flutter_parent/models/grade_cell_data.dart'; import 'package:flutter_parent/screens/assignments/grade_cell.dart'; +import 'package:flutter_parent/utils/design/parent_colors.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; @@ -158,11 +159,13 @@ void main() { GradeCellData data = GradeCellData((b) => b ..state = GradeCellState.graded ..accentColor = Colors.pinkAccent - ..latePenalty = 'Late penalty: (-25)'); + ..yourGrade = 'Your grade: 85' + ..latePenalty = 'Late penalty: -25'); await setupWithData(tester, data); expect(find.byKey(Key('grade-cell-late-penalty')).evaluate(), find.text(data.latePenalty).evaluate()); - expect(tester.widget(find.byKey(Key('grade-cell-late-penalty'))).style!.color, data.accentColor); + expect(find.byKey(Key('grade-cell-your-grade')).evaluate(), find.text(data.yourGrade).evaluate()); + expect(tester.widget(find.byKey(Key('grade-cell-late-penalty'))).style!.color, ParentColors.failure); }); testWidgetsWithAccessibilityChecks('Displays final grade text', (tester) async { diff --git a/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart b/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart index 7ef1f02a8a..9ece106217 100644 --- a/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart +++ b/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart @@ -427,6 +427,30 @@ void main() { expect(find.text(grade), findsOneWidget); }); + testWidgetsWithAccessibilityChecks('from current grade and score', (tester) async { + final grade = 'Big fat F'; + final score = 15.15; + final groups = [ + _mockAssignmentGroup(assignments: [_mockAssignment()]) + ]; + final enrollment = Enrollment((b) => b + ..enrollmentState = 'active' + ..grades = _mockGrade(currentScore: score, currentGrade: grade)); + final model = CourseDetailsModel(_student, _courseId); + model.course = _mockCourse(); + when(interactor.loadAssignmentGroups(_courseId, _studentId, null)).thenAnswer((_) async => groups); + when(interactor.loadGradingPeriods(_courseId)).thenAnswer((_) async => + GradingPeriodResponse((b) => b..gradingPeriods = BuiltList.of([]).toBuilder())); + when(interactor.loadEnrollmentsForGradingPeriod(_courseId, _studentId, null)) + .thenAnswer((_) async => [enrollment]); + + await tester.pumpWidget(_testableWidget(model)); + await tester.pump(); // Build the widget + await tester.pump(); // Let the future finish + + expect(find.text("$grade $score%"), findsOneWidget); + }); + testWidgetsWithAccessibilityChecks('is not shown when locked', (tester) async { final groups = [ _mockAssignmentGroup(assignments: [_mockAssignment()]) @@ -497,6 +521,31 @@ void main() { expect(find.text(grade), findsOneWidget); }); + testWidgetsWithAccessibilityChecks('only grade is shown when restricted', (tester) async { + final grade = 'Big fat F'; + final score = 15.15; + final groups = [ + _mockAssignmentGroup(assignments: [_mockAssignment()]) + ]; + final enrollment = Enrollment((b) => b + ..enrollmentState = 'active' + ..grades = _mockGrade(currentScore: score, currentGrade: grade)); + final model = CourseDetailsModel(_student, _courseId); + model.course = _mockCourse(); + model.courseSettings = CourseSettings((b) => b..restrictQuantitativeData = true); + when(interactor.loadAssignmentGroups(_courseId, _studentId, null)).thenAnswer((_) async => groups); + when(interactor.loadGradingPeriods(_courseId)) + .thenAnswer((_) async => GradingPeriodResponse((b) => b..gradingPeriods = BuiltList.of([]).toBuilder())); + when(interactor.loadEnrollmentsForGradingPeriod(_courseId, _studentId, null)).thenAnswer((_) async => [enrollment]); + + await tester.pumpWidget(_testableWidget(model)); + await tester.pump(); // Build the widget + await tester.pump(); // Let the future finish + + // Verify that we are showing the course grade when restricted + expect(find.text(grade), findsOneWidget); + }); + testWidgetsWithAccessibilityChecks('is shown when looking at a grading period', (tester) async { final groups = [ _mockAssignmentGroup(assignments: [_mockAssignment()]) @@ -780,7 +829,7 @@ Course _mockCourse() { GradeBuilder _mockGrade({double? currentScore, double? finalScore, String? currentGrade, String? finalGrade}) { return GradeBuilder() ..htmlUrl = '' - ..currentScore = currentScore ?? 0 + ..currentScore = currentScore ..finalScore = finalScore ?? 0 ..currentGrade = currentGrade ?? '' ..finalGrade = finalGrade ?? ''; diff --git a/apps/flutter_parent/test/screens/courses/courses_screen_test.dart b/apps/flutter_parent/test/screens/courses/courses_screen_test.dart index 864d68f7de..6dde78c2a0 100644 --- a/apps/flutter_parent/test/screens/courses/courses_screen_test.dart +++ b/apps/flutter_parent/test/screens/courses/courses_screen_test.dart @@ -41,7 +41,6 @@ import 'package:provider/provider.dart'; import '../../utils/accessibility_utils.dart'; import '../../utils/platform_config.dart'; import '../../utils/test_app.dart'; -import '../../utils/test_helpers/mock_helpers.dart'; import '../../utils/test_helpers/mock_helpers.mocks.dart'; void main() { @@ -174,6 +173,48 @@ void main() { expect(gradeWidget, findsNWidgets(courses.length)); }); + testWidgetsWithAccessibilityChecks('shows grade and score if there is a current grade and score', (tester) async { + var student = _mockStudent('1'); + var courses = List.generate( + 1, + (idx) => _mockCourse( + idx.toString(), + enrollments: ListBuilder( + [_mockEnrollment(idx.toString(), userId: student.id, computedCurrentGrade: 'A', computedCurrentScore: 75)], + ), + ), + ); + + _setupLocator(_MockedCoursesInteractor(courses: courses)); + + await tester.pumpWidget(_testableMaterialWidget()); + await tester.pumpAndSettle(); + + final gradeWidget = find.text('A 75%'); + expect(gradeWidget, findsNWidgets(courses.length)); + }); + + testWidgetsWithAccessibilityChecks('shows grade only if there is a current grade and score and restricted', (tester) async { + var student = _mockStudent('1'); + var courses = List.generate( + 1, + (idx) => _mockCourse( + idx.toString(), + enrollments: ListBuilder( + [_mockEnrollment(idx.toString(), userId: student.id, computedCurrentGrade: 'A', computedCurrentScore: 75)], + ), + ).rebuild((b) => b..settings = (b.settings..restrictQuantitativeData = true)), + ); + + _setupLocator(_MockedCoursesInteractor(courses: courses)); + + await tester.pumpWidget(_testableMaterialWidget()); + await tester.pumpAndSettle(); + + final gradeWidget = find.text('A'); + expect(gradeWidget, findsNWidgets(courses.length)); + }); + testWidgetsWithAccessibilityChecks('shows score if there is a grade but no grade string', (tester) async { var student = _mockStudent('1'); var courses = List.generate( diff --git a/apps/flutter_parent/test/screens/settings/legal_screen_test.dart b/apps/flutter_parent/test/screens/settings/legal_screen_test.dart index 6055ed0335..bd6ce8d482 100644 --- a/apps/flutter_parent/test/screens/settings/legal_screen_test.dart +++ b/apps/flutter_parent/test/screens/settings/legal_screen_test.dart @@ -47,7 +47,7 @@ void main() { await tester.tap(find.text(l10n.privacyPolicy)); await tester.pumpAndSettle(); - verify(mockLauncher.launch('https://www.instructure.com/canvas/privacy')).called(1); + verify(mockLauncher.launch('https://www.instructure.com/policies/product-privacy-policy')).called(1); }); testWidgetsWithAccessibilityChecks('tapping github launches url', (tester) async { diff --git a/apps/settings.gradle b/apps/settings.gradle index 011f248a08..8486e179b4 100644 --- a/apps/settings.gradle +++ b/apps/settings.gradle @@ -1,7 +1,20 @@ +pluginManagement { + buildscript { + repositories { + mavenCentral() + maven { + url = uri("https://storage.googleapis.com/r8-releases/raw") + } + } + dependencies { + classpath("com.android.tools:r8:8.2.47") + } + } +} + /* Top-level project modules */ include ':student' include ':teacher' - /* Flutter embed modules */ setBinding(new Binding([gradle: this])) @@ -22,8 +35,6 @@ include ':pandautils' include ':rceditor' include ':recyclerview' include ':pandares' -include ':panda_annotations' -include ':panda_processor' include ':DocumentScanner' project(':annotations').projectDir = new File(rootProject.projectDir, '/../libs/annotations') @@ -38,6 +49,4 @@ project(':pandautils').projectDir = new File(rootProject.projectDir, '/../libs/p project(':rceditor').projectDir = new File(rootProject.projectDir, '/../libs/rceditor') project(':recyclerview').projectDir = new File(rootProject.projectDir, '/../libs/recyclerview') project(':pandares').projectDir = new File(rootProject.projectDir, '/../libs/pandares') -project(':panda_annotations').projectDir = new File(rootProject.projectDir, '/../libs/panda_annotations') -project(':panda_processor').projectDir = new File(rootProject.projectDir, '/../libs/panda_processor') -project(':DocumentScanner').projectDir = new File(rootProject.projectDir, '/../libs/DocumentScanner') +project(':DocumentScanner').projectDir = new File(rootProject.projectDir, '/../libs/DocumentScanner') \ No newline at end of file diff --git a/apps/student/build.gradle b/apps/student/build.gradle index eb671160b8..815299e864 100644 --- a/apps/student/build.gradle +++ b/apps/student/build.gradle @@ -50,8 +50,8 @@ android { applicationId "com.instructure.candroid" minSdkVersion Versions.MIN_SDK targetSdkVersion Versions.TARGET_SDK - versionCode = 255 - versionName = '6.26.1' + versionCode = 260 + versionName = '7.2.0' vectorDrawables.useSupportLibrary = true multiDexEnabled = true @@ -128,6 +128,14 @@ android { } } + debugMinify { + initWith debug + debuggable false + minifyEnabled true + shrinkResources true + matchingFallbacks = ['debug'] + } + release { signingConfig signingConfigs.release debuggable false @@ -240,12 +248,11 @@ android { hilt { enableTransformForLocalTests = true enableAggregatingTask = false + enableExperimentalClasspathAggregation = true } } dependencies { - implementation project(path: ':panda_annotations') - kaptAndroidTestQa project(path: ':panda_processor') implementation fileTree(dir: 'libs', include: ['*.jar']) @@ -320,7 +327,8 @@ dependencies { implementation Libs.SQLDELIGHT /* Qr Code */ - implementation Libs.JOURNEY_ZXING + implementation (Libs.JOURNEY_ZXING) { transitive = false } + implementation Libs.JOURNEY_ZXING_CORE /* AAC */ implementation Libs.VIEW_MODEL @@ -349,6 +357,10 @@ dependencies { implementation Libs.ROOM kapt Libs.ROOM_COMPILER implementation Libs.ROOM_COROUTINES + + testImplementation Libs.HAMCREST + + androidTestImplementation Libs.COMPOSE_UI_TEST } // Comment out this line if the reporting logic starts going wonky. diff --git a/apps/student/flank.yml b/apps/student/flank.yml index e6a449008d..45f1d8bccf 100644 --- a/apps/student/flank.yml +++ b/apps/student/flank.yml @@ -1,8 +1,8 @@ gcloud: project: delta-essence-114723 # Use the next two lines to run locally -# app: ./build/outputs/apk/qa/debug/student-qa-debug.apk -# test: ./build/outputs/apk/androidTest/qa/debug/student-qa-debug-androidTest.apk +# app: ./build/intermediates/apk/qa/debug/student-qa-debug.apk +# test: ./build/intermediates/apk/androidTest/qa/debug/student-qa-debug-androidTest.apk app: ./apps/student/build/outputs/apk/qa/debug/student-qa-debug.apk test: ./apps/student/build/outputs/apk/androidTest/qa/debug/student-qa-debug-androidTest.apk results-bucket: android-student diff --git a/apps/student/flank_coverage.yml b/apps/student/flank_coverage.yml index 67858de14e..3af12c3e0b 100644 --- a/apps/student/flank_coverage.yml +++ b/apps/student/flank_coverage.yml @@ -19,10 +19,10 @@ gcloud: directories-to-pull: - /sdcard/ test-targets: - - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub + - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.OfflineE2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubCoverage device: - - model: NexusLowRes - version: 26 + - model: Pixel2.arm + version: 29 locale: en_US orientation: portrait diff --git a/apps/student/flank_e2e_coverage.yml b/apps/student/flank_e2e_coverage.yml index ef7cccbfd2..55a9ea0a1b 100644 --- a/apps/student/flank_e2e_coverage.yml +++ b/apps/student/flank_e2e_coverage.yml @@ -19,11 +19,11 @@ gcloud: directories-to-pull: - /sdcard/ test-targets: - - annotation com.instructure.canvas.espresso.E2E - - notAnnotation com.instructure.canvas.espresso.Stub + - annotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.OfflineE2E + - notAnnotation com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubCoverage device: - - model: Nexus6P - version: 26 + - model: Pixel2.arm + version: 29 locale: en_US orientation: portrait diff --git a/apps/student/flank_e2e_offline.yml b/apps/student/flank_e2e_offline.yml index 4d76f14bd3..0f091632dd 100644 --- a/apps/student/flank_e2e_offline.yml +++ b/apps/student/flank_e2e_offline.yml @@ -21,6 +21,6 @@ gcloud: orientation: portrait flank: - testShards: 1 + testShards: 10 testRuns: 1 diff --git a/apps/student/src/androidTest/java/com/instructure/student/espresso/TestAppManager.kt b/apps/student/src/androidTest/java/com/instructure/student/espresso/TestAppManager.kt index c99b8cf92d..fc00cc637e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/espresso/TestAppManager.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/espresso/TestAppManager.kt @@ -16,7 +16,6 @@ */ package com.instructure.student.espresso -import androidx.work.Configuration import androidx.work.WorkerFactory import com.instructure.student.util.BaseAppManager @@ -25,8 +24,6 @@ open class TestAppManager : BaseAppManager() { var workerFactory: WorkerFactory? = null override fun getWorkManagerFactory(): WorkerFactory { - return workerFactory?.let { - it - } ?: WorkerFactory.getDefaultWorkerFactory() + return workerFactory ?: WorkerFactory.getDefaultWorkerFactory() } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt index 755499d291..29646fe3f9 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt @@ -19,13 +19,13 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.canvasapi2.models.DiscussionEntry import com.instructure.dataseeding.api.DiscussionTopicsApi -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt index f546bc83ea..c61b83cc1e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt @@ -22,26 +22,24 @@ import androidx.test.espresso.Espresso import androidx.test.espresso.matcher.ViewMatchers import androidx.test.rule.GrantPermissionRule import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.checkToastText import com.instructure.dataseeding.api.AssignmentGroupsApi import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.CoursesApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.AttachmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.FileUploadType import com.instructure.dataseeding.model.GradingType -import com.instructure.dataseeding.model.SubmissionApiModel import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.ago import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.student.R import com.instructure.student.ui.pages.AssignmentListPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.ViewUtils @@ -54,6 +52,7 @@ import org.junit.Test @HiltAndroidTest class AssignmentsE2ETest: StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @@ -65,6 +64,117 @@ class AssignmentsE2ETest: StudentTest() { android.Manifest.permission.CAMERA ) + @E2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.E2E, SecondaryFeatureCategory.ASSIGNMENT_REMINDER) + fun testAssignmentReminderE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for '${course.name}' course with 2 days ahead due date.") + val testAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, dueAt = 2.days.fromNow.iso8601, pointsPossible = 15.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) + + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for '${course.name}' course with 2 days past due date.") + val alreadyPastAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, dueAt = 2.days.ago.iso8601, pointsPossible = 15.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) + + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG,"Select course: '${course.name}'.") + dashboardPage.selectCourse(course) + + Log.d(STEP_TAG,"Navigate to course Assignments Page.") + courseBrowserPage.selectAssignments() + + Log.d(STEP_TAG,"Click on assignment '${testAssignment.name}'.") + assignmentListPage.clickAssignment(testAssignment) + + Log.d(STEP_TAG, "Assert that the corresponding views are displayed on the Assignment Details Page. Assert that the reminder section is displayed as well.") + assignmentDetailsPage.assertPageObjects() + assignmentDetailsPage.assertReminderSectionDisplayed() + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select '1 Hour Before' and assert that the reminder has been picked up and displayed on the Assignment Details Page.") + assignmentDetailsPage.selectTimeOption("1 Hour Before") + assignmentDetailsPage.assertReminderDisplayedWithText("1 Hour Before") + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select '1 Hour Before' again, and assert that a toast message is occurring which warns that we cannot pick up the same time reminder twice.") + assignmentDetailsPage.selectTimeOption("1 Hour Before") + checkToastText(R.string.reminderAlreadySet, activityRule.activity) + + Log.d(STEP_TAG, "Remove the '1 Hour Before' reminder, confirm the deletion dialog and assert that the '1 Hour Before' reminder is not displayed any more.") + assignmentDetailsPage.removeReminderWithText("1 Hour Before") + assignmentDetailsPage.assertReminderNotDisplayedWithText("1 Hour Before") + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select 'Custom' reminder.") + assignmentDetailsPage.clickCustom() + + Log.d(STEP_TAG, "Assert that the 'Done' button is disabled by default.") + assignmentDetailsPage.assertDoneButtonIsDisabled() + + Log.d(STEP_TAG, "Fill the quantity text input with '15' and assert that the 'Done' button is still disabled since there is no option selected yet.") + assignmentDetailsPage.fillQuantity("15") + assignmentDetailsPage.assertDoneButtonIsDisabled() + + Log.d(STEP_TAG, "Select the 'Hours Before' option, and click on 'Done' button, since it will be enabled because both the quantity and option are filled and selected.") + assignmentDetailsPage.clickHoursBefore() + assignmentDetailsPage.clickDone() + + Log.d(STEP_TAG, "Assert that the '15 Hours Before' reminder is displayed on the Assignment Details Page.") + assignmentDetailsPage.assertReminderDisplayedWithText("15 Hours Before") + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select '1 Week Before' and assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for an assignment which ends tomorrow).") + assignmentDetailsPage.selectTimeOption("1 Week Before") + assignmentDetailsPage.assertReminderNotDisplayedWithText("1 Week Before") + checkToastText(R.string.reminderInPast, activityRule.activity) + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select '1 Day Before' and assert that the reminder has been picked up and displayed on the Assignment Details Page.") + assignmentDetailsPage.selectTimeOption("1 Day Before") + assignmentDetailsPage.assertReminderDisplayedWithText("1 Day Before") + + Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.") + assignmentDetailsPage.clickAddReminder() + + Log.d(STEP_TAG, "Select 'Custom' reminder.") + assignmentDetailsPage.clickCustom() + + Log.d(STEP_TAG, "Fill the quantity text input with '24' and select 'Hours Before' as option. Click on 'Done'.") + assignmentDetailsPage.fillQuantity("24") + assignmentDetailsPage.clickHoursBefore() + assignmentDetailsPage.clickDone() + + Log.d(STEP_TAG, "Assert that a toast message is occurring which warns that we cannot pick up the same time reminder twice. (Because 1 days and 24 hours is the same)") + checkToastText(R.string.reminderAlreadySet, activityRule.activity) + + Log.d(STEP_TAG, "Navigate back to Assignment List Page.") + Espresso.pressBack() + + Log.d(STEP_TAG,"Click on assignment '${alreadyPastAssignment.name}'.") + assignmentListPage.clickAssignment(alreadyPastAssignment) + + Log.d(STEP_TAG, "Assert that the reminder section is NOT displayed, because the '${alreadyPastAssignment.name}' assignment has already passed..") + assignmentDetailsPage.assertReminderSectionNotDisplayed() + } + @E2E @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.E2E) @@ -77,7 +187,14 @@ class AssignmentsE2ETest: StudentTest() { val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + val pointsTextAssignment = AssignmentsApi.createAssignment( + courseId = course.id, + teacherToken = teacher.token, + gradingType = GradingType.POINTS, + pointsPossible = 15.0, + dueAt = 1.days.fromNow.iso8601, + submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY) + ) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -106,14 +223,14 @@ class AssignmentsE2ETest: StudentTest() { Espresso.pressBack() Log.d(PREPARATION_TAG,"Submit assignment: ${pointsTextAssignment.name} for student: ${student.name}.") - submitAssignment(pointsTextAssignment, course, student) + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) assignmentDetailsPage.refresh() assignmentDetailsPage.assertStatusSubmitted() assignmentDetailsPage.assertSubmissionAndRubricLabel() Log.d(PREPARATION_TAG,"Grade submission: ${pointsTextAssignment.name} with 13 points.") - val textGrade = gradeSubmission(teacher, course, pointsTextAssignment.id, student, "13") + val textGrade = SubmissionsApi.gradeSubmission(teacher.token, course.id, pointsTextAssignment.id, student.id, postedGrade = "13") Log.d(STEP_TAG,"Refresh the page. Assert that the assignment ${pointsTextAssignment.name} has been graded with 13 points.") assignmentDetailsPage.refresh() @@ -131,19 +248,19 @@ class AssignmentsE2ETest: StudentTest() { fun testLetterGradeTextAssignmentE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val letterGradeTextAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0) + val letterGradeTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Submit assignment: ${letterGradeTextAssignment.name} for student: ${student.name}.") - submitAssignment(letterGradeTextAssignment, course, student) + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, letterGradeTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) Log.d(PREPARATION_TAG,"Grade submission: ${letterGradeTextAssignment.name} with 13 points.") - val submissionGrade = gradeSubmission(teacher, course, letterGradeTextAssignment.id, student, "13") + val submissionGrade = SubmissionsApi.gradeSubmission(teacher.token, course.id, letterGradeTextAssignment.id, student.id, postedGrade = "13") Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -163,13 +280,13 @@ class AssignmentsE2ETest: StudentTest() { fun testPercentageFileAssignmentWithCommentE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val percentageFileAssignment = createAssignment(course.id, teacher, GradingType.PERCENT, 25.0, allowedExtensions = listOf("txt", "pdf", "jpg"), submissionType = listOf(SubmissionType.ONLINE_UPLOAD)) + val percentageFileAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 25.0, allowedExtensions = listOf("txt", "pdf", "jpg"), submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD)) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -186,17 +303,22 @@ class AssignmentsE2ETest: StudentTest() { assignmentListPage.clickAssignment(percentageFileAssignment) Log.d(PREPARATION_TAG, "Seed a text file.") - val uploadInfo = uploadTextFile(courseId = course.id, assignmentId = percentageFileAssignment.id, token = student.token, fileUploadType = FileUploadType.ASSIGNMENT_SUBMISSION) + val uploadInfo = uploadTextFile( + courseId = course.id, + assignmentId = percentageFileAssignment.id, + token = student.token, + fileUploadType = FileUploadType.ASSIGNMENT_SUBMISSION + ) Log.d(PREPARATION_TAG,"Submit ${percentageFileAssignment.name} assignment for ${student.name} student.") - submitCourseAssignment(course, percentageFileAssignment, uploadInfo, student) + SubmissionsApi.submitCourseAssignment(course.id, student.token, percentageFileAssignment.id, SubmissionType.ONLINE_UPLOAD, fileIds = mutableListOf(uploadInfo.id)) Log.d(STEP_TAG,"Refresh the page. Assert that the ${percentageFileAssignment.name} assignment has been submitted.") assignmentDetailsPage.refresh() assignmentDetailsPage.assertAssignmentSubmitted() Log.d(PREPARATION_TAG,"Grade ${percentageFileAssignment.name} assignment with 22 percentage.") - gradeSubmission(teacher, course, percentageFileAssignment, student,"22") + SubmissionsApi.gradeSubmission(teacher.token, course.id, percentageFileAssignment.id, student.id, postedGrade = "22") Log.d(STEP_TAG,"Refresh the page. Assert that the ${percentageFileAssignment.name} assignment has been graded with 22 percentage.") assignmentDetailsPage.refresh() @@ -224,62 +346,47 @@ class AssignmentsE2ETest: StudentTest() { submissionDetailsPage.assertFileDisplayed(uploadInfo.fileName) } - private fun submitCourseAssignment( - course: CourseApiModel, - percentageFileAssignment: AssignmentApiModel, - uploadInfo: AttachmentApiModel, - student: CanvasUserApiModel - ) { - SubmissionsApi.submitCourseAssignment( - submissionType = SubmissionType.ONLINE_UPLOAD, - courseId = course.id, - assignmentId = percentageFileAssignment.id, - fileIds = listOf(uploadInfo.id).toMutableList(), - studentToken = student.token - ) - } - @E2E @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.E2E) fun testMultipleAssignmentsE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val letterGradeTextAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val letterGradeTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Submit ${letterGradeTextAssignment.name} assignment for ${student.name} student.") - submitAssignment(letterGradeTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Submit '${letterGradeTextAssignment.name}' assignment for '${student.name}' student.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, letterGradeTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) - Log.d(PREPARATION_TAG,"Grade ${letterGradeTextAssignment.name} assignment with 16.") - gradeSubmission(teacher, course, letterGradeTextAssignment, student, "16") + Log.d(PREPARATION_TAG,"Grade '${letterGradeTextAssignment.name}' assignment with 16.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, letterGradeTextAssignment.id, student.id, postedGrade = "16") - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val pointsTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Submit ${pointsTextAssignment.name} assignment for ${student.name} student.") - submitAssignment(pointsTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Submit '${pointsTextAssignment.name}' assignment for '${student.name}' student.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) - Log.d(PREPARATION_TAG,"Grade ${pointsTextAssignment.name} assignment with 13 points.") - gradeSubmission(teacher, course, pointsTextAssignment.id, student, "13") + Log.d(PREPARATION_TAG,"Grade '${pointsTextAssignment.name}' assignment with 13 points.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, pointsTextAssignment.id, student.id, postedGrade = "13") Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select ${course.name} course and navigate to it's Assignments Page.") + Log.d(STEP_TAG,"Select '${course.name}' course and navigate to it's Assignments Page.") dashboardPage.selectCourse(course) courseBrowserPage.selectAssignments() - Log.d(STEP_TAG,"Assert that ${pointsTextAssignment.name} assignment is displayed with the corresponding grade: 13.") + Log.d(STEP_TAG,"Assert that '${pointsTextAssignment.name}' assignment is displayed with the corresponding grade: 13.") assignmentListPage.assertHasAssignment(pointsTextAssignment,"13") - Log.d(STEP_TAG,"Assert that ${letterGradeTextAssignment.name} assignment is displayed with the corresponding grade: 16.") + Log.d(STEP_TAG,"Assert that '${letterGradeTextAssignment.name}' assignment is displayed with the corresponding grade: 16.") assignmentListPage.assertHasAssignment(letterGradeTextAssignment, "16") } @@ -288,28 +395,28 @@ class AssignmentsE2ETest: StudentTest() { @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.E2E) fun testFilterAndSortAssignmentsE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") - val upcomingAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0) + val upcomingAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") - val missingAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0, 2.days.ago.iso8601) + val missingAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, dueAt = 2.days.ago.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Seeding a GRADED assignment for ${course.name} course.") - val gradedAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0) + val gradedAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Grade the '${gradedAssignment.name}' with '11' points out of 20.") - gradeSubmission(teacher, course, gradedAssignment, student, "11") + SubmissionsApi.gradeSubmission(teacher.token, course.id, gradedAssignment.id, student.id, postedGrade = "11") Log.d(PREPARATION_TAG,"Create an Assignment Group for '${course.name}' course.") - val assignmentGroup = createAssignmentGroup(teacher, course) + val assignmentGroup = AssignmentGroupsApi.createAssignmentGroup(teacher.token, course.id, name = "Discussions") Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") - val otherTypeAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 20.0, assignmentGroupId = assignmentGroup.id) + val otherTypeAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 20.0, assignmentGroupId = assignmentGroup.id, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -402,44 +509,32 @@ class AssignmentsE2ETest: StudentTest() { assignmentListPage.assertAssignmentNotDisplayed(gradedAssignment.name) } - private fun createAssignmentGroup( - teacher: CanvasUserApiModel, - course: CourseApiModel - ) = AssignmentGroupsApi.createAssignmentGroup( - token = teacher.token, - courseId = course.id, - name = "Discussions", - position = null, - groupWeight = null, - sisSourceId = null - ) - @E2E @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.COMMENTS, TestCategory.E2E) fun testMediaCommentsE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val assignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Submit ${assignment.name} assignment for ${student.name} student.") - submitAssignment(assignment, course, student) + Log.d(PREPARATION_TAG,"Submit '${assignment.name}' assignment for '${student.name}' student.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, assignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) - Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select ${course.name} course and navigate to it's Assignments Page.") + Log.d(STEP_TAG,"Select '${course.name}' course and navigate to it's Assignments Page.") dashboardPage.selectCourse(course) courseBrowserPage.selectAssignments() - Log.d(STEP_TAG,"Click on ${assignment.name} assignment.") + Log.d(STEP_TAG,"Click on '${assignment.name}' assignment.") assignmentListPage.clickAssignment(assignment) Log.d(STEP_TAG,"Navigate to submission details Comments Tab.") @@ -464,38 +559,38 @@ class AssignmentsE2ETest: StudentTest() { fun testAddFileCommentE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val assignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Submit ${assignment.name} assignment for ${student.name} student.") - submitAssignment(assignment, course, student) + Log.d(PREPARATION_TAG,"Submit '${assignment.name}' assignment for '${student.name}' student.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, assignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) - Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() Log.d(STEP_TAG,"Seed a comment attachment upload.") val commentUploadInfo = uploadTextFile( - assignmentId = assignment.id, courseId = course.id, + assignmentId = assignment.id, token = student.token, fileUploadType = FileUploadType.COMMENT_ATTACHMENT ) - commentOnSubmission(student, course, assignment, commentUploadInfo) + SubmissionsApi.commentOnSubmission(course.id, student.token, assignment.id, mutableListOf(commentUploadInfo.id)) - Log.d(STEP_TAG,"Select ${course.name} course and navigate to it's Assignments Page.") + Log.d(STEP_TAG,"Select '${course.name}' course and navigate to it's Assignments Page.") dashboardPage.selectCourse(course) courseBrowserPage.selectAssignments() - Log.d(STEP_TAG,"Click on ${assignment.name} assignment.") + Log.d(STEP_TAG,"Click on '${assignment.name}' assignment.") assignmentListPage.clickAssignment(assignment) - Log.d(STEP_TAG,"Assert that ${commentUploadInfo.fileName} file is displayed as a comment by ${student.name} student.") + Log.d(STEP_TAG,"Assert that '${commentUploadInfo.fileName}' file is displayed as a comment by '${student.name}' student.") assignmentDetailsPage.goToSubmissionDetails() submissionDetailsPage.openComments() submissionDetailsPage.assertCommentAttachmentDisplayed(commentUploadInfo.fileName, student) @@ -510,31 +605,31 @@ class AssignmentsE2ETest: StudentTest() { fun testSubmissionAttemptSelection() { Log.d(PREPARATION_TAG, "Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val pointsTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG, "Select course: ${course.name}.") + Log.d(STEP_TAG, "Select course: '${course.name}'.") dashboardPage.selectCourse(course) Log.d(STEP_TAG, "Navigate to course Assignments Page.") courseBrowserPage.selectAssignments() Log.d(STEP_TAG, "Verify that our assignments are present," + - "along with any grade/date info. Click on assignment ${pointsTextAssignment.name}.") + "along with any grade/date info. Click on assignment '${pointsTextAssignment.name}'.") assignmentListPage.assertHasAssignment(pointsTextAssignment) assignmentListPage.clickAssignment(pointsTextAssignment) - Log.d(PREPARATION_TAG,"Submit assignment: ${pointsTextAssignment.name} for student: ${student.name}.") - submitAssignment(pointsTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Submit assignment: '${pointsTextAssignment.name}' for student: '${student.name}'.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) Log.d(STEP_TAG, "Refresh the page.") assignmentDetailsPage.refresh() @@ -542,8 +637,8 @@ class AssignmentsE2ETest: StudentTest() { Log.d(STEP_TAG, "Assert that when only there is one attempt, the spinner is not displayed.") assignmentDetailsPage.assertNoAttemptSpinner() - Log.d(PREPARATION_TAG,"Generate another submission for assignment: ${pointsTextAssignment.name} for student: ${student.name}.") - submitAssignment(pointsTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Generate another submission for assignment: '${pointsTextAssignment.name}' for student: '${student.name}'.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) Log.d(STEP_TAG, "Refresh the page.") assignmentDetailsPage.refresh() @@ -572,25 +667,25 @@ class AssignmentsE2ETest: StudentTest() { fun testCommentsBelongToSubmissionAttempts() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for '${course.name}' course.") + val pointsTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select course: ${course.name}.") + Log.d(STEP_TAG,"Select course: '${course.name}'.") dashboardPage.selectCourse(course) Log.d(STEP_TAG,"Navigate to course Assignments Page.") courseBrowserPage.selectAssignments() - Log.d(STEP_TAG,"Verify that our assignments are present, along with any grade/date info. Click on assignment ${pointsTextAssignment.name}.") + Log.d(STEP_TAG,"Verify that our assignments are present, along with any grade/date info. Click on assignment '${pointsTextAssignment.name}'.") assignmentListPage.assertHasAssignment(pointsTextAssignment) assignmentListPage.clickAssignment(pointsTextAssignment) @@ -606,16 +701,16 @@ class AssignmentsE2ETest: StudentTest() { submissionDetailsPage.assertNoSubmissionEmptyView() Espresso.pressBack() - Log.d(PREPARATION_TAG,"Submit assignment: ${pointsTextAssignment.name} for student: ${student.name}.") - submitAssignment(pointsTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Submit assignment: '${pointsTextAssignment.name}' for student: '${student.name}'.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) Log.d(STEP_TAG, "Refresh the Assignment Details Page. Assert that the assignment's status is submitted and the 'Submission and Rubric' label is displayed.") assignmentDetailsPage.refresh() assignmentDetailsPage.assertStatusSubmitted() assignmentDetailsPage.assertSubmissionAndRubricLabel() - Log.d(PREPARATION_TAG,"Make another submission for assignment: ${pointsTextAssignment.name} for student: ${student.name}.") - val secondSubmissionAttempt = submitAssignment(pointsTextAssignment, course, student) + Log.d(PREPARATION_TAG,"Make another submission for assignment: '${pointsTextAssignment.name}' for student: '${student.name}'.") + val secondSubmissionAttempt = SubmissionsApi.seedAssignmentSubmission(course.id, student.token, pointsTextAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY))) Log.d(STEP_TAG, "Refresh the Assignment Details Page. Assert that the assignment's status is submitted and the 'Submission and Rubric' label is displayed.") assignmentDetailsPage.refresh() @@ -630,7 +725,7 @@ class AssignmentsE2ETest: StudentTest() { assignmentDetailsPage.goToSubmissionDetails() submissionDetailsPage.openComments() - Log.d(STEP_TAG,"Assert that ${secondSubmissionAttempt[0].body} text submission has been displayed as a comment.") + Log.d(STEP_TAG,"Assert that '${secondSubmissionAttempt[0].body}' text submission has been displayed as a comment.") submissionDetailsPage.assertTextSubmissionDisplayedAsComment() val newComment = "Comment for second attempt" @@ -665,27 +760,27 @@ class AssignmentsE2ETest: StudentTest() { @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.E2E) fun showOnlyLetterGradeOnDashboardAndAssignmentListPageE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + val pointsTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) dashboardPage.waitForRender() Log.d(PREPARATION_TAG,"Grade submission: ${pointsTextAssignment.name} with 12 points.") - gradeSubmission(teacher, course, pointsTextAssignment.id, student, "12") + SubmissionsApi.gradeSubmission(teacher.token, course.id, pointsTextAssignment.id, student.id, postedGrade = "12") Log.d(STEP_TAG, "Refresh the Dashboard page. Assert that the course grade is 80%.") dashboardPage.refresh() dashboardPage.assertCourseGrade(course.name, "80%") Log.d(PREPARATION_TAG, "Update ${course.name} course's settings: Enable restriction for quantitative data.") - var restrictQuantitativeDataMap = mutableMapOf() + val restrictQuantitativeDataMap = mutableMapOf() restrictQuantitativeDataMap["restrict_quantitative_data"] = true CoursesApi.updateCourseSettings(course.id, restrictQuantitativeDataMap) @@ -694,28 +789,28 @@ class AssignmentsE2ETest: StudentTest() { dashboardPage.assertCourseGrade(course.name, "B-") Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val percentageAssignment = createAssignment(course.id, teacher, GradingType.PERCENT, 15.0, 1.days.fromNow.iso8601) + val percentageAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Grade submission: ${percentageAssignment.name} with 66% of the maximum points (aka. 10).") - gradeSubmission(teacher, course, percentageAssignment.id, student, "10") + SubmissionsApi.gradeSubmission(teacher.token, course.id, percentageAssignment.id, student.id, postedGrade = "10") Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val letterGradeAssignment = createAssignment(course.id, teacher, GradingType.LETTER_GRADE, 15.0, 1.days.fromNow.iso8601) + val letterGradeAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Grade submission: ${letterGradeAssignment.name} with C.") - gradeSubmission(teacher, course, letterGradeAssignment.id, student, "C") + SubmissionsApi.gradeSubmission(teacher.token, course.id, letterGradeAssignment.id, student.id, postedGrade = "C") Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val passFailAssignment = createAssignment(course.id, teacher, GradingType.PASS_FAIL, 15.0, 1.days.fromNow.iso8601) + val passFailAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PASS_FAIL, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Grade submission: ${passFailAssignment.name} with 'Incomplete'.") - gradeSubmission(teacher, course, passFailAssignment.id, student, "Incomplete") + SubmissionsApi.gradeSubmission(teacher.token, course.id, passFailAssignment.id, student.id, postedGrade = "Incomplete") Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val gpaScaleAssignment = createAssignment(course.id, teacher, GradingType.GPA_SCALE, 15.0, 1.days.fromNow.iso8601) + val gpaScaleAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.GPA_SCALE, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Grade submission: ${gpaScaleAssignment.name} with 3.7.") - gradeSubmission(teacher, course, gpaScaleAssignment.id, student, "3.7") + SubmissionsApi.gradeSubmission(teacher.token, course.id, gpaScaleAssignment.id, student.id, postedGrade = "3.7") Log.d(STEP_TAG, "Refresh the Dashboard page to let the newly added submissions and their grades propagate.") dashboardPage.refresh() @@ -821,23 +916,23 @@ class AssignmentsE2ETest: StudentTest() { @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.E2E) fun showOnlyLetterGradeOnGradesPageE2E() { Log.d(PREPARATION_TAG, "Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 1) + val data = seedData(teachers = 1, courses = 1, students = 1) val student = data.studentsList[0] val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val pointsTextAssignment = createAssignment(course.id, teacher, GradingType.POINTS, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val pointsTextAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(PREPARATION_TAG, "Grade submission: ${pointsTextAssignment.name} with 12 points.") - gradeSubmission(teacher, course, pointsTextAssignment.id, student, "12") + Log.d(PREPARATION_TAG, "Grade submission: '${pointsTextAssignment.name}' with 12 points.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, pointsTextAssignment.id, student.id, postedGrade = "12") - Log.d(PREPARATION_TAG, "Update ${course.name} course's settings: Enable restriction for quantitative data.") - var restrictQuantitativeDataMap = mutableMapOf() + Log.d(PREPARATION_TAG, "Update '${course.name}' course's settings: Enable restriction for quantitative data.") + val restrictQuantitativeDataMap = mutableMapOf() restrictQuantitativeDataMap["restrict_quantitative_data"] = true CoursesApi.updateCourseSettings(course.id, restrictQuantitativeDataMap) @@ -845,52 +940,34 @@ class AssignmentsE2ETest: StudentTest() { dashboardPage.refresh() dashboardPage.assertCourseGrade(course.name, "B-") - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val percentageAssignment = createAssignment(course.id, teacher, GradingType.PERCENT, 15.0, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val percentageAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG, "Grade submission: ${percentageAssignment.name} with 66% of the maximum points (aka. 10).") - gradeSubmission(teacher, course, percentageAssignment.id, student, "10") + Log.d(PREPARATION_TAG, "Grade submission: '${percentageAssignment.name}' with 66% of the maximum points (aka. 10).") + SubmissionsApi.gradeSubmission(teacher.token, course.id, percentageAssignment.id, student.id, postedGrade = "10") - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val letterGradeAssignment = createAssignment( - course.id, - teacher, - GradingType.LETTER_GRADE, - 15.0, - 1.days.fromNow.iso8601 - ) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val letterGradeAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG, "Grade submission: ${letterGradeAssignment.name} with C.") - gradeSubmission(teacher, course, letterGradeAssignment.id, student, "C") + Log.d(PREPARATION_TAG, "Grade submission: '${letterGradeAssignment.name}' with C.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, letterGradeAssignment.id, student.id, postedGrade = "C") - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val passFailAssignment = createAssignment( - course.id, - teacher, - GradingType.PASS_FAIL, - 15.0, - 1.days.fromNow.iso8601 - ) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val passFailAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PASS_FAIL, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG, "Grade submission: ${passFailAssignment.name} with 'Incomplete'.") - gradeSubmission(teacher, course, passFailAssignment.id, student, "Incomplete") + Log.d(PREPARATION_TAG, "Grade submission: '${passFailAssignment.name}' with 'Incomplete'.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, passFailAssignment.id, student.id, postedGrade = "Incomplete") - Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for ${course.name} course.") - val gpaScaleAssignment = createAssignment( - course.id, - teacher, - GradingType.GPA_SCALE, - 15.0, - 1.days.fromNow.iso8601 - ) + Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.") + val gpaScaleAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.GPA_SCALE, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG, "Grade submission: ${gpaScaleAssignment.name} with 3.7.") - gradeSubmission(teacher, course, gpaScaleAssignment.id, student, "3.7") + Log.d(PREPARATION_TAG, "Grade submission: '${gpaScaleAssignment.name}' with 3.7.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, gpaScaleAssignment.id, student.id, postedGrade = "3.7") Log.d(STEP_TAG, "Refresh the Dashboard page to let the newly added submissions and their grades propagate.") dashboardPage.refresh() - Log.d(STEP_TAG, "Select course: ${course.name}. Select 'Grades' menu.") + Log.d(STEP_TAG, "Select course: '${course.name}'. Select 'Grades' menu.") dashboardPage.selectCourse(course) courseBrowserPage.selectGrades() @@ -903,7 +980,7 @@ class AssignmentsE2ETest: StudentTest() { if(isLowResDevice()) courseGradesPage.swipeUp() courseGradesPage.assertAssignmentDisplayed(gpaScaleAssignment.name, "F") - Log.d(PREPARATION_TAG, "Update ${course.name} course's settings: Enable restriction for quantitative data.") + Log.d(PREPARATION_TAG, "Update '${course.name}' course's settings: Enable restriction for quantitative data.") restrictQuantitativeDataMap["restrict_quantitative_data"] = false CoursesApi.updateCourseSettings(course.id, restrictQuantitativeDataMap) @@ -920,95 +997,4 @@ class AssignmentsE2ETest: StudentTest() { courseGradesPage.swipeUp() courseGradesPage.assertAssignmentDisplayed(gpaScaleAssignment.name, "3.7/15 (F)") } - - private fun createAssignment( - courseId: Long, - teacher: CanvasUserApiModel, - gradingType: GradingType, - pointsPossible: Double, - dueAt: String = EMPTY_STRING, - allowedExtensions: List? = null, - assignmentGroupId: Long? = null, - submissionType: List = listOf(SubmissionType.ONLINE_TEXT_ENTRY) - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = courseId, - submissionTypes = submissionType, - gradingType = gradingType, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = dueAt, - allowedExtensions = allowedExtensions, - assignmentGroupId = assignmentGroupId - ) - ) - } - - private fun submitAssignment( - assignment: AssignmentApiModel, - course: CourseApiModel, - student: CanvasUserApiModel - ): List { - return SubmissionsApi.seedAssignmentSubmission( - SubmissionsApi.SubmissionSeedRequest( - assignmentId = assignment.id, - courseId = course.id, - studentToken = student.token, - submissionSeedsList = listOf( - SubmissionsApi.SubmissionSeedInfo( - amount = 1, - submissionType = SubmissionType.ONLINE_TEXT_ENTRY - ) - ) - ) - ) - } - - private fun gradeSubmission( - teacher: CanvasUserApiModel, - course: CourseApiModel, - assignment: AssignmentApiModel, - student: CanvasUserApiModel, - postedGrade: String, - excused: Boolean = false - ) { - SubmissionsApi.gradeSubmission( - teacherToken = teacher.token, - courseId = course.id, - assignmentId = assignment.id, - studentId = student.id, - postedGrade = postedGrade, - excused = excused - ) - } - - private fun gradeSubmission( - teacher: CanvasUserApiModel, - course: CourseApiModel, - assignmentId: Long, - student: CanvasUserApiModel, - postedGrade: String - ) = SubmissionsApi.gradeSubmission( - teacherToken = teacher.token, - courseId = course.id, - assignmentId = assignmentId, - studentId = student.id, - postedGrade = postedGrade, - excused = false - ) - - private fun commentOnSubmission( - student: CanvasUserApiModel, - course: CourseApiModel, - assignment: AssignmentApiModel, - commentUploadInfo: AttachmentApiModel - ) { - SubmissionsApi.commentOnSubmission( - studentToken = student.token, - courseId = course.id, - assignmentId = assignment.id, - fileIds = mutableListOf(commentUploadInfo.id) - ) - } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/BookmarksE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/BookmarksE2ETest.kt index 2e0ae5bba7..e9429327ce 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/BookmarksE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/BookmarksE2ETest.kt @@ -19,16 +19,17 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.dataseeding.api.AssignmentsApi -import com.instructure.dataseeding.model.* +import com.instructure.dataseeding.model.GradingType +import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.ViewUtils import com.instructure.student.ui.utils.seedData @@ -54,7 +55,7 @@ class BookmarksE2ETest : StudentTest() { val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Preparing an assignment which will be saved as a bookmark.") - val assignment = createAssignment(course, teacher) + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -106,20 +107,4 @@ class BookmarksE2ETest : StudentTest() { bookmarkPage.assertEmptyView() } - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = GradingType.POINTS, - teacherToken = teacher.token, - pointsPossible = 15.0, - dueAt = 1.days.fromNow.iso8601 - ) - ) - } - } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/CollaborationsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/CollaborationsE2ETest.kt index c1f0c7e521..6b22a2228c 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/CollaborationsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/CollaborationsE2ETest.kt @@ -2,11 +2,10 @@ package com.instructure.student.ui.e2e import android.util.Log import com.instructure.canvas.espresso.E2E -import com.instructure.canvas.espresso.KnownBug -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.ui.pages.CollaborationsPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData @@ -15,20 +14,15 @@ import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Test -/** - * Very basic test to verify that the collaborations web page shows up correctly. - * We make no attempt to actually start a collaboration. - * This test could break if changes are made to the web page that we bring up. - */ @HiltAndroidTest class CollaborationsE2ETest: StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @E2E @Test - @KnownBug("https://instructure.atlassian.net/browse/VICE-3157") @TestMetaData(Priority.MANDATORY, FeatureCategory.COLLABORATIONS, TestCategory.E2E) fun testCollaborationsE2E() { @@ -37,24 +31,24 @@ class CollaborationsE2ETest: StudentTest() { val student = data.studentsList[0] val course = data.coursesList[0] - Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Navigate to ${course.name} course's Collaborations Page.") + Log.d(STEP_TAG,"Navigate to '${course.name}' course's Collaborations Page.") dashboardPage.selectCourse(course) courseBrowserPage.selectCollaborations() Log.d(STEP_TAG,"Verify that various elements of the web page are present.") CollaborationsPage.assertCurrentCollaborationsHeaderPresent() - //On some screen size, this spinner does not displayed at all, instead of it, - //there is a button on the top-right corner with the 'Start a new Collaboration' text - //and clicking on it will 'expand' and display this spinner. - //However, there is a bug (see link in this @KnownBug annotation) which is about the button not displayed on some screen size - //So this test will breaks until it this ticket will be fixed. + Log.d(STEP_TAG, "Assert that the 'Start a New Collaboration' button is displayed.") CollaborationsPage.assertStartANewCollaborationPresent() - CollaborationsPage.assertGoogleDocsChoicePresent() - CollaborationsPage.assertGoogleDocsExplanationPresent() + + Log.d(STEP_TAG, "Assert that within the selector, the 'Google Docs' has been selected as the default value.") + CollaborationsPage.assertGoogleDocsChoicePresentAsDefaultOption() + + Log.d(STEP_TAG, "Assert that the warning section (under the selector) of Google Docs has been displayed.") + CollaborationsPage.assertGoogleDocsWarningDescriptionPresent() } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt index 90a7e6e01a..b79cfa0ae7 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt @@ -2,12 +2,12 @@ package com.instructure.student.ui.e2e import android.util.Log import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.dataseeding.api.ConferencesApi -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -53,15 +53,11 @@ class ConferencesE2ETest: StudentTest() { val testConferenceTitle = "E2E test conference" val testConferenceDescription = "Nightly E2E Test conference description" Log.d(PREPARATION_TAG,"Create a conference with '$testConferenceTitle' title and '$testConferenceDescription' description.") - ConferencesApi.createCourseConference(teacher.token, - testConferenceTitle, testConferenceDescription,"BigBlueButton",false,70, - listOf(student.id),course.id) + ConferencesApi.createCourseConference(course.id, teacher.token, testConferenceTitle, testConferenceDescription, recipientUserIds = listOf(student.id)) val testConferenceTitle2 = "E2E test conference 2" val testConferenceDescription2 = "Nightly E2E Test conference description 2" - ConferencesApi.createCourseConference(teacher.token, - testConferenceTitle2, testConferenceDescription2,"BigBlueButton",true,120, - listOf(student.id),course.id) + ConferencesApi.createCourseConference(course.id, teacher.token, testConferenceTitle2, testConferenceDescription2, longRunning = true, duration = 120, recipientUserIds = listOf(student.id)) Log.d(STEP_TAG,"Refresh the page. Assert that $testConferenceTitle conference is displayed on the Conference List Page with the corresponding status.") refresh() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DashboardE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DashboardE2ETest.kt index e0fe3bcffa..4b11b77837 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DashboardE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DashboardE2ETest.kt @@ -19,12 +19,12 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.ConversationsApi import com.instructure.dataseeding.api.GroupsApi -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -50,10 +50,7 @@ class DashboardE2ETest : StudentTest() { val course2 = data.coursesList[1] Log.d(PREPARATION_TAG, "Seed an Inbox conversation via API.") - ConversationsApi.createConversation( - token = teacher.token, - recipients = listOf(student.id.toString()) - ) + ConversationsApi.createConversation(teacher.token, listOf(student.id.toString())) Log.d(PREPARATION_TAG,"Seed some group info.") val groupCategory = GroupsApi.createCourseGroupCategory(data.coursesList[0].id, teacher.token) @@ -101,11 +98,11 @@ class DashboardE2ETest : StudentTest() { dashboardPage.assertDisplaysGroup(group2, course1) Log.d(STEP_TAG,"Click on 'All Courses' button. Assert that the All Courses Page is loaded.") - dashboardPage.clickEditDashboard() - editDashboardPage.assertPageObjects() + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() Log.d(STEP_TAG, "Favorite '${course1.name}' course and navigate back to Dashboard Page.") - editDashboardPage.favoriteCourse(course1.name) + allCoursesPage.favoriteCourse(course1.name) Espresso.pressBack() Log.d(STEP_TAG,"Assert that only the favoured course, '${course1.name}' is displayed." + @@ -124,16 +121,16 @@ class DashboardE2ETest : StudentTest() { Log.d(STEP_TAG,"Click on 'All Courses' button. Assert that the All Courses Page is loaded.") dashboardPage.assertPageObjects() - dashboardPage.clickEditDashboard() - editDashboardPage.assertPageObjects() + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() Log.d(STEP_TAG, "Assert that the mass select button's text is 'Unselect All', since one of the courses is selected.") - editDashboardPage.assertCourseMassSelectButtonIsDisplayed(true) + allCoursesPage.assertCourseMassSelectButtonIsDisplayed(true) Log.d(STEP_TAG, "Toggle off favourite star icon of '${course1.name}' course." + "Assert that the 'mass' select button's label is 'Select All'.") - editDashboardPage.unfavoriteCourse(course1.name) - editDashboardPage.assertCourseMassSelectButtonIsDisplayed(false) + allCoursesPage.unfavoriteCourse(course1.name) + allCoursesPage.assertCourseMassSelectButtonIsDisplayed(false) Log.d(STEP_TAG, "Navigate back to Dashboard Page.") Espresso.pressBack() @@ -186,15 +183,15 @@ class DashboardE2ETest : StudentTest() { dashboardPage.assertCourseGrade(course2.name, "N/A") Log.d(STEP_TAG,"Click on 'All Courses' button.") - dashboardPage.clickEditDashboard() - editDashboardPage.assertPageObjects() + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() Log.d(STEP_TAG, "Assert that the group 'mass' select button's label is 'Select All'.") - editDashboardPage.swipeUp() - editDashboardPage.assertGroupMassSelectButtonIsDisplayed(false) + allCoursesPage.swipeUp() + allCoursesPage.assertGroupMassSelectButtonIsDisplayed(false) Log.d(STEP_TAG, "Favorite '${group.name}' course and navigate back to Dashboard Page.") - editDashboardPage.favoriteGroup(group.name) + allCoursesPage.favoriteGroup(group.name) Espresso.pressBack() Log.d(STEP_TAG,"Assert that only the favoured group, '${group.name}' is displayed." + @@ -203,18 +200,18 @@ class DashboardE2ETest : StudentTest() { dashboardPage.assertGroupNotDisplayed(group2) Log.d(STEP_TAG,"Click on 'All Courses' button.") - dashboardPage.clickEditDashboard() - editDashboardPage.assertPageObjects() + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() Thread.sleep(2000) //It can be flaky without this 2 seconds - editDashboardPage.swipeUp() + allCoursesPage.swipeUp() Log.d(STEP_TAG, "Assert that the group 'mass' select button's label is 'Unselect All'.") - editDashboardPage.assertGroupMassSelectButtonIsDisplayed(true) + allCoursesPage.assertGroupMassSelectButtonIsDisplayed(true) Log.d(STEP_TAG, "Toggle off favourite star icon of '${group.name}' group." + "Assert that the 'mass' select button's label is 'Select All'.") - editDashboardPage.unfavoriteGroup(group.name) - editDashboardPage.assertGroupMassSelectButtonIsDisplayed(false) + allCoursesPage.unfavoriteGroup(group.name) + allCoursesPage.assertGroupMassSelectButtonIsDisplayed(false) Log.d(STEP_TAG, "Navigate back to Dashboard Page.") Espresso.pressBack() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt index 85506cb028..cd1c0ae152 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt @@ -20,15 +20,13 @@ import android.os.SystemClock.sleep import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.DiscussionTopicsApi -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.espresso.ViewUtils -import com.instructure.espresso.getCurrentDateInCanvasFormat -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.espresso.getDateInCanvasFormat import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -52,51 +50,51 @@ class DiscussionsE2ETest: StudentTest() { val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seed a discussion topic.") - val topic1 = createDiscussion(course, teacher) + Log.d(PREPARATION_TAG,"Seed a discussion topic for '${course.name}' course.") + val topic1 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token) - Log.d(PREPARATION_TAG,"Seed another discussion topic.") - val topic2 = createDiscussion(course, teacher) + Log.d(PREPARATION_TAG,"Seed another discussion topic for '${course.name}' course.") + val topic2 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token) - Log.d(STEP_TAG,"Seed an announcement for ${course.name} course.") - val announcement = createAnnouncement(course, teacher) + Log.d(STEP_TAG,"Seed an announcement for '${course.name}' course.") + val announcement = DiscussionTopicsApi.createAnnouncement(course.id, teacher.token) - Log.d(STEP_TAG,"Seed another announcement for ${course.name} course.") - val announcement2 = createAnnouncement(course, teacher) + Log.d(STEP_TAG,"Seed another announcement for '${course.name}' course.") + val announcement2 = DiscussionTopicsApi.createAnnouncement(course.id, teacher.token) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) - dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select course: ${course.name}.") + Log.d(STEP_TAG,"Wait for the Dashboard Page to be rendered. Select course: '${course.name}'.") + dashboardPage.waitForRender() dashboardPage.selectCourse(course) - Log.d(STEP_TAG,"Verify that the Discussions and Announcements Tabs are both displayed on the CourseBrowser Page.") + Log.d(STEP_TAG,"Verify that the 'Discussions' and 'Announcements' Tabs are both displayed on the CourseBrowser Page.") courseBrowserPage.assertTabDisplayed("Announcements") courseBrowserPage.assertTabDisplayed("Discussions") - Log.d(STEP_TAG,"Navigate to Announcements Page. Assert that both ${announcement.title} and ${announcement2.title} announcements are displayed.") + Log.d(STEP_TAG,"Navigate to Announcements Page. Assert that both '${announcement.title}' and '${announcement2.title}' announcements are displayed.") courseBrowserPage.selectAnnouncements() discussionListPage.assertTopicDisplayed(announcement.title) discussionListPage.assertTopicDisplayed(announcement2.title) - Log.d(STEP_TAG,"Select ${announcement.title} announcement and assert if the details page is displayed.") + Log.d(STEP_TAG,"Select '${announcement.title}' announcement and assert if the Discussion Details Page is displayed.") discussionListPage.selectTopic(announcement.title) discussionDetailsPage.assertTitleText(announcement.title) - Log.d(STEP_TAG,"Navigate back.") + Log.d(STEP_TAG,"Navigate back to the Discussion List Page.") Espresso.pressBack() - Log.d(STEP_TAG,"Click on the 'Search' button and search for ${announcement2.title}. announcement.") + Log.d(STEP_TAG,"Click on the 'Search' button and search for '${announcement2.title}'. announcement.") discussionListPage.searchable.clickOnSearchButton() discussionListPage.searchable.typeToSearchBar(announcement2.title) - Log.d(STEP_TAG,"Refresh the page. Assert that the searching method is working well, so ${announcement.title} won't be displayed and ${announcement2.title} is displayed.") + Log.d(STEP_TAG,"Refresh the page. Assert that the searching method is working well, so '${announcement.title}' won't be displayed and '${announcement2.title}' is displayed.") discussionListPage.pullToUpdate() discussionListPage.assertTopicDisplayed(announcement2.title) discussionListPage.assertTopicNotDisplayed(announcement.title) - Log.d(STEP_TAG,"Clear the search input field and assert that both announcements, ${announcement.title} and ${announcement2.title} has been diplayed.") + Log.d(STEP_TAG,"Clear the search input field and assert that both announcements, '${announcement.title}' and '${announcement2.title}' has been displayed.") discussionListPage.searchable.clickOnClearSearchButton() discussionListPage.waitForDiscussionTopicToDisplay(announcement.title) discussionListPage.assertTopicDisplayed(announcement2.title) @@ -107,22 +105,22 @@ class DiscussionsE2ETest: StudentTest() { Log.d(STEP_TAG,"Navigate to Discussions Page.") courseBrowserPage.selectDiscussions() - Log.d(STEP_TAG,"Select ${topic1.title} discussion and assert if the details page is displayed and there is no reply for the discussion yet.") + Log.d(STEP_TAG,"Select '${topic1.title}' discussion and assert if the details page is displayed and there is no reply for the discussion yet.") discussionListPage.assertTopicDisplayed(topic1.title) discussionListPage.selectTopic(topic1.title) discussionDetailsPage.assertTitleText(topic1.title) discussionDetailsPage.assertNoRepliesDisplayed() - Log.d(STEP_TAG,"Navigate back to Discussions Page.") - Espresso.pressBack() // Back to discussion list + Log.d(STEP_TAG,"Navigate back to Discussion List Page.") + Espresso.pressBack() - Log.d(STEP_TAG,"Select ${topic1.title} discussion and assert if the details page is displayed and there is no reply for the discussion yet.") + Log.d(STEP_TAG,"Select '${topic1.title}' discussion and assert if the details page is displayed and there is no reply for the discussion yet.") discussionListPage.assertTopicDisplayed(topic2.title) discussionListPage.selectTopic(topic2.title) discussionDetailsPage.assertTitleText(topic2.title) discussionDetailsPage.assertNoRepliesDisplayed() - Log.d(STEP_TAG,"Navigate back to Discussions Page.") + Log.d(STEP_TAG,"Navigate back to Discussion List Page.") Espresso.pressBack() val newTopicName = "Do we really need discussions?" @@ -131,11 +129,11 @@ class DiscussionsE2ETest: StudentTest() { discussionListPage.createDiscussionTopic(newTopicName, newTopicDescription) sleep(2000) // Allow some time for creation to propagate - Log.d(STEP_TAG,"Assert that $newTopicName topic has been created successfully with 0 reply count.") + Log.d(STEP_TAG,"Assert that '$newTopicName' topic has been created successfully with 0 reply count.") discussionListPage.assertTopicDisplayed(newTopicName) discussionListPage.assertReplyCount(newTopicName, 0) - Log.d(STEP_TAG,"Select $newTopicName topic and assert that there is no reply on the details page as well.") + Log.d(STEP_TAG,"Select '$newTopicName' topic and assert that there is no reply on the details page as well.") discussionListPage.selectTopic(newTopicName) discussionDetailsPage.assertNoRepliesDisplayed() @@ -147,7 +145,7 @@ class DiscussionsE2ETest: StudentTest() { Log.d(STEP_TAG,"Assert the the previously sent reply ($replyMessage) is displayed on the details page.") discussionDetailsPage.assertRepliesDisplayed() - Log.d(STEP_TAG,"Navigate back to Discussions Page.") + Log.d(STEP_TAG,"Navigate back to Discussion List Page.") Espresso.pressBack() Log.d(STEP_TAG,"Refresh the page. Assert that the previously sent reply has been counted, and there are no unread replies.") @@ -156,24 +154,8 @@ class DiscussionsE2ETest: StudentTest() { discussionListPage.assertUnreadReplyCount(newTopicName, 0) Log.d(STEP_TAG, "Assert that the due date is the current date (in the expected format).") - val currentDate = getCurrentDateInCanvasFormat() + val currentDate = getDateInCanvasFormat() discussionListPage.assertDueDate(newTopicName, currentDate) - } - private fun createAnnouncement( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = DiscussionTopicsApi.createAnnouncement( - courseId = course.id, - token = teacher.token - ) - - private fun createDiscussion( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = DiscussionTopicsApi.createDiscussion( - courseId = course.id, - token = teacher.token - ) } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt index 794c7dc02b..15c3c673a3 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt @@ -20,26 +20,25 @@ import android.os.Environment import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.managers.DiscussionManager import com.instructure.canvasapi2.models.CanvasContext -import com.instructure.canvasapi2.models.DiscussionEntry import com.instructure.canvasapi2.utils.weave.awaitApiResponse import com.instructure.canvasapi2.utils.weave.catch import com.instructure.canvasapi2.utils.weave.tryWeave import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.DiscussionTopicsApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.AttachmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.FileUploadType +import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.Randomizer -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.dataseeding.util.days +import com.instructure.dataseeding.util.fromNow +import com.instructure.dataseeding.util.iso8601 import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.ViewUtils import com.instructure.student.ui.utils.seedData @@ -52,6 +51,7 @@ import java.io.FileWriter @HiltAndroidTest class FilesE2ETest: StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @@ -67,8 +67,8 @@ class FilesE2ETest: StudentTest() { val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val assignment = createAssignment(course, teacher) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD), allowedExtensions = listOf("txt")) Log.d(PREPARATION_TAG, "Seed a text file.") val submissionUploadInfo = uploadTextFile( @@ -78,20 +78,20 @@ class FilesE2ETest: StudentTest() { fileUploadType = FileUploadType.ASSIGNMENT_SUBMISSION ) - Log.d(PREPARATION_TAG,"Submit ${assignment.name} assignment for ${student.name} student.") - submitAssignment(course, assignment, submissionUploadInfo, student) + Log.d(PREPARATION_TAG,"Submit '${assignment.name}' assignment for '${student.name}' student.") + SubmissionsApi.submitCourseAssignment(course.id, student.token, assignment.id, SubmissionType.ONLINE_UPLOAD, fileIds = mutableListOf(submissionUploadInfo.id)) - Log.d(STEP_TAG,"Seed a comment attachment upload.") + Log.d(STEP_TAG,"Seed a comment attachment (file) upload.") val commentUploadInfo = uploadTextFile( assignmentId = assignment.id, courseId = course.id, token = student.token, fileUploadType = FileUploadType.COMMENT_ATTACHMENT ) - commentOnSubmission(student, course, assignment, commentUploadInfo) + SubmissionsApi.commentOnSubmission(course.id, student.token, assignment.id, mutableListOf(commentUploadInfo.id)) - Log.d(STEP_TAG,"Seed a discussion for ${course.name} course.") - val discussionTopic = createDiscussion(course, student) + Log.d(STEP_TAG,"Seed a discussion for '${course.name}' course.") + val discussionTopic = DiscussionTopicsApi.createDiscussion(course.id, student.token) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -102,7 +102,7 @@ class FilesE2ETest: StudentTest() { Randomizer.randomTextFileName(Environment.getExternalStorageDirectory().absolutePath)) .apply { createNewFile() } - Log.d(STEP_TAG,"Add some random content to the ${discussionAttachmentFile.name} file.") + Log.d(STEP_TAG,"Add some random content to the '${discussionAttachmentFile.name}' file.") FileWriter(discussionAttachmentFile, true).apply { write(Randomizer.randomTextFileContents()) flush() @@ -111,7 +111,7 @@ class FilesE2ETest: StudentTest() { Log.d(PREPARATION_TAG,"Use real API (rather than seeding) to create a reply to our discussion that contains an attachment.") tryWeave { - awaitApiResponse { + awaitApiResponse { DiscussionManager.postToDiscussionTopic( canvasContext = CanvasContext.emptyCourseContext(id = course.id), topicId = discussionTopic.id, @@ -124,22 +124,22 @@ class FilesE2ETest: StudentTest() { Log.v(PREPARATION_TAG, "Discussion post error: $it") } - Log.d(STEP_TAG,"Navigate to 'Files' menu in user left-side menubar.") + Log.d(STEP_TAG,"Navigate to 'Files' menu in user left-side menu bar.") leftSideNavigationDrawerPage.clickFilesMenu() Log.d(STEP_TAG,"Assert that there is a directory called 'Submissions' is displayed.") fileListPage.assertItemDisplayed("Submissions") - Log.d(STEP_TAG,"Select 'Submissions' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.") + Log.d(STEP_TAG,"Select 'Submissions' directory. Assert that '${discussionAttachmentFile.name}' file is displayed on the File List Page.") fileListPage.selectItem("Submissions") - Log.d(STEP_TAG,"Assert that ${course.name} course is displayed.") + Log.d(STEP_TAG,"Assert that '${course.name}' course is displayed.") fileListPage.assertItemDisplayed(course.name) - Log.d(STEP_TAG,"Select ${course.name} course.") + Log.d(STEP_TAG,"Select '${course.name}' course.") fileListPage.selectItem(course.name) - Log.d(STEP_TAG,"Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.") + Log.d(STEP_TAG,"Assert that '${discussionAttachmentFile.name}' file is displayed on the File List Page.") fileListPage.assertItemDisplayed(submissionUploadInfo.fileName) Log.d(STEP_TAG,"Navigate back to File List Page.") @@ -148,37 +148,37 @@ class FilesE2ETest: StudentTest() { Log.d(STEP_TAG,"Assert that there is a directory called 'unfiled' is displayed.") fileListPage.assertItemDisplayed("unfiled") // Our discussion attachment goes under "unfiled" - Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.") + Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that '${discussionAttachmentFile.name}' file is displayed on the File List Page.") fileListPage.selectItem("unfiled") fileListPage.assertItemDisplayed(discussionAttachmentFile.name) Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(2) - Log.d(STEP_TAG,"Select ${course.name} course.") + Log.d(STEP_TAG,"Select '${course.name}' course.") dashboardPage.selectCourse(course) Log.d(STEP_TAG,"Navigate to Assignments Page.") courseBrowserPage.selectAssignments() - Log.d(STEP_TAG,"Click on ${assignment.name} assignment.") + Log.d(STEP_TAG,"Click on '${assignment.name}' assignment.") assignmentListPage.clickAssignment(assignment) Log.d(STEP_TAG,"Navigate to Submission Details Page and open Files Tab.") assignmentDetailsPage.goToSubmissionDetails() submissionDetailsPage.openFiles() - Log.d(STEP_TAG,"Assert that ${submissionUploadInfo.fileName} file has been displayed.") + Log.d(STEP_TAG,"Assert that '${submissionUploadInfo.fileName}' file has been displayed.") submissionDetailsPage.assertFileDisplayed(submissionUploadInfo.fileName) - Log.d(STEP_TAG,"Open Comments Tab. Assert that ${commentUploadInfo.fileName} file is displayed as a comment by ${student.name} student.") + Log.d(STEP_TAG,"Open Comments Tab. Assert that '${commentUploadInfo.fileName}' file is displayed as a comment by '${student.name}' student.") submissionDetailsPage.openComments() submissionDetailsPage.assertCommentAttachmentDisplayed(commentUploadInfo.fileName, student) Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(4) - Log.d(STEP_TAG,"Navigate to 'Files' menu in user left-side menubar.") + Log.d(STEP_TAG,"Navigate to 'Files' menu in user left-side menu bar.") leftSideNavigationDrawerPage.clickFilesMenu() Log.d(STEP_TAG,"Assert that there is a directory called 'unfiled' is displayed.") @@ -194,18 +194,18 @@ class FilesE2ETest: StudentTest() { fileListPage.assertItemNotDisplayed("unfiled") fileListPage.searchable.pressSearchBackButton() - Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.") + Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that '${discussionAttachmentFile.name}' file is displayed on the File List Page.") fileListPage.selectItem("unfiled") fileListPage.assertItemDisplayed(discussionAttachmentFile.name) val newFileName = "newTextFileName.txt" - Log.d(STEP_TAG,"Rename ${discussionAttachmentFile.name} file to: $newFileName.") + Log.d(STEP_TAG,"Rename '${discussionAttachmentFile.name}' file to: '$newFileName'.") fileListPage.renameFile(discussionAttachmentFile.name, newFileName) - Log.d(STEP_TAG,"Assert that the file is displayed with it's new file name: $newFileName.") + Log.d(STEP_TAG,"Assert that the file is displayed with it's new file name: '$newFileName'.") fileListPage.assertItemDisplayed(newFileName) - Log.d(STEP_TAG,"Delete $newFileName file.") + Log.d(STEP_TAG,"Delete '$newFileName' file.") fileListPage.deleteFile(newFileName) Log.d(STEP_TAG,"Assert that empty view is displayed after deletion.") @@ -224,54 +224,4 @@ class FilesE2ETest: StudentTest() { Log.d(STEP_TAG,"Assert that there is a folder called '$testFolderName' is displayed.") fileListPage.assertItemDisplayed(testFolderName) } - - private fun commentOnSubmission( - student: CanvasUserApiModel, - course: CourseApiModel, - assignment: AssignmentApiModel, - commentUploadInfo: AttachmentApiModel - ) { - SubmissionsApi.commentOnSubmission( - studentToken = student.token, - courseId = course.id, - assignmentId = assignment.id, - fileIds = mutableListOf(commentUploadInfo.id) - ) - } - - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - withDescription = false, - submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD), - allowedExtensions = listOf("txt"), - teacherToken = teacher.token - ) - ) - - private fun submitAssignment( - course: CourseApiModel, - assignment: AssignmentApiModel, - submissionUploadInfo: AttachmentApiModel, - student: CanvasUserApiModel - ) { - SubmissionsApi.submitCourseAssignment( - submissionType = SubmissionType.ONLINE_UPLOAD, - courseId = course.id, - assignmentId = assignment.id, - fileIds = mutableListOf(submissionUploadInfo.id), - studentToken = student.token - ) - } - - private fun createDiscussion( - course: CourseApiModel, - student: CanvasUserApiModel - ) = DiscussionTopicsApi.createDiscussion( - courseId = course.id, - token = student.token - ) } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt index 2858633f86..253bc5dcdf 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt @@ -4,13 +4,14 @@ import android.util.Log import androidx.test.espresso.Espresso import androidx.test.espresso.matcher.ViewMatchers.withText import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.QuizzesApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.QuizAnswer import com.instructure.dataseeding.model.QuizQuestion @@ -18,10 +19,6 @@ import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData @@ -31,6 +28,7 @@ import org.junit.Test @HiltAndroidTest class GradesE2ETest: StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @@ -46,9 +44,9 @@ class GradesE2ETest: StudentTest() { val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val assignment = createAssignment(course, teacher) - val assignment2 = createAssignment(course, teacher) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, withDescription = true, gradingType = GradingType.PERCENT, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601) + val assignment2 = AssignmentsApi.createAssignment(course.id, teacher.token, withDescription = true, gradingType = GradingType.PERCENT, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601) Log.d(PREPARATION_TAG,"Create a quiz with some questions.") val quizQuestions = makeQuizQuestions() @@ -60,7 +58,7 @@ class GradesE2ETest: StudentTest() { tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select ${course.name} course.") + Log.d(STEP_TAG,"Select '${course.name}' course.") dashboardPage.selectCourse(course) Log.d(STEP_TAG,"Navigate to Grades Page.") @@ -71,7 +69,7 @@ class GradesE2ETest: StudentTest() { val assignmentMatcher = withText(assignment.name) val quizMatcher = withText(quiz.title) - Log.d(STEP_TAG,"Refresh the page. Assert that the ${assignment.name} assignment and ${quiz.title} quiz are displayed and there is no grade for them.") + Log.d(STEP_TAG,"Refresh the page. Assert that the '${assignment.name}' assignment and '${quiz.title}' quiz are displayed and there is no grade for them.") courseGradesPage.refresh() courseGradesPage.assertItemDisplayed(assignmentMatcher) courseGradesPage.assertGradeNotDisplayed(assignmentMatcher) @@ -81,7 +79,7 @@ class GradesE2ETest: StudentTest() { Log.d(STEP_TAG,"Check in the 'What-If Score' checkbox.") courseGradesPage.toggleWhatIf() - Log.d(STEP_TAG,"Enter '12' as a what-if grade for ${assignment.name} assignment.") + Log.d(STEP_TAG,"Enter '12' as a what-if grade for '${assignment.name}' assignment.") courseGradesPage.enterWhatIfGrade(assignmentMatcher, "12") Log.d(STEP_TAG,"Assert that 'Total Grade' contains the score '80%'.") @@ -94,10 +92,10 @@ class GradesE2ETest: StudentTest() { courseGradesPage.assertTotalGrade(withText(R.string.noGradeText)) Log.d(PREPARATION_TAG,"Seed a submission for '${assignment.name}' assignment.") - submitAssignment(course, assignment, student) + SubmissionsApi.submitCourseAssignment(course.id, student.token, assignment.id, SubmissionType.ONLINE_TEXT_ENTRY) Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment.name}' assignment.") - gradeSubmission(teacher, course, assignment, student, "9",false) + SubmissionsApi.gradeSubmission(teacher.token, course.id, assignment.id, student.id, postedGrade = "9") Log.d(STEP_TAG,"Refresh the page. Assert that the assignment's score is '60%'.") courseGradesPage.refresh() @@ -114,10 +112,10 @@ class GradesE2ETest: StudentTest() { courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("60")) Log.d(PREPARATION_TAG,"Seed a submission for '${assignment2.name}' assignment.") - submitAssignment(course, assignment2, student) + SubmissionsApi.submitCourseAssignment(course.id, student.token, assignment2.id, SubmissionType.ONLINE_TEXT_ENTRY) Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment2.name}' assignment.") - gradeSubmission(teacher, course, assignment2, student, "10", excused = false) + SubmissionsApi.gradeSubmission(teacher.token, course.id, assignment2.id, student.id, postedGrade = "10") Log.d(STEP_TAG,"Assert that we can see the correct score at the '${assignment2.name}' assignment (66.67%) and at the total score as well (63.33%).") courseGradesPage.refresh() @@ -128,13 +126,13 @@ class GradesE2ETest: StudentTest() { courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("63.33")) Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment.name}' assignment.") - gradeSubmission(teacher, course, assignment, student, excused = true) + SubmissionsApi.gradeSubmission(teacher.token, course.id, assignment.id, student.id, excused = true) courseGradesPage.refresh() Log.d(STEP_TAG,"Assert that we can see the correct score (66.67%).") courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("66.67")) - gradeSubmission(teacher, course, assignment, student, "9",false) + SubmissionsApi.gradeSubmission(teacher.token, course.id, assignment.id, student.id, postedGrade = "9") courseGradesPage.refresh() Log.d(STEP_TAG,"Assert that we can see the correct score (63.33%).") @@ -194,54 +192,4 @@ class GradesE2ETest: StudentTest() { ) ) - - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - withDescription = true, - dueAt = 1.days.fromNow.iso8601, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - teacherToken = teacher.token, - gradingType = GradingType.PERCENT, - pointsPossible = 15.0 - ) - ) - } - - private fun submitAssignment( - course: CourseApiModel, - assignment: AssignmentApiModel, - student: CanvasUserApiModel - ) { - SubmissionsApi.submitCourseAssignment( - submissionType = SubmissionType.ONLINE_TEXT_ENTRY, - courseId = course.id, - assignmentId = assignment.id, - fileIds = mutableListOf(), - studentToken = student.token - ) - } - - private fun gradeSubmission( - teacher: CanvasUserApiModel, - course: CourseApiModel, - assignment: AssignmentApiModel, - student: CanvasUserApiModel, - postedGrade: String? = null, - excused: Boolean, - ) { - SubmissionsApi.gradeSubmission( - teacherToken = teacher.token, - courseId = course.id, - assignmentId = assignment.id, - studentId = student.id, - postedGrade = postedGrade, - excused = excused - ) - } - } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt index b2d370238f..7ee14b2b5e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt @@ -21,14 +21,14 @@ import android.util.Log import androidx.test.espresso.Espresso import androidx.test.espresso.matcher.ViewMatchers import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.dataseeding.api.ConversationsApi import com.instructure.dataseeding.api.GroupsApi -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.espresso.retryWithIncreasingDelay import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -45,6 +45,7 @@ class InboxE2ETest: StudentTest() { @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.INBOX, TestCategory.E2E) fun testInboxSelectedButtonActionsE2E() { + Log.d(PREPARATION_TAG, "Seeding data.") val data = seedData(students = 2, teachers = 1, courses = 1) val teacher = data.teachersList[0] @@ -52,9 +53,11 @@ class InboxE2ETest: StudentTest() { val student1 = data.studentsList[0] val student2 = data.studentsList[1] + Log.d(PREPARATION_TAG, "Create a course group category and a group based on that category.") val groupCategory = GroupsApi.createCourseGroupCategory(course.id, teacher.token) val group = GroupsApi.createGroup(groupCategory.id, teacher.token) - Log.d(PREPARATION_TAG, "Create group membership for ${student1.name} and ${student2.name} students to the group: ${group.name}.") + + Log.d(PREPARATION_TAG, "Create group membership for '${student1.name}' and '${student2.name}' students to the group: '${group.name}'.") GroupsApi.createGroupMembership(group.id, student1.id, teacher.token) GroupsApi.createGroupMembership(group.id, student2.id, teacher.token) @@ -67,19 +70,19 @@ class InboxE2ETest: StudentTest() { dashboardPage.clickInboxTab() inboxPage.assertInboxEmpty() - Log.d(PREPARATION_TAG,"Seed an email from the teacher to ${student1.name} and ${student2.name} students.") - val seededConversation = createConversation(teacher, student1, student2)[0] + Log.d(PREPARATION_TAG,"Seed an email from the teacher to '${student1.name}' and '${student2.name}' students.") + val seededConversation = ConversationsApi.createConversation(teacher.token, listOf(student1.id.toString(), student2.id.toString()))[0] Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.") refresh() inboxPage.assertHasConversation() inboxPage.assertConversationDisplayed(seededConversation) - Log.d(STEP_TAG,"Select ${seededConversation.subject} conversation. Assert that is has not been starred already.") + Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Assert that is has not been starred already.") inboxPage.openConversation(seededConversation) inboxConversationPage.assertNotStarred() - Log.d(STEP_TAG,"Toggle Starred to mark ${seededConversation.subject} conversation as favourite. Assert that it has became starred.") + Log.d(STEP_TAG,"Toggle Starred to mark '${seededConversation.subject}' conversation as favourite. Assert that it has became starred.") inboxConversationPage.toggleStarred() inboxConversationPage.assertStarred() @@ -87,25 +90,25 @@ class InboxE2ETest: StudentTest() { Espresso.pressBack() // To main inbox page inboxPage.assertConversationStarred(seededConversation.subject) - Log.d(STEP_TAG,"Select ${seededConversation.subject} conversation. Mark as Unread by clicking on the 'More Options' menu, 'Mark as Unread' menu point.") + Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Mark as Unread by clicking on the 'More Options' menu, 'Mark as Unread' menu point.") inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.GONE) inboxPage.openConversation(seededConversation) inboxConversationPage.markUnread() //After select 'Mark as Unread', we will be navigated back to Inbox Page - Log.d(STEP_TAG,"Assert that ${seededConversation.subject} conversation has been marked as unread.") + Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has been marked as unread.") inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.VISIBLE) - Log.d(STEP_TAG,"Select ${seededConversation.subject} conversation. Archive it by clicking on the 'More Options' menu, 'Archive' menu point.") + Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Archive it by clicking on the 'More Options' menu, 'Archive' menu point.") inboxPage.openConversation(seededConversation) inboxConversationPage.archive() //After select 'Archive', we will be navigated back to Inbox Page - Log.d(STEP_TAG,"Assert that ${seededConversation.subject} conversation has removed from 'All' tab.") //TODO: Discuss this logic if it's ok if we don't show Archived messages on 'All' tab... + Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has removed from 'All' tab.") //TODO: Discuss this logic if it's ok if we don't show Archived messages on 'All' tab... inboxPage.assertConversationNotDisplayed(seededConversation) Log.d(STEP_TAG,"Select 'Archived' conversation filter.") inboxPage.filterInbox("Archived") - Log.d(STEP_TAG,"Assert that ${seededConversation.subject} conversation is displayed by the 'Archived' filter.") + Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation is displayed by the 'Archived' filter.") inboxPage.assertConversationDisplayed(seededConversation) Log.d(STEP_TAG, "Select '${seededConversation.subject}' conversation. Assert that the selected number of conversations on the toolbar is 1." + @@ -118,27 +121,30 @@ class InboxE2ETest: StudentTest() { sleep(2000) - Log.d(STEP_TAG,"Navigate to 'INBOX' scope and assert that ${seededConversation.subject} conversation is displayed.") + Log.d(STEP_TAG,"Navigate to 'INBOX' scope and assert that '${seededConversation.subject}' conversation is displayed.") inboxPage.filterInbox("Inbox") inboxPage.assertConversationDisplayed(seededConversation.subject) - Log.d(STEP_TAG, "Select the conversations (${seededConversation.subject} and star it." + - "Assert that the selected number of conversations on the toolbar is 1 and the conversation is starred.") + Log.d(STEP_TAG, "Select the conversation '${seededConversation.subject}' and unstar it." + + "Assert that the selected number of conversations on the toolbar is 1 and the conversation is not starred.") inboxPage.selectConversations(listOf(seededConversation.subject)) inboxPage.assertSelectedConversationNumber("1") inboxPage.clickUnstar() - inboxPage.assertConversationNotStarred(seededConversation.subject) - Log.d(STEP_TAG, "Select the conversations (${seededConversation.subject} and archive it. Assert that it has not displayed in the 'INBOX' scope.") + retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = { refresh() }) { + inboxPage.assertConversationNotStarred(seededConversation.subject) + } + + Log.d(STEP_TAG, "Select the conversation '${seededConversation.subject}' and archive it. Assert that it has not displayed in the 'INBOX' scope.") inboxPage.selectConversations(listOf(seededConversation.subject)) inboxPage.clickArchive() inboxPage.assertConversationNotDisplayed(seededConversation.subject) - sleep(2000) - Log.d(STEP_TAG, "Navigate to 'ARCHIVED' scope and assert that the conversation is displayed there.") inboxPage.filterInbox("Archived") - inboxPage.assertConversationDisplayed(seededConversation.subject) + retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = { refresh() }) { + inboxPage.assertConversationDisplayed(seededConversation.subject) + } Log.d(STEP_TAG, "Navigate to 'UNREAD' scope and assert that the conversation is displayed there, because a conversation cannot be archived and unread at the same time.") inboxPage.filterInbox("Unread") @@ -148,7 +154,7 @@ class InboxE2ETest: StudentTest() { inboxPage.filterInbox("Starred") inboxPage.assertConversationNotDisplayed(seededConversation.subject) - Log.d(STEP_TAG,"Navigate to 'INBOX' scope and assert that ${seededConversation.subject} conversation is NOT displayed because it is archived yet.") + Log.d(STEP_TAG,"Navigate to 'INBOX' scope and assert that '${seededConversation.subject}' conversation is NOT displayed because it is archived yet.") inboxPage.filterInbox("Inbox") inboxPage.assertConversationNotDisplayed(seededConversation.subject) @@ -161,14 +167,15 @@ class InboxE2ETest: StudentTest() { Log.d(STEP_TAG, "Select the conversation. Unarchive it, and assert that it has not displayed in the 'ARCHIVED' scope.") inboxPage.selectConversations(listOf(seededConversation.subject)) inboxPage.clickUnArchive() - inboxPage.assertConversationNotDisplayed(seededConversation.subject) + + retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = { refresh() }) { + inboxPage.assertConversationNotDisplayed(seededConversation.subject) + } Log.d(STEP_TAG, "Navigate to 'STARRED' scope and assert that the conversations is displayed there.") inboxPage.filterInbox("Starred") inboxPage.assertConversationDisplayed(seededConversation.subject) - sleep(2000) - Log.d(STEP_TAG, "Navigate to 'INBOX' scope and assert that the conversation is displayed there because it is not archived yet.") inboxPage.filterInbox("Inbox") inboxPage.assertConversationDisplayed(seededConversation.subject) @@ -186,9 +193,11 @@ class InboxE2ETest: StudentTest() { val student1 = data.studentsList[0] val student2 = data.studentsList[1] + Log.d(PREPARATION_TAG, "Create a course group category and a group based on that category.") val groupCategory = GroupsApi.createCourseGroupCategory(course.id, teacher.token) val group = GroupsApi.createGroup(groupCategory.id, teacher.token) - Log.d(PREPARATION_TAG, "Create group membership for ${student1.name} and ${student2.name} students to the group: ${group.name}.") + + Log.d(PREPARATION_TAG, "Create group membership for '${student1.name}' and '${student2.name}' students to the group: '${group.name}'.") GroupsApi.createGroupMembership(group.id, student1.id, teacher.token) GroupsApi.createGroupMembership(group.id, student2.id, teacher.token) @@ -201,8 +210,8 @@ class InboxE2ETest: StudentTest() { dashboardPage.clickInboxTab() inboxPage.assertInboxEmpty() - Log.d(PREPARATION_TAG,"Seed an email from the teacher to ${student1.name} and ${student2.name} students.") - val seededConversation = createConversation(teacher, student1, student2)[0] + Log.d(PREPARATION_TAG,"Seed an email from the teacher to '${student1.name}' and '${student2.name}' students.") + val seededConversation = ConversationsApi.createConversation(teacher.token, listOf(student1.id.toString(), student2.id.toString()))[0] Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.") refresh() @@ -214,7 +223,7 @@ class InboxE2ETest: StudentTest() { val newMessageSubject = "Hey There" val newMessage = "Just checking in" - Log.d(STEP_TAG,"Create a new message with subject: $newMessageSubject, and message: $newMessage") + Log.d(STEP_TAG,"Create a new message with subject: '$newMessageSubject', and message: '$newMessage'") newMessagePage.populateMessage(course, student2, newMessageSubject, newMessage) Log.d(STEP_TAG,"Click on 'Send' button.") @@ -225,7 +234,7 @@ class InboxE2ETest: StudentTest() { val newGroupMessageSubject = "Group Message" val newGroupMessage = "Testing Group ${group.name}" - Log.d(STEP_TAG,"Create a new message with subject: $newGroupMessageSubject, and message: $newGroupMessage") + Log.d(STEP_TAG,"Create a new message with subject: '$newGroupMessageSubject', and message: '$newGroupMessage'") newMessagePage.populateGroupMessage(group, student2, newGroupMessageSubject, newGroupMessage) Log.d(STEP_TAG,"Click on 'Send' button.") @@ -237,7 +246,7 @@ class InboxE2ETest: StudentTest() { inboxPage.goToDashboard() dashboardPage.waitForRender() - Log.d(STEP_TAG,"Log out with ${student1.name} student.") + Log.d(STEP_TAG,"Log out with '${student1.name}' student.") leftSideNavigationDrawerPage.logout() Log.d(STEP_TAG,"Login with user: ${student2.name}, login id: ${student2.loginId}.") @@ -250,13 +259,13 @@ class InboxE2ETest: StudentTest() { inboxPage.assertConversationDisplayed(newMessageSubject) inboxPage.assertConversationDisplayed("Group Message") - Log.d(STEP_TAG,"Select $newGroupMessageSubject conversation.") + Log.d(STEP_TAG,"Select '$newGroupMessageSubject' conversation.") inboxPage.openConversation(newMessageSubject) val newReplyMessage = "This is a quite new reply message." Log.d(STEP_TAG,"Reply to $newGroupMessageSubject conversation with '$newReplyMessage' message. Assert that the reply is displayed.") inboxConversationPage.replyToMessage(newReplyMessage) - Log.d(STEP_TAG,"Delete $newReplyMessage reply and assert is has been deleted.") + Log.d(STEP_TAG,"Delete '$newReplyMessage' reply and assert is has been deleted.") inboxConversationPage.deleteMessage(newReplyMessage) inboxConversationPage.assertMessageNotDisplayed(newReplyMessage) @@ -266,7 +275,7 @@ class InboxE2ETest: StudentTest() { inboxPage.assertConversationDisplayed(seededConversation) inboxPage.assertConversationDisplayed("Group Message") - Log.d(STEP_TAG, "Navigate to 'INBOX' scope and seledct '$newGroupMessageSubject' conversation.") + Log.d(STEP_TAG, "Navigate to 'INBOX' scope and select '$newGroupMessageSubject' conversation.") inboxPage.filterInbox("Inbox") inboxPage.selectConversation(newGroupMessageSubject) @@ -280,6 +289,7 @@ class InboxE2ETest: StudentTest() { @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.INBOX, TestCategory.E2E) fun testInboxSwipeGesturesE2E() { + Log.d(PREPARATION_TAG, "Seeding data.") val data = seedData(students = 2, teachers = 1, courses = 1) val teacher = data.teachersList[0] @@ -287,9 +297,11 @@ class InboxE2ETest: StudentTest() { val student1 = data.studentsList[0] val student2 = data.studentsList[1] + Log.d(PREPARATION_TAG, "Create a course group category and a group based on that category.") val groupCategory = GroupsApi.createCourseGroupCategory(course.id, teacher.token) val group = GroupsApi.createGroup(groupCategory.id, teacher.token) - Log.d(PREPARATION_TAG, "Create group membership for ${student1.name} and ${student2.name} students to the group: ${group.name}.") + + Log.d(PREPARATION_TAG, "Create group membership for '${student1.name}' and '${student2.name}' students to the group: '${group.name}'.") GroupsApi.createGroupMembership(group.id, student1.id, teacher.token) GroupsApi.createGroupMembership(group.id, student2.id, teacher.token) @@ -302,8 +314,8 @@ class InboxE2ETest: StudentTest() { dashboardPage.clickInboxTab() inboxPage.assertInboxEmpty() - Log.d(PREPARATION_TAG,"Seed an email from the teacher to ${student1.name} and ${student2.name} students.") - val seededConversation = createConversation(teacher, student1, student2)[0] + Log.d(PREPARATION_TAG,"Seed an email from the teacher to '${student1.name}' and '${student2.name}' students.") + val seededConversation = ConversationsApi.createConversation(teacher.token, listOf(student1.id.toString(), student2.id.toString()))[0] Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.") refresh() @@ -342,11 +354,12 @@ class InboxE2ETest: StudentTest() { inboxPage.assertConversationStarred(seededConversation.subject) inboxPage.clickMarkAsUnread() - sleep(1000) - Log.d(STEP_TAG, "Navigate to 'STARRED' scope. Assert that the conversation is displayed in the 'STARRED' scope.") inboxPage.filterInbox("Starred") - inboxPage.assertConversationDisplayed(seededConversation.subject) + + retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = { refresh() }) { + inboxPage.assertConversationDisplayed(seededConversation.subject) + } Log.d(STEP_TAG, "Swipe '${seededConversation.subject}' left and assert it is removed from the 'STARRED' scope because it has became unstarred.") inboxPage.swipeConversationLeft(seededConversation) @@ -398,7 +411,7 @@ class InboxE2ETest: StudentTest() { inboxPage.openConversationWithRecipients(recipientList) inboxConversationPage.assertMessageDisplayed(questionText) - Log.d(STEP_TAG,"Log out with ${student.name} student.") + Log.d(STEP_TAG,"Log out with '${student.name}' student.") Espresso.pressBack() leftSideNavigationDrawerPage.logout() @@ -406,9 +419,10 @@ class InboxE2ETest: StudentTest() { tokenLogin(teacher) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Open Inbox Page. Assert that the asked question is displayed in the teacher's inbox with the proper recipients ($recipientList) and message ($questionText).") + Log.d(STEP_TAG,"Open Inbox Page. Assert that the asked question is displayed in the teacher's inbox with the proper recipients ($recipientList), subject and message ($questionText).") dashboardPage.clickInboxTab() inboxPage.assertConversationWithRecipientsDisplayed(recipientList) + inboxPage.assertConversationSubject("(No Subject)") inboxPage.assertConversationDisplayed(questionText) Log.d(STEP_TAG, "Open the conversation and assert that there is no subject of the conversation and the message body is equal to which the student typed in the 'Ask Your Instructor' dialog: '$questionText'.") @@ -416,13 +430,4 @@ class InboxE2ETest: StudentTest() { inboxConversationPage.assertMessageDisplayed(questionText) inboxConversationPage.assertNoSubjectDisplayed() } - - private fun createConversation( - teacher: CanvasUserApiModel, - student1: CanvasUserApiModel, - student2: CanvasUserApiModel - ) = ConversationsApi.createConversation( - token = teacher.token, - recipients = listOf(student1.id.toString(), student2.id.toString()) - ) } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt index 03c3a51ddc..12526c1bac 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt @@ -18,6 +18,10 @@ package com.instructure.student.ui.e2e import android.util.Log import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.CoursesApi import com.instructure.dataseeding.api.EnrollmentsApi import com.instructure.dataseeding.api.SeedApi @@ -27,10 +31,6 @@ import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.EnrollmentTypes.STUDENT_ENROLLMENT import com.instructure.dataseeding.model.EnrollmentTypes.TEACHER_ENROLLMENT import com.instructure.dataseeding.util.CanvasNetworkAdapter -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.ViewUtils import com.instructure.student.ui.utils.seedData @@ -39,6 +39,7 @@ import org.junit.Test @HiltAndroidTest class LoginE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @@ -59,7 +60,7 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG, "Assert that the Dashboard Page is the landing page and it is loaded successfully.") assertDashboardPageDisplayed(student1) - Log.d(STEP_TAG, "Log out with ${student1.name} student.") + Log.d(STEP_TAG, "Log out with '${student1.name}' student.") leftSideNavigationDrawerPage.logout() Log.d(STEP_TAG, "Login with user: ${student2.name}, login id: ${student2.loginId}.") @@ -83,15 +84,15 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG, "Click on 'Change User' button on the left-side menu.") leftSideNavigationDrawerPage.clickChangeUserMenu() - Log.d(STEP_TAG, "Assert that the previously logins has been displayed. Assert that ${student1.name} and ${student2.name} students are displayed within the previous login section.") + Log.d(STEP_TAG, "Assert that the previously logins has been displayed. Assert that '${student1.name}' and '${student2.name}' students are displayed within the previous login section.") loginLandingPage.assertDisplaysPreviousLogins() loginLandingPage.assertPreviousLoginUserDisplayed(student1.name) loginLandingPage.assertPreviousLoginUserDisplayed(student2.name) - Log.d(STEP_TAG, "Remove ${student1.name} student from the previous login section.") + Log.d(STEP_TAG, "Remove '${student1.name}' student from the previous login section.") loginLandingPage.removeUserFromPreviousLogins(student1.name) - Log.d(STEP_TAG, "Login with the previous user, ${student2.name}, with one click, by clicking on the user's name on the bottom.") + Log.d(STEP_TAG, "Login with the previous user, '${student2.name}', with one click, by clicking on the user's name on the bottom.") loginLandingPage.loginWithPreviousUser(student2) Log.d(STEP_TAG, "Assert that the Dashboard Page is the landing page and it is loaded successfully.") @@ -100,18 +101,17 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG, "Click on 'Change User' button on the left-side menu.") leftSideNavigationDrawerPage.clickChangeUserMenu() - Log.d(STEP_TAG, "Assert that the previously logins has been displayed. Assert that ${student1.name} and ${student2.name} students are displayed within the previous login section.") + Log.d(STEP_TAG, "Assert that the previously logins has been displayed. Assert that '${student1.name}' and '${student2.name}' students are displayed within the previous login section.") loginLandingPage.assertDisplaysPreviousLogins() loginLandingPage.assertPreviousLoginUserDisplayed(student2.name) - Log.d(STEP_TAG, "Remove ${student2.name} student from the previous login section.") + Log.d(STEP_TAG, "Remove '${student2.name}' student from the previous login section.") loginLandingPage.removeUserFromPreviousLogins(student2.name) - Log.d(STEP_TAG, "Assert that none of the students, ${student1.name} and ${student2.name} are displayed and not even the 'Previous Logins' label is displayed.") + Log.d(STEP_TAG, "Assert that none of the students, '${student1.name}' and '${student2.name}' are displayed and not even the 'Previous Logins' label is displayed.") loginLandingPage.assertPreviousLoginUserNotExist(student1.name) loginLandingPage.assertPreviousLoginUserNotExist(student2.name) loginLandingPage.assertNotDisplaysPreviousLogins() - } @E2E @@ -138,7 +138,6 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG, "Assert that the Dashboard Page is the landing page and it is loaded successfully.") assertDashboardPageDisplayed(student2) - } @E2E @@ -162,37 +161,37 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") loginWithUser(student) - Log.d(STEP_TAG,"Validate ${student.name} user's role as a Student.") + Log.d(STEP_TAG,"Validate '${student.name}' user's role as a Student.") validateUserAndRole(student, course, "Student") Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(2) - Log.d(STEP_TAG,"Log out with ${student.name} student.") + Log.d(STEP_TAG,"Log out with '${student.name}' student.") leftSideNavigationDrawerPage.logout() Log.d(STEP_TAG,"Login with user: ${teacher.name}, login id: ${teacher.loginId}.") loginWithUser(teacher, true) - Log.d(STEP_TAG,"Validate ${teacher.name} user's role as a Teacher.") + Log.d(STEP_TAG,"Validate '${teacher.name}' user's role as a Teacher.") validateUserAndRole(teacher, course, "Teacher") Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(2) - Log.d(STEP_TAG,"Log out with ${teacher.name} teacher.") + Log.d(STEP_TAG,"Log out with '${teacher.name}' teacher.") leftSideNavigationDrawerPage.logout() Log.d(STEP_TAG,"Login with user: ${ta.name}, login id: ${ta.loginId}.") loginWithUser(ta, true) - Log.d(STEP_TAG,"Validate ${ta.name} user's role as a TA.") + Log.d(STEP_TAG,"Validate '${ta.name}' user's role as a TA (Teacher Assistant).") validateUserAndRole(ta, course, "TA") Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(2) - Log.d(STEP_TAG,"Log out with ${ta.name} teacher assistant.") + Log.d(STEP_TAG,"Log out with '${ta.name}' teacher assistant.") leftSideNavigationDrawerPage.logout() Log.d(STEP_TAG,"Login with user: ${parent.name}, login id: ${parent.loginId}.") @@ -201,7 +200,7 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG,"Assert that the Dashboard Page is the landing page and it is loaded successfully.") assertDashboardPageDisplayed(parent) - Log.d(STEP_TAG,"Log out with ${parent.name} parent.") + Log.d(STEP_TAG,"Log out with '${parent.name}' parent.") leftSideNavigationDrawerPage.logout() } @@ -261,45 +260,33 @@ class LoginE2ETest : StudentTest() { val enrollmentsService = retrofitClient.create(EnrollmentsApi.EnrollmentsService::class.java) Log.d(PREPARATION_TAG,"Create student, teacher, and a course via API.") - val student = UserApi.createCanvasUser(userService = userService, userDomain = domain) - val teacher = UserApi.createCanvasUser(userService = userService, userDomain = domain) + val student = UserApi.createCanvasUser(userService, domain) + val teacher = UserApi.createCanvasUser(userService, domain) val course = CoursesApi.createCourse(coursesService = coursesService) - Log.d(PREPARATION_TAG,"Enroll ${student.name} student to ${course.name} course.") - enrollUser(course, student, STUDENT_ENROLLMENT, enrollmentsService) + Log.d(PREPARATION_TAG,"Enroll '${student.name}' student to '${course.name}' course.") + EnrollmentsApi.enrollUser(course.id, student.id, STUDENT_ENROLLMENT, enrollmentsService) - Log.d(PREPARATION_TAG,"Enroll ${teacher.name} teacher to ${course.name} course.") - enrollUser(course, teacher, TEACHER_ENROLLMENT, enrollmentsService) + Log.d(PREPARATION_TAG,"Enroll '${teacher.name}' teacher to '${course.name}' course.") + EnrollmentsApi.enrollUser(course.id, teacher.id, TEACHER_ENROLLMENT, enrollmentsService) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") loginWithUser(student) - Log.d(STEP_TAG,"Attempt to sign into our vanity domain, and validate ${student.name} user's role as a Student.") + Log.d(STEP_TAG,"Attempt to sign into our vanity domain, and validate '${student.name}' user's role as a Student.") validateUserAndRole(student, course,"Student" ) Log.d(STEP_TAG,"Navigate back to Dashboard Page.") ViewUtils.pressBackButton(2) - Log.d(STEP_TAG,"Log out with ${student.name} student.") + Log.d(STEP_TAG,"Log out with '${student.name}' student.") leftSideNavigationDrawerPage.logout() } - private fun enrollUser( - course: CourseApiModel, - student: CanvasUserApiModel, - enrollmentType: String, - enrollmentsService: EnrollmentsApi.EnrollmentsService - ) { - EnrollmentsApi.enrollUser( - courseId = course.id, - userId = student.id, - enrollmentType = enrollmentType, - enrollmentService = enrollmentsService - ) - } - private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) { + Thread.sleep(5100) //Need to wait > 5 seconds before each login attempt because of new 'too many attempts' login policy on web. + if(lastSchoolSaved) { Log.d(STEP_TAG,"Click 'Find Another School' button.") loginLandingPage.clickFindAnotherSchoolButton() @@ -309,7 +296,7 @@ class LoginE2ETest : StudentTest() { loginLandingPage.clickFindMySchoolButton() } - Log.d(STEP_TAG,"Enter domain: ${user.domain}.") + Log.d(STEP_TAG,"Enter domain: '${user.domain}'.") loginFindSchoolPage.enterDomain(user.domain) Log.d(STEP_TAG,"Click on 'Next' button on the Toolbar.") @@ -322,7 +309,7 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG, "Click on last saved school's button.") loginLandingPage.clickOnLastSavedSchoolButton() - Log.d(STEP_TAG, "Login with ${user.name} user.") + Log.d(STEP_TAG, "Login with '${user.name}' user.") loginSignInPage.loginAs(user) } @@ -331,11 +318,11 @@ class LoginE2ETest : StudentTest() { Log.d(STEP_TAG,"Assert that the Dashboard Page is the landing page and it is loaded successfully.") assertDashboardPageDisplayed(user) - Log.d(STEP_TAG,"Navigate to 'People' Page of ${course.name} course.") + Log.d(STEP_TAG,"Navigate to 'People' Page of '${course.name}' course.") dashboardPage.selectCourse(course) courseBrowserPage.selectPeople() - Log.d(STEP_TAG,"Assert that ${user.name} user's role is: $role.") + Log.d(STEP_TAG,"Assert that '${user.name}' user's role is: $role.") peopleListPage.assertPersonListed(user, role) } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt index 48f911a9a0..ad88ae8ba2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt @@ -19,23 +19,21 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.DiscussionTopicsApi import com.instructure.dataseeding.api.ModulesApi import com.instructure.dataseeding.api.PagesApi import com.instructure.dataseeding.api.QuizzesApi -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel -import com.instructure.dataseeding.model.ModuleApiModel +import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.ModuleItemTypes import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -44,6 +42,7 @@ import org.junit.Test @HiltAndroidTest class ModulesE2ETest: StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @@ -59,51 +58,51 @@ class ModulesE2ETest: StudentTest() { val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.") - val assignment1 = createAssignment(course, true, teacher, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.") + val assignment1 = AssignmentsApi.createAssignment(course.id, teacher.token, withDescription = true, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Seeding another assignment for ${course.name} course.") - val assignment2 = createAssignment(course, true, teacher, 2.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seeding another assignment for '${course.name}' course.") + val assignment2 = AssignmentsApi.createAssignment(course.id, teacher.token, dueAt = 2.days.fromNow.iso8601, withDescription = true, gradingType = GradingType.POINTS, pointsPossible = 15.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Create a PUBLISHED quiz for ${course.name} course.") - val quiz1 = createQuiz(course, teacher) + Log.d(PREPARATION_TAG,"Create a PUBLISHED quiz for '${course.name}' course.") + val quiz1 = QuizzesApi.createQuiz(course.id, teacher.token, dueAt = 3.days.fromNow.iso8601) - Log.d(PREPARATION_TAG,"Create a page for ${course.name} course.") - val page1 = createCoursePage(course, teacher) + Log.d(PREPARATION_TAG,"Create a page for '${course.name}' course.") + val page1 = PagesApi.createCoursePage(course.id, teacher.token) - Log.d(PREPARATION_TAG,"Create a discussion topic for ${course.name} course.") - val discussionTopic1 = createDiscussion(course, teacher) + Log.d(PREPARATION_TAG,"Create a discussion topic for '${course.name}' course.") + val discussionTopic1 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token) //Modules start out as unpublished. - Log.d(PREPARATION_TAG,"Create a module for ${course.name} course.") - val module1 = createModule(course, teacher) + Log.d(PREPARATION_TAG,"Create a module for '${course.name}' course.") + val module1 = ModulesApi.createModule(course.id, teacher.token) - Log.d(PREPARATION_TAG,"Create another module for ${course.name} course.") - val module2 = createModule(course, teacher) + Log.d(PREPARATION_TAG,"Create another module for '${course.name}' course.") + val module2 = ModulesApi.createModule(course.id, teacher.token) - Log.d(PREPARATION_TAG,"Associate ${assignment1.name} assignment with ${module1.name} module.") - createModuleItem(course.id, module1.id, teacher, assignment1.name, ModuleItemTypes.ASSIGNMENT.stringVal, assignment1.id.toString()) + Log.d(PREPARATION_TAG,"Associate '${assignment1.name}' assignment with '${module1.name}' module.") + ModulesApi.createModuleItem(course.id, teacher.token, module1.id, assignment1.name, ModuleItemTypes.ASSIGNMENT.stringVal, contentId = assignment1.id.toString()) - Log.d(PREPARATION_TAG,"Associate ${quiz1.title} quiz with ${module1.name} module.") - createModuleItem(course.id, module1.id, teacher, quiz1.title, ModuleItemTypes.QUIZ.stringVal, quiz1.id.toString()) + Log.d(PREPARATION_TAG,"Associate '${quiz1.title}' quiz with '${module1.name}' module.") + ModulesApi.createModuleItem(course.id, teacher.token, module1.id, quiz1.title, ModuleItemTypes.QUIZ.stringVal, contentId = quiz1.id.toString()) - Log.d(PREPARATION_TAG,"Associate ${assignment2.name} assignment with ${module2.name} module.") - createModuleItem(course.id, module2.id, teacher, assignment2.name, ModuleItemTypes.ASSIGNMENT.stringVal, assignment2.id.toString()) + Log.d(PREPARATION_TAG,"Associate '${assignment2.name}' assignment with '${module2.name}' module.") + ModulesApi.createModuleItem(course.id, teacher.token, module2.id, assignment2.name, ModuleItemTypes.ASSIGNMENT.stringVal, contentId = assignment2.id.toString()) - Log.d(PREPARATION_TAG,"Associate ${page1.title} page with ${module2.name} module.") - createModuleItem(course.id, module2.id, teacher, page1.title, ModuleItemTypes.PAGE.stringVal, null, page1.url) + Log.d(PREPARATION_TAG,"Associate '${discussionTopic1.title}' discussion topic with '${module2.name}' module.") + ModulesApi.createModuleItem(course.id, teacher.token, module2.id, discussionTopic1.title, ModuleItemTypes.DISCUSSION.stringVal, contentId = discussionTopic1.id.toString()) - Log.d(PREPARATION_TAG,"Associate ${discussionTopic1.title} discussion topic with ${module2.name} module.") - createModuleItem(course.id, module2.id, teacher, discussionTopic1.title, ModuleItemTypes.DISCUSSION.stringVal, discussionTopic1.id.toString()) + Log.d(PREPARATION_TAG,"Associate '${quiz1.title}' page with '${module2.name}' module.") + ModulesApi.createModuleItem(course.id, teacher.token, module2.id, page1.title, ModuleItemTypes.PAGE.stringVal, pageUrl = page1.url) Log.d(STEP_TAG, "Login with user: ${teacher.name}, login id: ${teacher.loginId}.") tokenLogin(student) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Assert that ${course.name} course is displayed.") + Log.d(STEP_TAG,"Assert that '${course.name}' course is displayed.") dashboardPage.assertDisplaysCourse(course) - Log.d(STEP_TAG,"Select ${course.name} course.") + Log.d(STEP_TAG,"Select '${course.name}' course.") dashboardPage.selectCourse(course) Log.d(STEP_TAG,"Assert that there are no modules displayed yet because there are not published. Assert that the 'Modules' Tab is not displayed as well.") @@ -117,11 +116,11 @@ class ModulesE2ETest: StudentTest() { Log.d(STEP_TAG,"Navigate back to Course Browser Page.") Espresso.pressBack() - Log.d(PREPARATION_TAG,"Publish ${module1.name} module.") - publishModule(course, module1, teacher) + Log.d(PREPARATION_TAG,"Publish '${module1.name}' module.") + ModulesApi.updateModule(course.id, teacher.token, module1.id, published = true) - Log.d(PREPARATION_TAG,"Publish ${module2.name} module.") - publishModule(course, module2, teacher) + Log.d(PREPARATION_TAG,"Publish '${module2.name}' module.") + ModulesApi.updateModule(course.id, teacher.token, module2.id, published = true) Log.d(STEP_TAG,"Refresh the page. Assert that the 'Modules' Tab is displayed.") courseBrowserPage.refresh() @@ -130,13 +129,13 @@ class ModulesE2ETest: StudentTest() { Log.d(STEP_TAG,"Navigate to Modules Page.") courseBrowserPage.selectModules() - Log.d(STEP_TAG,"Assert that ${module1.name} module is displayed with the following items: ${assignment1.name} assignment, ${quiz1.title} quiz.") + Log.d(STEP_TAG,"Assert that '${module1.name}' module is displayed with the following items: '${assignment1.name}' assignment, '${quiz1.title}' quiz.") modulesPage.assertModuleDisplayed(module1) modulesPage.assertModuleItemDisplayed(module1, assignment1.name) modulesPage.assertModuleItemDisplayed(module1, quiz1.title) - Log.d(STEP_TAG,"Assert that ${module2.name} module is displayed with the following items: ${assignment2.name} assignment," + - " ${page1.title} page, ${discussionTopic1.title} discussion topic.") + Log.d(STEP_TAG,"Assert that '${module2.name}' module is displayed with the following items: '${assignment2.name}' assignment," + + " '${page1.title}' page, '${discussionTopic1.title}' discussion topic.") modulesPage.assertModuleDisplayed(module2) modulesPage.assertModuleItemDisplayed(module2, assignment2.name) modulesPage.assertModuleItemDisplayed(module2, page1.title) @@ -150,97 +149,61 @@ class ModulesE2ETest: StudentTest() { modulesPage.clickOnModuleExpandCollapseIcon(module2.name) modulesPage.assertModulesAndItemsCount(7) // 2 modules titles, 2 module items in first module, 3 items in second module - Log.d(STEP_TAG, "Assert that ${assignment1.name} module item is displayed and open it. Assert that the Assignment Details page is displayed with the corresponding assignment title.") + Log.d(STEP_TAG, "Assert that '${assignment1.name}' module item is displayed and open it. Assert that the Assignment Details page is displayed with the corresponding assignment name: '${assignment1.name}'.") modulesPage.assertAndClickModuleItem(module1.name, assignment1.name, true) assignmentDetailsPage.assertPageObjects() assignmentDetailsPage.assertAssignmentTitle(assignment1.name) - } - private fun publishModule( - course: CourseApiModel, - module1: ModuleApiModel, - teacher: CanvasUserApiModel - ) { - ModulesApi.updateModule( - courseId = course.id, - id = module1.id, - published = true, - teacherToken = teacher.token - ) - } + Log.d(STEP_TAG, "Assert that the module name, '${module1.name}' is displayed at the bottom.") + assignmentDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(module1.name) - private fun createModuleItem( - courseId: Long, - moduleId: Long, - teacher: CanvasUserApiModel, - title: String, - moduleItemType: String, - contentId: String?, - pageUrl: String? = null - ) { - ModulesApi.createModuleItem( - courseId = courseId, - moduleId = moduleId, - teacherToken = teacher.token, - title = title, - type = moduleItemType, - contentId = contentId, - pageUrl = pageUrl - ) - } + Log.d(STEP_TAG, "Assert that the previous arrow button is not displayed because the user is on the first module item's details page, but the next arrow button is displayed.") + assignmentDetailsPage.moduleItemInteractions.assertPreviousArrowNotDisplayed() + assignmentDetailsPage.moduleItemInteractions.assertNextArrowDisplayed() + + Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${quiz1.title}' quiz module item's 'Go To Quiz' page is displayed.") + assignmentDetailsPage.moduleItemInteractions.clickOnNextArrow() + goToQuizPage.assertQuizTitle(quiz1.title) + + Log.d(STEP_TAG, "Assert that the module name, '${module1.name}' is displayed at the bottom.") + goToQuizPage.moduleItemInteractions.assertModuleNameDisplayed(module1.name) + + Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed (since we are not at the first or the last module item details page).") + goToQuizPage.moduleItemInteractions.assertPreviousArrowDisplayed() + goToQuizPage.moduleItemInteractions.assertNextArrowDisplayed() + + Log.d(STEP_TAG, "Click on the next arrow button and assert that the Assignment Details Page is displayed with the corresponding assignment name: '${assignment2.name}'.") + goToQuizPage.moduleItemInteractions.clickOnNextArrow() + assignmentDetailsPage.assertPageObjects() + assignmentDetailsPage.assertAssignmentTitle(assignment2.name) - private fun createModule( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = ModulesApi.createModule( - courseId = course.id, - teacherToken = teacher.token, - unlockAt = null - ) - - private fun createDiscussion( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = DiscussionTopicsApi.createDiscussion( - courseId = course.id, - token = teacher.token - ) - - private fun createCoursePage( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = PagesApi.createCoursePage( - courseId = course.id, - published = true, - frontPage = false, - token = teacher.token - ) - - private fun createQuiz( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = QuizzesApi.createQuiz( - QuizzesApi.CreateQuizRequest( - courseId = course.id, - withDescription = true, - dueAt = 3.days.fromNow.iso8601, - token = teacher.token, - published = true - ) - ) - - private fun createAssignment( - course: CourseApiModel, - withDescription: Boolean, - teacher: CanvasUserApiModel, - dueAt: String - ) = AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - withDescription = withDescription, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - teacherToken = teacher.token, - dueAt = dueAt - ) - ) + Log.d(STEP_TAG, "Assert that the second module name, '${module2.name}' is displayed at the bottom since we can navigate even between modules with these arrows.") + assignmentDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(module2.name) + + Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed (since we are not at the first or the last module item details page, even if it's a first item of a module, but of the second module).") + assignmentDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed() + assignmentDetailsPage.moduleItemInteractions.assertNextArrowDisplayed() + + Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${discussionTopic1.title}' discussion topic module item's details page is displayed.") + assignmentDetailsPage.moduleItemInteractions.clickOnNextArrow() + discussionDetailsPage.assertTitleText(discussionTopic1.title) + + Log.d(STEP_TAG, "Assert that the second module name, '${module2.name}' is displayed at the bottom.") + discussionDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(module2.name) + + Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed.") + discussionDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed() + discussionDetailsPage.moduleItemInteractions.assertNextArrowDisplayed() + + Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${page1.url}' page module item's details page is displayed.") + discussionDetailsPage.moduleItemInteractions.clickOnNextArrow() + pageDetailsPage.webAssertPageUrl(page1.url) + + Log.d(STEP_TAG, "Assert that the second module name, '${module2.name}' is displayed at the bottom.") + pageDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(module2.name) + + Log.d(STEP_TAG, "Assert that the previous arrow button is displayed but the next arrow button is not displayed because the user is on the last module item's details page.") + pageDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed() + pageDetailsPage.moduleItemInteractions.assertNextArrowNotDisplayed() + } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt index 80020b123d..5278f57e4e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt @@ -19,14 +19,14 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.NoMatchingViewException import com.instructure.canvas.espresso.E2E -import com.instructure.canvas.espresso.ReleaseExclude +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.QuizzesApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.QuizAnswer import com.instructure.dataseeding.model.QuizQuestion @@ -34,10 +34,6 @@ import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -47,11 +43,11 @@ import java.lang.Thread.sleep @HiltAndroidTest class NotificationsE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit - @ReleaseExclude("The notifications API sometimes is slow and the test is breaking because the notifications aren't show up in time.") @E2E @Test @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.E2E) @@ -63,10 +59,10 @@ class NotificationsE2ETest : StudentTest() { val teacher = data.teachersList[0] val course = data.coursesList[0] - Log.d(PREPARATION_TAG,"Seed an assignment for ${course.name} course.") - val testAssignment = createAssignment(course, teacher) + Log.d(PREPARATION_TAG,"Seed an assignment for '${course.name}' course.") + val testAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Seed a quiz for ${course.name} course with some questions.") + Log.d(PREPARATION_TAG,"Seed a quiz for '${course.name}' course with some questions.") val quizQuestions = makeQuizQuestions() Log.d(PREPARATION_TAG,"Create and publish a quiz with the previously seeded questions.") @@ -111,11 +107,11 @@ class NotificationsE2ETest : StudentTest() { run submitAndGradeRepeat@{ repeat(10) { try { - Log.d(PREPARATION_TAG, "Submit ${testAssignment.name} assignment with student: ${student.name}.") - submitAssignment(course, testAssignment, student) + Log.d(PREPARATION_TAG, "Submit '${testAssignment.name}' assignment with student: '${student.name}'.") + SubmissionsApi.submitCourseAssignment(course.id, student.token, testAssignment.id, SubmissionType.ONLINE_TEXT_ENTRY) - Log.d(PREPARATION_TAG, "Grade the submission of ${student.name} student for assignment: ${testAssignment.name}.") - gradeSubmission(teacher, course, testAssignment, student) + Log.d(PREPARATION_TAG, "Grade the submission of '${student.name}' student for assignment: '${testAssignment.name}'.") + SubmissionsApi.gradeSubmission(teacher.token, course.id, testAssignment.id, student.id, postedGrade = "13") Log.d(STEP_TAG, "Refresh the Notifications Page. Assert that there is a notification about the submission grading appearing.") sleep(3000) //Let the submission api do it's job @@ -129,36 +125,6 @@ class NotificationsE2ETest : StudentTest() { } } - private fun gradeSubmission( - teacher: CanvasUserApiModel, - course: CourseApiModel, - testAssignment: AssignmentApiModel, - student: CanvasUserApiModel - ) { - SubmissionsApi.gradeSubmission( - teacherToken = teacher.token, - courseId = course.id, - assignmentId = testAssignment.id, - studentId = student.id, - postedGrade = "13", - excused = false - ) - } - - private fun submitAssignment( - course: CourseApiModel, - testAssignment: AssignmentApiModel, - student: CanvasUserApiModel - ) { - SubmissionsApi.submitCourseAssignment( - submissionType = SubmissionType.ONLINE_TEXT_ENTRY, - courseId = course.id, - assignmentId = testAssignment.id, - studentToken = student.token, - fileIds = emptyList().toMutableList() - ) - } - private fun makeQuizQuestions() = listOf( QuizQuestion( questionText = "What's your favorite color?", @@ -181,21 +147,4 @@ class NotificationsE2ETest : StudentTest() { ) ) ) - - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) : AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = GradingType.POINTS, - teacherToken = teacher.token, - pointsPossible = 15.0, - dueAt = 1.days.fromNow.iso8601 - ) - ) - } - } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt index 2f48aaacd3..8903a2c4cb 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt @@ -20,14 +20,11 @@ import android.util.Log import androidx.test.espresso.Espresso import androidx.test.espresso.web.webdriver.Locator import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.PagesApi -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel -import com.instructure.dataseeding.util.Randomizer -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData @@ -43,7 +40,7 @@ class PagesE2ETest: StudentTest() { @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.PAGES, TestCategory.E2E, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.PAGES, TestCategory.E2E) fun testPagesE2E() { Log.d(PREPARATION_TAG,"Seeding data.") @@ -53,16 +50,16 @@ class PagesE2ETest: StudentTest() { val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seed an UNPUBLISHED page for '${course.name}' course.") - val pageUnpublished = createCoursePage(course, teacher, published = false, frontPage = false) + val pageUnpublished = PagesApi.createCoursePage(course.id, teacher.token, published = false) Log.d(PREPARATION_TAG,"Seed a PUBLISHED page for '${course.name}' course.") - val pagePublished = createCoursePage(course, teacher, published = true, frontPage = false, editingRoles = "teachers,students", body = "

Regular Page Text

") + val pagePublished = PagesApi.createCoursePage(course.id, teacher.token, editingRoles = "teachers,students", body = "

Regular Page Text

") Log.d(PREPARATION_TAG,"Seed a PUBLISHED, but NOT editable page for '${course.name}' course.") - val pageNotEditable = createCoursePage(course, teacher, published = true, frontPage = false, body = "

Regular Page Text

") + val pageNotEditable = PagesApi.createCoursePage(course.id, teacher.token, body = "

Regular Page Text

") Log.d(PREPARATION_TAG,"Seed a PUBLISHED, FRONT page for '${course.name}' course.") - val pagePublishedFront = createCoursePage(course, teacher, published = true, frontPage = true, editingRoles = "public", body = "

Front Page Text

") + val pagePublishedFront = PagesApi.createCoursePage(course.id, teacher.token, frontPage = true, editingRoles = "public", body = "

Front Page Text

") Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) @@ -137,20 +134,4 @@ class PagesE2ETest: StudentTest() { Log.d(STEP_TAG, "Assert that the new, edited text is displayed in the page body.") canvasWebViewPage.runTextChecks(WebViewTextCheck(Locator.ID, "header1", "Front Page Text Mod")) } - - private fun createCoursePage( - course: CourseApiModel, - teacher: CanvasUserApiModel, - published: Boolean, - frontPage: Boolean, - editingRoles: String? = null, - body: String = Randomizer.randomPageBody() - ) = PagesApi.createCoursePage( - courseId = course.id, - published = published, - frontPage = frontPage, - editingRoles = editingRoles, - token = teacher.token, - body = body - ) } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PeopleE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PeopleE2ETest.kt index b63a31b4ab..4a05b67783 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PeopleE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PeopleE2ETest.kt @@ -18,10 +18,10 @@ package com.instructure.student.ui.e2e import android.util.Log import com.instructure.canvas.espresso.E2E -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.ViewUtils import com.instructure.student.ui.utils.seedData @@ -51,7 +51,7 @@ class PeopleE2ETest : StudentTest() { tokenLogin(student1) dashboardPage.waitForRender() - Log.d(STEP_TAG,"Navigate to ${course.name} course's People Page.") + Log.d(STEP_TAG,"Navigate to '${course.name}' course's People Page.") dashboardPage.selectCourse(course) courseBrowserPage.selectPeople() @@ -70,7 +70,7 @@ class PeopleE2ETest : StudentTest() { peopleListPage.assertPersonListed(student2) peopleListPage.assertPeopleCount(3) - Log.d(STEP_TAG,"Select ${student2.name} student and assert if we are landing on the Person Details Page.") + Log.d(STEP_TAG,"Select ${student2.name} student and assert if we are landing on the Person Details Page. Assert that the Person Details page's information (user name, role, and picture) are displayed.") peopleListPage.selectPerson(student2) personDetailsPage.assertPageObjects() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt index 13261cd33e..e1073754a1 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt @@ -28,19 +28,16 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.getText import androidx.test.espresso.web.webdriver.DriverAtoms.webScrollIntoView import androidx.test.espresso.web.webdriver.Locator import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.Stub +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.canvas.espresso.isElementDisplayed import com.instructure.dataseeding.api.QuizzesApi -import com.instructure.dataseeding.api.QuizzesApi.createAndPublishQuiz -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.QuizAnswer import com.instructure.dataseeding.model.QuizQuestion -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest @@ -57,7 +54,7 @@ class QuizzesE2ETest: StudentTest() { override fun enableAndConfigureAccessibilityChecks() = Unit - // Fairly basic test of webview-based quizzes. Seeds/takes a quiz with two multiple-choice + // Fairly basic test of web view-based quizzes. Seeds/takes a quiz with two multiple-choice // questions. // // STUBBING THIS OUT. Usually passes locally, but I can't get a simple webClick() to work on FTL. @@ -65,7 +62,7 @@ class QuizzesE2ETest: StudentTest() { @E2E @Stub @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.PAGES, TestCategory.E2E, true) + @TestMetaData(Priority.MANDATORY, FeatureCategory.PAGES, TestCategory.E2E) fun testQuizzesE2E() { Log.d(PREPARATION_TAG, "Seeding data.") @@ -75,13 +72,13 @@ class QuizzesE2ETest: StudentTest() { val course = data.coursesList[0] Log.d(PREPARATION_TAG,"Seed a quiz for ${course.name} course.") - val quizUnpublished = createQuiz(course, teacher, withDescription = true, published = false) + val quizUnpublished = QuizzesApi.createQuiz(course.id, teacher.token, published = false) Log.d(PREPARATION_TAG,"Seed another quiz for ${course.name} with some questions.") val quizQuestions = makeQuizQuestions() Log.d(PREPARATION_TAG,"Publish the previously seeded quiz.") - val quizPublished = createAndPublishQuiz(course.id, teacher.token, quizQuestions) + val quizPublished = QuizzesApi.createAndPublishQuiz(course.id, teacher.token, quizQuestions) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) @@ -181,6 +178,7 @@ class QuizzesE2ETest: StudentTest() { Log.d(STEP_TAG,"Select ${quizPublished.title} quiz.") quizListPage.selectQuiz(quizPublished) + sleep(5000) Log.d(STEP_TAG,"Assert (on web) that the ${quizPublished.title} quiz now has a history.") onWebView(withId(R.id.contentWebView)) .withElement(findElement(Locator.ID, "quiz-submission-version-table")) @@ -204,20 +202,6 @@ class QuizzesE2ETest: StudentTest() { } - private fun createQuiz( - course: CourseApiModel, - teacher: CanvasUserApiModel, - withDescription: Boolean, - published: Boolean, - ) = QuizzesApi.createQuiz( - QuizzesApi.CreateQuizRequest( - courseId = course.id, - withDescription = withDescription, - published = published, - token = teacher.token - ) - ) - private fun makeQuizQuestions() = listOf( QuizQuestion( questionText = "What's your favorite color?", diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt index cb42b97277..ca431ea2ab 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt @@ -22,13 +22,13 @@ import androidx.test.espresso.Espresso import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.Intents.intended import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.utils.RemoteConfigParam import com.instructure.canvasapi2.utils.RemoteConfigUtils import com.instructure.espresso.ViewUtils -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.utils.IntentActionMatcher import com.instructure.student.ui.utils.StudentTest @@ -66,10 +66,10 @@ class SettingsE2ETest : StudentTest() { profileSettingsPage.assertPageObjects() val newUserName = "John Doe" - Log.d(STEP_TAG, "Edit username to: $newUserName. Click on 'Save' button.") + Log.d(STEP_TAG, "Edit username to: '$newUserName'. Click on 'Save' button.") profileSettingsPage.changeUserNameTo(newUserName) - Log.d(STEP_TAG, "Navigate back to Dashboard Page. Assert that the username has been changed to $newUserName.") + Log.d(STEP_TAG, "Navigate back to Dashboard Page. Assert that the username has been changed to '$newUserName'.") ViewUtils.pressBackButton(2) leftSideNavigationDrawerPage.assertUserLoggedIn(newUserName) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ShareExtensionE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ShareExtensionE2ETest.kt index 8df03a41d9..0d611d4474 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ShareExtensionE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ShareExtensionE2ETest.kt @@ -25,9 +25,6 @@ import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiSelector import com.instructure.canvas.espresso.E2E import com.instructure.dataseeding.api.AssignmentsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days @@ -61,11 +58,11 @@ class ShareExtensionE2ETest: StudentTest() { val course = data.coursesList[0] val teacher = data.teachersList[0] - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.") - val testAssignmentOne = createAssignment(course, teacher, 1.days.fromNow.iso8601, 15.0) + Log.d(PREPARATION_TAG,"Seeding 'File upload' assignment for ${course.name} course.") + val testAssignmentOne = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD)) - Log.d(PREPARATION_TAG,"Seeding another 'Text Entry' assignment for ${course.name} course.") - createAssignment(course, teacher, 1.days.fromNow.iso8601, 30.0) + Log.d(PREPARATION_TAG,"Seeding another 'File upload' assignment for ${course.name} course.") + AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 30.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD)) Log.d(PREPARATION_TAG, "Get the device to be able to perform app-independent actions on it.") val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) @@ -205,24 +202,6 @@ class ShareExtensionE2ETest: StudentTest() { fileListPage.assertItemDisplayed(jpgTestFileName) } - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel, - dueAt: String, - pointsPossible: Double - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD), - gradingType = GradingType.POINTS, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = dueAt - ) - ) - } - private fun shareMultipleFiles(uris: ArrayList) { val intent = Intent().apply { action = Intent.ACTION_SEND_MULTIPLE diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt index e4cdad1e9c..245e3c135d 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt @@ -18,18 +18,16 @@ package com.instructure.student.ui.e2e import android.util.Log import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.QuizzesApi -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -55,9 +53,9 @@ class SyllabusE2ETest: StudentTest() { Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) - dashboardPage.waitForRender() - Log.d(STEP_TAG,"Select ${course.name} course.") + Log.d(STEP_TAG,"Wait for the Dashboard Page to be rendered. Select '${course.name}' course.") + dashboardPage.waitForRender() dashboardPage.selectCourse(course) Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that the syllabus body string is displayed, and there are no tabs yet.") @@ -65,42 +63,16 @@ class SyllabusE2ETest: StudentTest() { syllabusPage.assertNoTabs() syllabusPage.assertSyllabusBody("this is the syllabus body") - Log.d(PREPARATION_TAG,"Seed an assignment for ${course.name} course.") - val assignment = createAssignment(course, teacher) + Log.d(PREPARATION_TAG,"Seed an assignment for '${course.name}' course.") + val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, submissionTypes = listOf(SubmissionType.ON_PAPER), withDescription = true, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601) - Log.d(PREPARATION_TAG,"Seed a quiz for ${course.name} course.") - val quiz = createQuiz(course, teacher) + Log.d(PREPARATION_TAG,"Seed a quiz for '${course.name}' course.") + val quiz = QuizzesApi.createQuiz(course.id, teacher.token, dueAt = 2.days.fromNow.iso8601) - Log.d(STEP_TAG,"Refresh the page. Navigate to 'Summary' tab. Assert that all of the items, so ${assignment.name} assignment and ${quiz.title} quiz are displayed.") + Log.d(STEP_TAG,"Refresh the page. Navigate to 'Summary' tab. Assert that all of the items, so '${assignment.name}' assignment and '${quiz.title}' quiz are displayed.") syllabusPage.refresh() syllabusPage.selectSummaryTab() syllabusPage.assertItemDisplayed(assignment.name) syllabusPage.assertItemDisplayed(quiz.title) } - - private fun createQuiz( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = QuizzesApi.createQuiz( - QuizzesApi.CreateQuizRequest( - courseId = course.id, - withDescription = true, - published = true, - token = teacher.token, - dueAt = 2.days.fromNow.iso8601 - ) - ) - - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ) = AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - teacherToken = teacher.token, - submissionTypes = listOf(SubmissionType.ON_PAPER), - dueAt = 1.days.fromNow.iso8601, - withDescription = true - ) - ) } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/TodoE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/TodoE2ETest.kt index 2c98efb118..08e00b02e0 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/TodoE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/TodoE2ETest.kt @@ -3,22 +3,20 @@ package com.instructure.student.ui.e2e import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.refresh import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.QuizzesApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.espresso.retryWithIncreasingDelay import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedAssignments import com.instructure.student.ui.utils.seedData @@ -45,10 +43,10 @@ class TodoE2ETest: StudentTest() { val course = data.coursesList[0] val favoriteCourse = data.coursesList[1] - Log.d(PREPARATION_TAG,"Seed an assignment for ${course.name} course with tomorrow due date.") - val testAssignment = createAssignment(course, teacher) + Log.d(PREPARATION_TAG,"Seed an assignment for '${course.name}' course with tomorrow due date.") + val testAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Seed another assignment for ${course.name} course with 7 days from now due date.") + Log.d(PREPARATION_TAG,"Seed another assignment for '${course.name}' course with 7 days from now due date.") val seededAssignments2 = seedAssignments( courseId = course.id, teacherToken = teacher.token, @@ -57,37 +55,35 @@ class TodoE2ETest: StudentTest() { val borderDateAssignment = seededAssignments2[0] //We show items in the to do section which are within 7 days. - Log.d(PREPARATION_TAG,"Seed a quiz for ${course.name} course with tomorrow due date.") - val quiz = createQuiz(course, teacher, 1.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seed a quiz for '${course.name}' course with tomorrow due date.") + val quiz = QuizzesApi.createQuiz(course.id, teacher.token, dueAt = 1.days.fromNow.iso8601) - Log.d(PREPARATION_TAG,"Seed another quiz for ${course.name} course with 8 days from now due date..") - val tooFarAwayQuiz = createQuiz(course, teacher, 8.days.fromNow.iso8601) + Log.d(PREPARATION_TAG,"Seed another quiz for '${course.name}' course with 8 days from now due date..") + val tooFarAwayQuiz = QuizzesApi.createQuiz(course.id, teacher.token, dueAt = 8.days.fromNow.iso8601) Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.") tokenLogin(student) - dashboardPage.waitForRender() - Log.d(STEP_TAG,"Navigate to 'To Do' Page via bottom-menu.") + Log.d(STEP_TAG,"Wait for the Dashboard Page to be rendered. Navigate to 'To Do' Page via bottom-menu.") + dashboardPage.waitForRender() dashboardPage.clickTodoTab() - Log.d(STEP_TAG,"Assert that ${testAssignment.name} assignment is displayed and ${borderDateAssignment.name} is displayed because it's 7 days away from now..") - todoPage.assertAssignmentDisplayed(testAssignment) - todoPage.assertAssignmentDisplayed(borderDateAssignment) - - Log.d(STEP_TAG,"Assert that ${quiz.title} quiz is displayed and ${tooFarAwayQuiz.title} quiz is not displayed because it's end date is more than a week away..") - todoPage.assertQuizDisplayed(quiz) - todoPage.assertQuizNotDisplayed(tooFarAwayQuiz) - - Log.d(PREPARATION_TAG,"Submit ${testAssignment.name} assignment for ${student.name} student.") - SubmissionsApi.seedAssignmentSubmission(SubmissionsApi.SubmissionSeedRequest( - assignmentId = testAssignment.id, - courseId = course.id, - studentToken = student.token, + Log.d(STEP_TAG,"Assert that '${testAssignment.name}' assignment is displayed and '${borderDateAssignment.name}' assignment is displayed because it's 7 days away from now.") + Log.d(STEP_TAG,"Assert that '${quiz.title}' quiz is displayed and '${tooFarAwayQuiz.title}' quiz is not displayed because it's end date is more than a week away.") + retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = { refresh() } ) { + todoPage.assertAssignmentDisplayed(testAssignment) + todoPage.assertAssignmentDisplayed(borderDateAssignment) + todoPage.assertQuizDisplayed(quiz) + todoPage.assertQuizNotDisplayed(tooFarAwayQuiz) + } + + Log.d(PREPARATION_TAG,"Submit' ${testAssignment.name}' assignment for ${student.name} student.") + SubmissionsApi.seedAssignmentSubmission(course.id, student.token, testAssignment.id, submissionSeedsList = listOf(SubmissionsApi.SubmissionSeedInfo( amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY )) - )) + ) Log.d(STEP_TAG, "Refresh the 'To Do' Page.") refresh() @@ -113,13 +109,13 @@ class TodoE2ETest: StudentTest() { todoPage.assertAssignmentNotDisplayed(testAssignment) todoPage.assertQuizNotDisplayed(tooFarAwayQuiz) - Log.d(PREPARATION_TAG,"Seed an assignment for ${favoriteCourse.name} course with tomorrow due date.") - val favoriteCourseAssignment = createAssignment(favoriteCourse, teacher) + Log.d(PREPARATION_TAG,"Seed an assignment for '${favoriteCourse.name}' course with tomorrow due date.") + val favoriteCourseAssignment = AssignmentsApi.createAssignment(favoriteCourse.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(STEP_TAG, "Navigate back to the Dashboard Page. Open ${favoriteCourse.name} course. Mark it as favorite.") + Log.d(STEP_TAG, "Navigate back to the Dashboard Page. Open '${favoriteCourse.name}' course. Mark it as favorite.") Espresso.pressBack() - dashboardPage.clickEditDashboard() - editDashboardPage.favoriteCourse(favoriteCourse.name) + dashboardPage.openAllCoursesPage() + allCoursesPage.favoriteCourse(favoriteCourse.name) Log.d(STEP_TAG, "Navigate back to the Dashboard Page and open the To Do Page again.") Espresso.pressBack() @@ -139,34 +135,4 @@ class TodoE2ETest: StudentTest() { todoPage.assertQuizNotDisplayed(quiz) todoPage.assertQuizNotDisplayed(tooFarAwayQuiz) } - - private fun createQuiz( - course: CourseApiModel, - teacher: CanvasUserApiModel, - dueAt: String - ) = QuizzesApi.createQuiz( - QuizzesApi.CreateQuizRequest( - courseId = course.id, - withDescription = true, - published = true, - token = teacher.token, - dueAt = dueAt - ) - ) - - private fun createAssignment( - course: CourseApiModel, - teacher: CanvasUserApiModel - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = course.id, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = GradingType.POINTS, - teacherToken = teacher.token, - pointsPossible = 15.0, - dueAt = 1.days.fromNow.iso8601 - ) - ) - } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/GradesElementaryE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/GradesElementaryE2ETest.kt index 4b675a8b75..6714978284 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/GradesElementaryE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/GradesElementaryE2ETest.kt @@ -19,19 +19,20 @@ package com.instructure.student.ui.e2e.k5 import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E -import com.instructure.canvasapi2.utils.toApiString +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.AssignmentsApi import com.instructure.dataseeding.api.GradingPeriodsApi import com.instructure.dataseeding.api.SubmissionsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType +import com.instructure.dataseeding.util.days +import com.instructure.dataseeding.util.fromNow +import com.instructure.dataseeding.util.iso8601 import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest @@ -39,17 +40,17 @@ import com.instructure.student.ui.utils.seedDataForK5 import com.instructure.student.ui.utils.tokenLoginElementary import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Test -import java.util.* @HiltAndroidTest class GradesElementaryE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.K5_GRADES) fun gradesE2ETest() { Log.d(PREPARATION_TAG,"Seeding data for K5 sub-account.") @@ -65,20 +66,19 @@ class GradesElementaryE2ETest : StudentTest() { val student = data.studentsList[0] val teacher = data.teachersList[0] val nonHomeroomCourses = data.coursesList.filter { !it.homeroomCourse } - val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")) val testGradingPeriodListApiModel = GradingPeriodsApi.getGradingPeriodsOfCourse(nonHomeroomCourses[0].id) - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${nonHomeroomCourses[1].name} course.") - val testAssignment = createAssignment(nonHomeroomCourses[1].id, teacher, calendar, GradingType.PERCENT, 100.0) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for '${nonHomeroomCourses[1].name}' course.") + val testAssignment = AssignmentsApi.createAssignment(nonHomeroomCourses[1].id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 100.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Seeding another 'Text Entry' assignment for ${nonHomeroomCourses[0].name} course.") - val testAssignment2 = createAssignment(nonHomeroomCourses[0].id, teacher, calendar, GradingType.LETTER_GRADE, 100.0) + Log.d(PREPARATION_TAG,"Seeding another 'Text Entry' assignment for '${nonHomeroomCourses[0].name}' course.") + val testAssignment2 = AssignmentsApi.createAssignment(nonHomeroomCourses[0].id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 100.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) - Log.d(PREPARATION_TAG,"Grade the previously seeded submission for ${nonHomeroomCourses[1].name} assignment.") - gradeSubmission(teacher,nonHomeroomCourses[1].id, student, testAssignment.id, "9") + Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${nonHomeroomCourses[1].name}' assignment.") + SubmissionsApi.gradeSubmission(teacher.token, nonHomeroomCourses[1].id, testAssignment.id, student.id, postedGrade = "9") - Log.d(PREPARATION_TAG,"Grade the previously seeded submission for ${nonHomeroomCourses[0].name} assignment.") - gradeSubmission(teacher, nonHomeroomCourses[0].id, student, testAssignment2.id, "A-") + Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${nonHomeroomCourses[0].name}' assignment.") + SubmissionsApi.gradeSubmission(teacher.token, nonHomeroomCourses[0].id, testAssignment2.id, student.id, postedGrade = "A-") Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLoginElementary(student) @@ -94,16 +94,17 @@ class GradesElementaryE2ETest : StudentTest() { gradesPage.assertCourseShownWithGrades(nonHomeroomCourses[1].name, "9%") gradesPage.assertCourseShownWithGrades(nonHomeroomCourses[2].name, "Not Graded") - Log.d(PREPARATION_TAG,"Grade the previously seeded submission for ${testAssignment2.name} assignment.") - gradeSubmission(teacher,nonHomeroomCourses[0].id, student, testAssignment2.id, "C-") + Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${testAssignment2.name}' assignment.") + SubmissionsApi.gradeSubmission(teacher.token, nonHomeroomCourses[0].id, testAssignment2.id, student.id, postedGrade = "C-") Thread.sleep(5000) //This time is needed here to let the SubMissionApi does it's job. - Log.d(STEP_TAG, "Refresh Grades Elementary Page. Assert that the previously graded, ${testAssignment2.name} assignment's grade has been changed, but only that one.") + Log.d(STEP_TAG, "Refresh Grades Elementary Page. Assert that the previously graded, '${testAssignment2.name}' assignment's grade has been changed, but only that one.") gradesPage.refresh() Thread.sleep(5000) //We need to wait here because sometimes if we refresh the page fastly, the old grade will be seen. gradesPage.assertCourseShownWithGrades(nonHomeroomCourses[0].name, "73%") gradesPage.assertCourseShownWithGrades(nonHomeroomCourses[1].name, "9%") + gradesPage.assertCourseShownWithGrades(nonHomeroomCourses[2].name, "Not Graded") Log.d(STEP_TAG, "Change 'Current Grading Period' to '${testGradingPeriodListApiModel.gradingPeriods[0].title}'.") gradesPage.assertSelectedGradingPeriod(gradesPage.getStringFromResource(R.string.currentGradingPeriod)) @@ -111,50 +112,14 @@ class GradesElementaryE2ETest : StudentTest() { gradesPage.clickGradingPeriodSelector() gradesPage.selectGradingPeriod(testGradingPeriodListApiModel.gradingPeriods[0].title) - Log.d(STEP_TAG, "Checking if a course's grades page is displayed after clicking on a course row on elementary grades page. Assert that we have left the grades elementary page. We are asserting this because in beta environment, subject page's not always available for k5 user.") + Log.d(STEP_TAG, "Checking if a course's grades page is displayed after clicking on a course row on elementary grades page." + + "Assert that we have left the grades elementary page. We are asserting this because in beta environment, subject page's not always available for k5 user.") gradesPage.clickGradeRow(nonHomeroomCourses[0].name) gradesPage.assertCourseNotDisplayed(nonHomeroomCourses[0].name) Log.d(STEP_TAG, "Navigate back to Grades Elementary Page and assert it's displayed.") Espresso.pressBack() gradesPage.assertPageObjects() - - } - - private fun createAssignment( - courseId: Long, - teacher: CanvasUserApiModel, - calendar: Calendar, - gradingType: GradingType, - pointsPossible: Double - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = courseId, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = gradingType, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = calendar.time.toApiString() - ) - ) - } - - private fun gradeSubmission( - teacher: CanvasUserApiModel, - courseId: Long, - student: CanvasUserApiModel, - assignmentId: Long, - postedGrade: String - ) { - SubmissionsApi.gradeSubmission( - teacherToken = teacher.token, - courseId = courseId, - assignmentId = assignmentId, - studentId = student.id, - postedGrade = postedGrade, - excused = false - ) } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt index 6088a3f2f7..b9d1d7d138 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt @@ -19,19 +19,18 @@ package com.instructure.student.ui.e2e.k5 import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.AssignmentsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.ago import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.iso8601 import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest @@ -44,13 +43,14 @@ import org.threeten.bp.format.DateTimeFormatter @HiltAndroidTest class HomeroomE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.HOMEROOM) fun homeroomE2ETest() { Log.d(PREPARATION_TAG,"Seeding data for K5 sub-account.") @@ -68,11 +68,11 @@ class HomeroomE2ETest : StudentTest() { val homeroomAnnouncement = data.announcementsList[0] val nonHomeroomCourses = data.coursesList.filter { !it.homeroomCourse } - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${nonHomeroomCourses[2].name} course.") - val testAssignment = createAssignment(nonHomeroomCourses[2].id, teacher, GradingType.LETTER_GRADE, 100.0, OffsetDateTime.now().plusHours(1).format(DateTimeFormatter.ISO_DATE_TIME)) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for '${nonHomeroomCourses[2].name}' course.") + val testAssignment = AssignmentsApi.createAssignment(nonHomeroomCourses[2].id, teacher.token, gradingType = GradingType.LETTER_GRADE, pointsPossible = 100.0, dueAt = OffsetDateTime.now().plusHours(1).format(DateTimeFormatter.ISO_DATE_TIME), submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Seeding 'Text Entry' MISSING assignment for ${nonHomeroomCourses[2].name} course.") - val testAssignmentMissing = createAssignment(nonHomeroomCourses[2].id, teacher, GradingType.PERCENT, 100.0, 3.days.ago.iso8601) + val testAssignmentMissing = AssignmentsApi.createAssignment(nonHomeroomCourses[2].id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 100.0, dueAt = 3.days.ago.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLoginElementary(student) @@ -81,10 +81,10 @@ class HomeroomE2ETest : StudentTest() { Log.d(STEP_TAG, "Navigate to K5 Important Dates Page and assert it is loaded.") elementaryDashboardPage.selectTab(ElementaryDashboardPage.ElementaryTabType.HOMEROOM) - Log.d(STEP_TAG, "Assert that there is a welcome text with the student's shortname (${student.shortName}).") + Log.d(STEP_TAG, "Assert that there is a welcome text with the student's shortname: '${student.shortName}'.") homeroomPage.assertWelcomeText(student.shortName) - Log.d(STEP_TAG, "Assert that the ${homeroomAnnouncement.title} announcement (which belongs to ${homeroomCourse.name} homeroom course) is displayed.") + Log.d(STEP_TAG, "Assert that the '${homeroomAnnouncement.title}' announcement (which belongs to '${homeroomCourse.name}' homeroom course) is displayed.") homeroomPage.assertAnnouncementDisplayed(homeroomCourse.name, homeroomAnnouncement.title, homeroomAnnouncement.message) Log.d(STEP_TAG, "Assert that under the 'My Subject' section there are 3 items.") @@ -92,7 +92,7 @@ class HomeroomE2ETest : StudentTest() { Log.d(STEP_TAG, "Click on 'View Previous Announcements'." + "Assert that the Announcement List Page is displayed" + - "and the ${homeroomAnnouncement.title} announcement is displayed as well within the announcement list..") + "and the '${homeroomAnnouncement.title}' announcement is displayed as well within the announcement list..") homeroomPage.clickOnViewPreviousAnnouncements() announcementListPage.assertToolbarTitle() announcementListPage.assertAnnouncementTitleVisible(homeroomAnnouncement.title) @@ -103,7 +103,7 @@ class HomeroomE2ETest : StudentTest() { elementaryDashboardPage.waitForRender() for (i in 0 until nonHomeroomCourses.size - 1) { - Log.d(STEP_TAG, "Assert that the ${nonHomeroomCourses[i].name} course is displayed with the announcements which belongs to it.") + Log.d(STEP_TAG, "Assert that the '${nonHomeroomCourses[i].name}' course is displayed with the announcements which belongs to it.") homeroomPage.assertCourseDisplayed( nonHomeroomCourses[i].name, homeroomPage.getStringFromResource(R.string.nothingDueToday), @@ -115,50 +115,30 @@ class HomeroomE2ETest : StudentTest() { homeroomPage.assertPageObjects() homeroomPage.assertToDoText("1 due today | 1 missing") - Log.d(STEP_TAG, "Open ${nonHomeroomCourses[0].name} course." + + Log.d(STEP_TAG, "Open '${nonHomeroomCourses[0].name}' course." + "Assert that the Course Details Page is displayed and the title is '${nonHomeroomCourses[0].name}' (the course's name).") homeroomPage.openCourse(nonHomeroomCourses[0].name) elementaryCoursePage.assertPageObjects() elementaryCoursePage.assertTitleCorrect(nonHomeroomCourses[0].name) - Log.d(STEP_TAG, "Navigate back to Homeroom Page. Open ${data.announcementsList[1].title} announcement by clicking on it.") + Log.d(STEP_TAG, "Navigate back to Homeroom Page. Open '${data.announcementsList[1].title}' announcement by clicking on it.") Espresso.pressBack() homeroomPage.assertPageObjects() homeroomPage.openCourseAnnouncement(data.announcementsList[1].title) - Log.d(STEP_TAG, "Assert that the ${data.announcementsList[1].title} announcement's details page is displayed.") + Log.d(STEP_TAG, "Assert that the '${data.announcementsList[1].title}' announcement's details page is displayed.") discussionDetailsPage.assertTitleText(data.announcementsList[1].title) - Log.d(STEP_TAG, "Navigate back to Homeroom Page. Open the Assignment List Page of ${nonHomeroomCourses[2].name} course.") + Log.d(STEP_TAG, "Navigate back to Homeroom Page. Open the Assignment List Page of '${nonHomeroomCourses[2].name}' course.") Espresso.pressBack() homeroomPage.assertPageObjects() homeroomPage.openAssignments("1 due today | 1 missing") - Log.d(STEP_TAG, "Assert that the Assignment list page of ${nonHomeroomCourses[2].name} course is loaded well" + - "and the corresponding assignments (Not missing: ${testAssignment.name}, missing: ${testAssignmentMissing.name}) are displayed.") + Log.d(STEP_TAG, "Assert that the Assignment list page of '${nonHomeroomCourses[2].name}' course is loaded well" + + "and the corresponding assignments (Not missing: '${testAssignment.name}', missing: '${testAssignmentMissing.name}') are displayed.") assignmentListPage.assertPageObjects() assignmentListPage.assertHasAssignment(testAssignment) assignmentListPage.assertHasAssignment(testAssignmentMissing) } - - - private fun createAssignment( - courseId: Long, - teacher: CanvasUserApiModel, - gradingType: GradingType, - pointsPossible: Double, - dueAt: String - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = courseId, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = gradingType, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = dueAt - ) - ) - } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ImportantDatesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ImportantDatesE2ETest.kt index 54c3387d3e..3628506f0b 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ImportantDatesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ImportantDatesE2ETest.kt @@ -19,19 +19,17 @@ package com.instructure.student.ui.e2e.k5 import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.utils.toDate import com.instructure.dataseeding.api.AssignmentsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel import com.instructure.dataseeding.model.GradingType -import com.instructure.dataseeding.model.SubmissionType import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedDataForK5 @@ -43,13 +41,14 @@ import java.util.* @HiltAndroidTest class ImportantDatesE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.IMPORTANT_DATES) fun importantDatesE2ETest() { Log.d(PREPARATION_TAG,"Seeding data for K5 sub-account.") @@ -67,17 +66,17 @@ class ImportantDatesE2ETest : StudentTest() { val elementaryCourse3 = data.coursesList[2] val elementaryCourse4 = data.coursesList[3] - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for ${elementaryCourse1.name} course.") - val testAssignment1 = createAssignment(elementaryCourse1.id,teacher, GradingType.POINTS, 100.0, 3.days.fromNow.iso8601, importantDate = true) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for '${elementaryCourse1.name}' course.") + val testAssignment1 = AssignmentsApi.createAssignment(elementaryCourse1.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 100.0, dueAt = 3.days.fromNow.iso8601, importantDate = true) - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for ${elementaryCourse2.name} course.") - val testAssignment2 = createAssignment(elementaryCourse2.id,teacher, GradingType.POINTS, 100.0, 4.days.fromNow.iso8601, importantDate = true) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for '${elementaryCourse2.name}' course.") + val testAssignment2 = AssignmentsApi.createAssignment(elementaryCourse2.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 100.0, dueAt = 4.days.fromNow.iso8601, importantDate = true) - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for ${elementaryCourse3.name} course.") - val testAssignment3 = createAssignment(elementaryCourse3.id,teacher, GradingType.POINTS, 100.0, 4.days.fromNow.iso8601, importantDate = true) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' IMPORTANT assignment for '${elementaryCourse3.name}' course.") + val testAssignment3 = AssignmentsApi.createAssignment(elementaryCourse3.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 100.0, dueAt = 4.days.fromNow.iso8601, importantDate = true) - Log.d(PREPARATION_TAG,"Seeding 'Text Entry' NOT IMPORTANT assignment for ${elementaryCourse4.name} course.") - val testNotImportantAssignment = createAssignment(elementaryCourse4.id,teacher, GradingType.POINTS, 100.0, 4.days.fromNow.iso8601, importantDate = false) + Log.d(PREPARATION_TAG,"Seeding 'Text Entry' NOT IMPORTANT assignment for '${elementaryCourse4.name}' course.") + val testNotImportantAssignment = AssignmentsApi.createAssignment(elementaryCourse4.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 100.0, dueAt = 4.days.fromNow.iso8601, importantDate = false) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLoginElementary(student) @@ -87,7 +86,7 @@ class ImportantDatesE2ETest : StudentTest() { elementaryDashboardPage.selectTab(ElementaryDashboardPage.ElementaryTabType.IMPORTANT_DATES) importantDatesPage.assertPageObjects() - Log.d(STEP_TAG, "Assert that the important date assignments are displayed and the 'not' important (${testNotImportantAssignment.name}) is not displayed.") + Log.d(STEP_TAG, "Assert that the important date assignments are displayed and the 'not' important one, '${testNotImportantAssignment.name}' is not displayed.") importantDatesPage.assertItemDisplayed(testAssignment1.name) importantDatesPage.assertItemDisplayed(testAssignment2.name) importantDatesPage.assertItemDisplayed(testAssignment3.name) @@ -107,7 +106,7 @@ class ImportantDatesE2ETest : StudentTest() { importantDatesPage.assertPageObjects() Log.d(STEP_TAG, "Refresh the Important Dates page. Assert that the corresponding items" + - "(all the assignments, except ${testNotImportantAssignment.name} named assignment) and their labels are still displayed after the refresh.") + "(all the assignments, except '${testNotImportantAssignment.name}' named assignment) and their labels are still displayed after the refresh.") importantDatesPage.pullToRefresh() importantDatesPage.assertItemDisplayed(testAssignment1.name) importantDatesPage.assertItemDisplayed(testAssignment2.name) @@ -118,32 +117,10 @@ class ImportantDatesE2ETest : StudentTest() { importantDatesPage.assertRecyclerViewItemCount(3) importantDatesPage.assertDayTextIsDisplayed(generateDayString(testAssignment1.dueAt.toDate())) importantDatesPage.assertDayTextIsDisplayed(generateDayString(testAssignment2.dueAt.toDate())) - } private fun generateDayString(date: Date?): String { return SimpleDateFormat("EEEE, MMMM dd", Locale.getDefault()).format(date) } - - private fun createAssignment( - courseId: Long, - teacher: CanvasUserApiModel, - gradingType: GradingType, - pointsPossible: Double, - dueAt: String, - importantDate: Boolean - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = courseId, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = gradingType, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = dueAt, - importantDate = importantDate - ) - ) - } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ResourcesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ResourcesE2ETest.kt index a27cf7bd4b..0337f8d4c5 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ResourcesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ResourcesE2ETest.kt @@ -19,11 +19,12 @@ package com.instructure.student.ui.e2e.k5 import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedDataForK5 @@ -33,13 +34,14 @@ import org.junit.Test @HiltAndroidTest class ResourcesE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.RESOURCES) fun resourcesE2ETest() { Log.d(PREPARATION_TAG,"Seeding data for K5 sub-account.") @@ -65,9 +67,9 @@ class ResourcesE2ETest : StudentTest() { resourcesPage.assertPageObjects() Log.d(STEP_TAG, "Assert that the important links, LTI tools and contacts are displayed.") - assertElementaryResourcesPageInformations(teacher) + assertElementaryResourcesPageInformation(teacher) - Log.d(STEP_TAG, "Click on the compose message icon next to a contact (${teacher.name}), and verify if the new message page is displayed.") + Log.d(STEP_TAG, "Click on the compose message icon next to a contact ('${teacher.name}' teacher), and verify if the new message page is displayed.") resourcesPage.openComposeMessage(teacher.shortName) assertNewMessagePageDisplayed() @@ -76,7 +78,7 @@ class ResourcesE2ETest : StudentTest() { resourcesPage.assertPageObjects() Log.d(STEP_TAG, "Assert that the important links, LTI tools and contacts are still displayed correctly, after the navigation.") - assertElementaryResourcesPageInformations(teacher) + assertElementaryResourcesPageInformation(teacher) Log.d(STEP_TAG, "Open an LTI tool (Google Drive), and verify if all the NON-homeroom courses are displayed within the 'Choose a Course' list.") resourcesPage.openLtiApp("Google Drive") @@ -85,9 +87,7 @@ class ResourcesE2ETest : StudentTest() { } } - private fun assertElementaryResourcesPageInformations( - teacher: CanvasUserApiModel - ) { + private fun assertElementaryResourcesPageInformation(teacher: CanvasUserApiModel) { resourcesPage.assertImportantLinksHeaderDisplayed() resourcesPage.assertStudentApplicationsHeaderDisplayed() resourcesPage.assertStaffInfoHeaderDisplayed() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ScheduleE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ScheduleE2ETest.kt index 2548685af9..d2dd8fb9c2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ScheduleE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/ScheduleE2ETest.kt @@ -19,18 +19,19 @@ package com.instructure.student.ui.e2e.k5 import android.util.Log import androidx.test.espresso.Espresso import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.ReleaseExclude +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.Stub +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.utils.toApiString import com.instructure.dataseeding.api.AssignmentsApi -import com.instructure.dataseeding.model.AssignmentApiModel -import com.instructure.dataseeding.model.CanvasUserApiModel import com.instructure.dataseeding.model.GradingType import com.instructure.dataseeding.model.SubmissionType import com.instructure.espresso.page.getStringFromResource import com.instructure.espresso.page.withAncestor -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest @@ -40,6 +41,7 @@ import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Rule import org.junit.Test import org.junit.rules.Timeout +import java.lang.Thread.sleep import java.util.* @HiltAndroidTest @@ -50,11 +52,13 @@ class ScheduleE2ETest : StudentTest() { override fun enableAndConfigureAccessibilityChecks() = Unit @Rule - var globalTimeout: Timeout = Timeout.millis(600000) // //TODO: workaround for that sometimes this test is running infinite time because of scrollToElement does not find an element. + @JvmField + var globalTimeout: Timeout = Timeout.millis(1200000) // //TODO: workaround for that sometimes this test is running infinite time because of scrollToElement does not find an element. + @Stub @E2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.SCHEDULE) fun scheduleE2ETest() { Log.d(PREPARATION_TAG,"Seeding data for K5 sub-account.") @@ -74,13 +78,13 @@ class ScheduleE2ETest : StudentTest() { val twoWeeksAfterCalendar = getCustomDateCalendar(15) Log.d(PREPARATION_TAG,"Seeding 'Text Entry' MISSING assignment for ${nonHomeroomCourses[2].name} course.") - val testMissingAssignment = createAssignment(nonHomeroomCourses[2].id, teacher, currentDateCalendar, GradingType.LETTER_GRADE,100.0) + val testMissingAssignment = AssignmentsApi.createAssignment(nonHomeroomCourses[2].id, teacher.token, dueAt = currentDateCalendar.time.toApiString(), gradingType = GradingType.LETTER_GRADE, pointsPossible = 100.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Seeding 'Text Entry' Two weeks before end date assignment for ${nonHomeroomCourses[1].name} course.") - val testTwoWeeksBeforeAssignment = createAssignment(nonHomeroomCourses[1].id, teacher, twoWeeksBeforeCalendar, GradingType.PERCENT,100.0) + val testTwoWeeksBeforeAssignment = AssignmentsApi.createAssignment(nonHomeroomCourses[1].id, teacher.token, dueAt = twoWeeksBeforeCalendar.time.toApiString(), gradingType = GradingType.PERCENT, pointsPossible = 100.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(PREPARATION_TAG,"Seeding 'Text Entry' Two weeks after end date assignment for ${nonHomeroomCourses[0].name} course.") - val testTwoWeeksAfterAssignment = createAssignment(nonHomeroomCourses[0].id, teacher, twoWeeksAfterCalendar, GradingType.POINTS,25.0) + val testTwoWeeksAfterAssignment = AssignmentsApi.createAssignment(nonHomeroomCourses[0].id, teacher.token, dueAt = twoWeeksAfterCalendar.time.toApiString(), gradingType = GradingType.POINTS, pointsPossible = 25.0, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY)) Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") tokenLoginElementary(student) @@ -88,7 +92,6 @@ class ScheduleE2ETest : StudentTest() { Log.d(STEP_TAG, "Navigate to K5 Schedule Page and assert it is loaded.") elementaryDashboardPage.selectTab(ElementaryDashboardPage.ElementaryTabType.SCHEDULE) - schedulePage.assertPageObjects() //Depends on how we handle Sunday, need to clarify with calendar team if(currentDateCalendar.get(Calendar.DAY_OF_WEEK) != 1) { schedulePage.assertIfCourseHeaderAndScheduleItemDisplayed(homeroomCourse.name, homeroomAnnouncement.title) } @@ -107,13 +110,13 @@ class ScheduleE2ETest : StudentTest() { schedulePage.assertIfCourseHeaderAndScheduleItemDisplayed(nonHomeroomCourses[2].name, testMissingAssignment.name) Log.d(STEP_TAG, "Scroll to 'Missing Items' section and verify that a missing assignment (${testMissingAssignment.name}) is displayed there with 100 points.") - schedulePage.scrollToItem(R.id.missingItemLayout, testMissingAssignment.name) - schedulePage.assertMissingItemDisplayed(testMissingAssignment.name, nonHomeroomCourses[2].name, "100 pts") + schedulePage.scrollToItem(R.id.metaLayout, testMissingAssignment.name) + schedulePage.assertMissingItemDisplayedOnPlannerItem(testMissingAssignment.name, nonHomeroomCourses[2].name, "100 pts") Log.d(STEP_TAG, "Refresh the Schedule Page. Assert that the items are still displayed correctly.") schedulePage.scrollToPosition(0) schedulePage.refresh() - schedulePage.assertPageObjects() + sleep(3000) Log.d(STEP_TAG, "Assert that the current day of the calendar is titled as 'Today'.") schedulePage.assertDayHeaderShownByItemName(concatDayString(currentDateCalendar), schedulePage.getStringFromResource(R.string.today), schedulePage.getStringFromResource(R.string.today)) @@ -158,6 +161,7 @@ class ScheduleE2ETest : StudentTest() { Log.d(STEP_TAG, "Navigate back to Schedule Page and assert it is loaded.") Espresso.pressBack() + sleep(3000) schedulePage.assertPageObjects() } @@ -214,24 +218,5 @@ class ScheduleE2ETest : StudentTest() { return cal } - private fun createAssignment( - courseId: Long, - teacher: CanvasUserApiModel, - calendar: Calendar, - gradingType: GradingType, - pointsPossible: Double - ): AssignmentApiModel { - return AssignmentsApi.createAssignment( - AssignmentsApi.CreateAssignmentRequest( - courseId = courseId, - submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY), - gradingType = gradingType, - teacherToken = teacher.token, - pointsPossible = pointsPossible, - dueAt = calendar.time.toApiString() - ) - ) - } - } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/DashboardE2EOfflineTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/DashboardE2EOfflineTest.kt deleted file mode 100644 index 599a31aa0a..0000000000 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/DashboardE2EOfflineTest.kt +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) 2023 - present Instructure, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package com.instructure.student.ui.e2e.offline - -import android.util.Log -import com.instructure.canvas.espresso.OfflineE2E -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData -import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils -import com.instructure.student.ui.utils.StudentTest -import com.instructure.student.ui.utils.seedData -import com.instructure.student.ui.utils.tokenLogin -import dagger.hilt.android.testing.HiltAndroidTest -import org.junit.After -import org.junit.Test - -@HiltAndroidTest -class DashboardE2EOfflineTest : StudentTest() { - override fun displaysPageObjects() = Unit - - override fun enableAndConfigureAccessibilityChecks() = Unit - - @OfflineE2E - @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E) - fun testOfflineDashboardE2E() { - Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 2, announcements = 1) - val student = data.studentsList[0] - val course1 = data.coursesList[0] - val course2 = data.coursesList[1] - val testAnnouncement = data.announcementsList[0] - - Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") - tokenLogin(student) - dashboardPage.waitForRender() - - Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") - dashboardPage.openGlobalManageOfflineContentPage() - - Log.d(STEP_TAG, "Select the entire '${course1.name}' course for sync. Click on the 'Sync' button.") - manageOfflineContentPage.changeItemSelectionState(course1.name) - manageOfflineContentPage.clickOnSyncButtonAndConfirm() - - Log.d(STEP_TAG, "Wait for the 'Download Started' dashboard notification to be displayed, and the to disappear.") - dashboardPage.waitForRender() - dashboardPage.waitForSyncProgressDownloadStartedNotification() - dashboardPage.waitForSyncProgressDownloadStartedNotificationToDisappear() - - Log.d(STEP_TAG, "Wait for the 'Syncing Offline Content' dashboard notification to be displayed, and the to disappear. (It should be displayed after the 'Download Started' notification immediately.)") - dashboardPage.waitForSyncProgressStartingNotification() - dashboardPage.waitForSyncProgressStartingNotificationToDisappear() - - Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") - OfflineTestUtils.turnOffConnectionViaADB() - - Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") - dashboardPage.waitForRender() - - Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") - OfflineTestUtils.assertOfflineIndicator() - - Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's cours card.") - dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) - dashboardPage.assertCourseOfflineSyncIconGone(course2.name) - - Log.d(STEP_TAG, "Select '${course1.name}' course and open 'Announcements' menu.") - dashboardPage.selectCourse(course1) - courseBrowserPage.selectAnnouncements() - - Log.d(STEP_TAG,"Assert that the '${testAnnouncement.title}' titled announcement is displayed, so the user is able to see it in offline mode because it was synced.") - announcementListPage.assertTopicDisplayed(testAnnouncement.title) - } - - @After - fun tearDown() { - Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") - OfflineTestUtils.turnOnConnectionViaADB() - } - -} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/ManageOfflineContentE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/ManageOfflineContentE2ETest.kt index 5ca6d91392..7f324a2cdc 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/ManageOfflineContentE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/ManageOfflineContentE2ETest.kt @@ -19,12 +19,13 @@ package com.instructure.student.ui.e2e.offline import android.util.Log import androidx.test.espresso.Espresso import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory import com.instructure.canvas.espresso.OfflineE2E -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData -import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin @@ -34,13 +35,14 @@ import org.junit.Test @HiltAndroidTest class ManageOfflineContentE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @OfflineE2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.OFFLINE_CONTENT, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.OFFLINE_CONTENT, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) fun testManageOfflineContentE2ETest() { Log.d(PREPARATION_TAG,"Seeding data.") @@ -48,9 +50,8 @@ class ManageOfflineContentE2ETest : StudentTest() { val student = data.studentsList[0] val course1 = data.coursesList[0] val course2 = data.coursesList[1] - val testAnnouncement = data.announcementsList[0] - Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() @@ -75,6 +76,12 @@ class ManageOfflineContentE2ETest : StudentTest() { Log.d(STEP_TAG, "Assert that the tool bar texts are displayed properly, so the subtitle is '${course1.name}', because we are on the Manage Offline Content page of '${course1.name}' course.") manageOfflineContentPage.assertToolbarTexts(course1.name) + Log.d(STEP_TAG, "Assert that the '${course1.name}' course's checkbox state became 'Checked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course1.name, MaterialCheckBox.STATE_CHECKED) + + Log.d(STEP_TAG, "Expand '${course1.name}' course.") + manageOfflineContentPage.expandCollapseItem(course1.name) + Log.d(STEP_TAG, "Deselect the 'Announcements' and 'Discussions' of the '${course1.name}' course.") manageOfflineContentPage.changeItemSelectionState("Announcements") manageOfflineContentPage.changeItemSelectionState("Discussions") @@ -131,7 +138,7 @@ class ManageOfflineContentE2ETest : StudentTest() { manageOfflineContentPage.assertCheckedStateOfItem("Announcements", MaterialCheckBox.STATE_UNCHECKED) manageOfflineContentPage.assertCheckedStateOfItem("Discussions", MaterialCheckBox.STATE_UNCHECKED) - Log.d(STEP_TAG, "Assert that the 'SELECT ALL' will be displayed after clicking the 'SELECT ALL' button.") + Log.d(STEP_TAG, "Assert that the 'SELECT ALL' will be displayed after clicking the 'DESELECT ALL' button.") manageOfflineContentPage.assertSelectButtonText(selectAll = true) Log.d(STEP_TAG, "Navigate back to Dashboard Page. Open 'Global' Manage Offline Content page.") @@ -185,20 +192,18 @@ class ManageOfflineContentE2ETest : StudentTest() { Log.d(STEP_TAG, "Assert that both of the seeded courses are displayed as a selectable item in the Manage Offline Content page.") manageOfflineContentPage.assertCourseCountWithMatcher(2) - Log.d(STEP_TAG, "Click on the 'Sync' button.") + Log.d(STEP_TAG, "Click on the 'Sync' button and confirm sync.") manageOfflineContentPage.clickOnSyncButtonAndConfirm() - Log.d(STEP_TAG, "Wait for the 'Download Started' dashboard notification to be displayed, and the to disappear.") - dashboardPage.waitForRender() - dashboardPage.waitForSyncProgressDownloadStartedNotification() - dashboardPage.waitForSyncProgressDownloadStartedNotificationToDisappear() - - Log.d(STEP_TAG, "Wait for the 'Syncing Offline Content' dashboard notification to be displayed, and the to disappear. (It should be displayed after the 'Download Started' notification immediately.)") - dashboardPage.waitForSyncProgressStartingNotification() - dashboardPage.waitForSyncProgressStartingNotificationToDisappear() + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course2.name) + device.waitForIdle() Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") - OfflineTestUtils.turnOffConnectionViaADB() + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") dashboardPage.waitForRender() Log.d(STEP_TAG, "Select '${course2.name}' course and open 'Grades' menu to check if it's really synced and can be seen in offline mode.") @@ -212,7 +217,7 @@ class ManageOfflineContentE2ETest : StudentTest() { @After fun tearDown() { Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device via ADB, so it will come back online.") - OfflineTestUtils.turnOnConnectionViaADB() + turnOnConnectionViaADB() } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAllCoursesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAllCoursesE2ETest.kt new file mode 100644 index 0000000000..cb99b21f54 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAllCoursesE2ETest.kt @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import androidx.test.espresso.matcher.ViewMatchers +import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineAllCoursesE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E, SecondaryFeatureCategory.ALL_COURSES) + fun testOfflineAllCoursesE2E() { + + Log.d(PREPARATION_TAG, "Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 3, announcements = 1) + val student = data.studentsList[0] + val course1 = data.coursesList[0] + val course2 = data.coursesList[1] + val course3 = data.coursesList[2] + + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the 'All Courses' page and wait for it to be rendered.") + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() + + Log.d(STEP_TAG, "Favourite '${course1.name}' course and assert if it became favourited. Then navigate back to Dashboard page.") + allCoursesPage.favoriteCourse(course1.name) + allCoursesPage.assertCourseFavorited(course1) + Espresso.pressBack() + + Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.openGlobalManageOfflineContentPage() + manageOfflineContentPage.assertPageObjects() + + Log.d(STEP_TAG, "Assert that the '${course1.name}' course's checkbox state is 'Unchecked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course1.name, MaterialCheckBox.STATE_UNCHECKED) + manageOfflineContentPage.assertCheckedStateOfItem(course2.name, MaterialCheckBox.STATE_UNCHECKED) + + Log.d(STEP_TAG, "Select '${course1.name}' and '${course2.name}' courses' checkboxes and Sync them.") + manageOfflineContentPage.changeItemSelectionState(course1.name) + manageOfflineContentPage.changeItemSelectionState(course2.name) + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon is displayed on the synced (and favorited) course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered, and assert that '${course1.name}' is the only course which is displayed on the offline mode Dashboard Page.") + dashboardPage.assertDisplaysCourse(course1) + dashboardPage.assertCourseNotDisplayed(course2) + dashboardPage.assertCourseNotDisplayed(course3) + + Log.d(STEP_TAG, "Open the 'All Courses' page and wait for it to be rendered.") + dashboardPage.openAllCoursesPage() + allCoursesPage.assertPageObjects() + + Log.d(STEP_TAG, "Assert that the plus 'Note' box is displayed in which warns the user that favouring courses can only be done in online mode.") + allCoursesPage.assertOfflineNoteDisplayed() + + Log.d(STEP_TAG, "Dismiss the offline 'Note' box and assert if it's disappear.") + allCoursesPage.dismissOfflineNoteBox() + allCoursesPage.assertOfflineNoteNotDisplayed() + + Log.d(STEP_TAG, "Assert that the select/unselect all button is not clickable because offline mode does not supports it.") + allCoursesPage.assertSelectUnselectAllButtonNotClickable() + + Log.d(STEP_TAG, "Try to unfavorite '${course1.name}' course and assert it does not happened because favoring does not allowed in offline state.") + allCoursesPage.unfavoriteCourse(course1.name) + allCoursesPage.assertCourseFavorited(course1) + + Log.d(STEP_TAG, "Assert that '${course3.name}' course's details are faded (and they having 0.4 alpha value) and it's offline sync icon is not displayed since it's not synced.") + allCoursesPage.assertCourseDetailsAlpha(course3.name, 0.4f) + allCoursesPage.assertCourseOfflineSyncButton(course3.name, ViewMatchers.Visibility.GONE) + + Log.d(STEP_TAG, "Assert that '${course1.name}' course's favourite star is faded (and it's having 0.4 alpha value) because favoring is not possible in offline mode," + + "the course title and open button are not faded (1.0 alpha value) and the offline sync icon is displayed since the course is synced.") + allCoursesPage.assertCourseFavouriteStarAlpha(course1.name, 0.4f) + allCoursesPage.assertCourseTitleAlpha(course1.name, 1.0f) + allCoursesPage.assertCourseOpenButtonAlpha(course1.name, 1.0f) + allCoursesPage.assertCourseOfflineSyncButton(course1.name, ViewMatchers.Visibility.VISIBLE) + + Log.d(STEP_TAG, "Click on '${course1.name}' course and assert if it will navigate the user to the CourseBrowser Page.") + allCoursesPage.openCourse(course1.name) + courseBrowserPage.assertTitleCorrect(course1) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt new file mode 100644 index 0000000000..77c31f5877 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.dataseeding.api.DiscussionTopicsApi +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test +import java.lang.Thread.sleep + +@HiltAndroidTest +class OfflineAnnouncementsE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineAnnouncementsE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1, announcements = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + val announcement = data.announcementsList[0] + + val lockedAnnouncement = DiscussionTopicsApi.createAnnouncement(course.id, teacher.token, locked = true) + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Expand '${course.name}' course.") + manageOfflineContentPage.expandCollapseItem(course.name) + + Log.d(STEP_TAG, "Select the 'Announcements' of '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.changeItemSelectionState("Announcements") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + OfflineTestUtils.assertOfflineIndicator() + + Log.d(STEP_TAG, "Select '${course.name}' course and open 'Announcements' menu.") + dashboardPage.selectCourse(course) + courseBrowserPage.selectAnnouncements() + + Log.d(STEP_TAG,"Assert that '${announcement.title}' announcement is displayed.") + announcementListPage.assertTopicDisplayed(announcement.title) + + Log.d(STEP_TAG, "Assert that '${lockedAnnouncement.title}' announcement is really locked so that the 'locked' icon is displayed.") + announcementListPage.assertAnnouncementLocked(lockedAnnouncement.title) + + Log.d(STEP_TAG, "Select '${lockedAnnouncement.title}' announcement and assert if we are landing on the Discussion Details Page.") + announcementListPage.selectTopic(lockedAnnouncement.title) + discussionDetailsPage.assertTitleText(lockedAnnouncement.title) + + Log.d(STEP_TAG, "Assert that the 'Reply' button is not available on a locked announcement. Navigate back to Announcement List Page.") + discussionDetailsPage.assertReplyButtonNotDisplayed() + Espresso.pressBack() + + Log.d(STEP_TAG,"Select '${announcement.title}' announcement and assert if we are landing on the Discussion Details Page.") + announcementListPage.selectTopic(announcement.title) + discussionDetailsPage.assertTitleText(announcement.title) + + Log.d(STEP_TAG, "Click on the 'Reply' button and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.") + discussionDetailsPage.clickReply() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG,"Navigate back to Announcement List page. Click on Search button and type '${announcement.title}' to the search input field.") + Espresso.pressBack() + announcementListPage.searchable.clickOnSearchButton() + announcementListPage.searchable.typeToSearchBar(announcement.title) + + Log.d(STEP_TAG,"Assert that only the matching announcement is displayed on the Discussion List Page.") + announcementListPage.pullToUpdate() + announcementListPage.assertTopicDisplayed(announcement.title) + announcementListPage.assertTopicNotDisplayed(lockedAnnouncement.title) + + Log.d(STEP_TAG,"Clear search input field value and assert if all the announcements are displayed again on the Discussion List Page.") + announcementListPage.searchable.clickOnClearSearchButton() + announcementListPage.waitForDiscussionTopicToDisplay(lockedAnnouncement.title) + announcementListPage.assertTopicDisplayed(announcement.title) + + Log.d(STEP_TAG,"Type the '${announcement.title}' announcement's title as search value to the search input field. Assert the the '${announcement.title}' announcement, but only that displayed as result.") + announcementListPage.searchable.typeToSearchBar(announcement.title) + sleep(3000) //We need this wait here to let make sure the search process has finished. + announcementListPage.assertTopicDisplayed(announcement.title) + announcementListPage.assertTopicNotDisplayed(lockedAnnouncement.title) + + Log.d(STEP_TAG,"Clear search input field value and assert if both the announcements are displayed again on the Announcement List Page.") + announcementListPage.searchable.clickOnClearSearchButton() + announcementListPage.waitForDiscussionTopicToDisplay(lockedAnnouncement.title) + announcementListPage.assertTopicDisplayed(announcement.title) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineCourseBrowserE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineCourseBrowserE2ETest.kt new file mode 100644 index 0000000000..017eed51df --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineCourseBrowserE2ETest.kt @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.pages.CourseBrowserPage +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineCourseBrowserE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.COURSE, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineCourseBrowserPageUnavailableE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1, announcements = 1) + val student = data.studentsList[0] + val course = data.coursesList[0] + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.openGlobalManageOfflineContentPage() + + Log.d(STEP_TAG, "Expand '${course.name}' course. Select only the 'Announcements' of the '${course.name}' course. Click on the 'Sync' button and confirm the sync process.") + manageOfflineContentPage.expandCollapseItem(course.name) + manageOfflineContentPage.changeItemSelectionState("Announcements") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Select '${course.name}' course and open 'Announcements' menu.") + dashboardPage.selectCourse(course) + + Log.d(STEP_TAG, "Assert that only the 'Announcements' tab is enabled because it is the only one which has been synced, and assert that all the other, previously synced tabs are disabled, because they weren't synced now.") + var enabledTabs = arrayOf("Announcements") + var disabledTabs = arrayOf("Discussions", "Grades", "People", "Syllabus", "BigBlueButton") + assertTabsEnabled(courseBrowserPage, enabledTabs) + assertTabsDisabled(courseBrowserPage, disabledTabs) + + Log.d(STEP_TAG, "Navigate back to Dashboard Page.Turn back on the Wi-Fi and Mobile Data on the device, and wait for it to come online.") + Espresso.pressBack() + turnOnConnectionViaADB() + dashboardPage.waitForOfflineIndicatorNotDisplayed() + + Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.openGlobalManageOfflineContentPage() + + Log.d(STEP_TAG, "Deselect the entire '${course.name}' course for sync.") + manageOfflineContentPage.changeItemSelectionState(course.name) + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + + Log.d(STEP_TAG, "Select '${course.name}' course and open 'Announcements' menu.") + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Select '${course.name}' course.") + dashboardPage.selectCourse(course) + + Log.d(STEP_TAG, "Assert that the 'Google Drive' and 'Collaborations' tabs are disabled because they aren't supported in offline mode, but the rest of the tabs are enabled because the whole course has been synced.") + enabledTabs = arrayOf("Announcements", "Discussions", "Grades", "People", "Syllabus", "BigBlueButton") + disabledTabs = arrayOf("Google Drive", "Collaborations") + assertTabsEnabled(courseBrowserPage, enabledTabs) + assertTabsDisabled(courseBrowserPage, disabledTabs) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + + private fun assertTabsEnabled(courseBrowserPage: CourseBrowserPage, tabs: Array) { + tabs.forEach { tab -> + courseBrowserPage.assertTabEnabled(tab) + } + } + + private fun assertTabsDisabled(courseBrowserPage: CourseBrowserPage, tabs: Array) { + tabs.forEach { tab -> + courseBrowserPage.assertTabDisabled(tab) + } + } +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDashboardE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDashboardE2ETest.kt new file mode 100644 index 0000000000..c49034b82d --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDashboardE2ETest.kt @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineDashboardE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineDashboardE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 2, announcements = 1) + val student = data.studentsList[0] + val course1 = data.coursesList[0] + val course2 = data.coursesList[1] + val testAnnouncement = data.announcementsList[0] + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.openGlobalManageOfflineContentPage() + + Log.d(STEP_TAG, "Assert that the '${course1.name}' course's checkbox state is 'Unchecked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course1.name, MaterialCheckBox.STATE_UNCHECKED) + + Log.d(STEP_TAG, "Select the entire '${course1.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.changeItemSelectionState(course1.name) + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + OfflineTestUtils.assertOfflineIndicator() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) + dashboardPage.assertCourseOfflineSyncIconGone(course2.name) + + Log.d(STEP_TAG, "Select '${course1.name}' course and open 'Announcements' menu.") + dashboardPage.selectCourse(course1) + courseBrowserPage.selectAnnouncements() + + Log.d(STEP_TAG,"Assert that the '${testAnnouncement.title}' titled announcement is displayed, so the user is able to see it in offline mode because it was synced.") + announcementListPage.assertTopicDisplayed(testAnnouncement.title) + } + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineDashboardUnavailableFeaturesE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1) + val student = data.studentsList[0] + val course = data.coursesList[0] + + Log.d(PREPARATION_TAG, "Get the device to be able to perform app-independent actions on it.") + val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) + + Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Select the entire '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.changeItemSelectionState(course.name) + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + OfflineTestUtils.assertOfflineIndicator() + + Log.d(STEP_TAG, "Assert that the bottom menus (except Dashboard) are disabled and unavailable in offline mode.") + dashboardPage.assertBottomMenusAreDisabled() + + Log.d(STEP_TAG, "Try to open the '${course.name}' course's more menu of the Dashboard Page. Assert that the 'No Internet Connection' dialog is displayed. Dismiss it after the assertion.") + dashboardPage.clickOnCourseOverflowButton(course.name) + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Try to open the global 'Manage Offline Content' page via the more menu of the Dashboard Page. Assert that the 'No Internet Connection' dialog is displayed. Dismiss it after the assertion.") + Thread.sleep(5000) //Wait for the system notification to disappear, because it overlaps the More menu button on the toolbar. + dashboardPage.openGlobalManageOfflineContentPage() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt new file mode 100644 index 0000000000..37fad33e9d --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt @@ -0,0 +1,179 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.checkToastText +import com.instructure.dataseeding.api.DiscussionTopicsApi +import com.instructure.espresso.getDateInCanvasFormat +import com.instructure.student.R +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.ViewUtils +import com.instructure.student.ui.utils.openOverflowMenu +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test +import java.lang.Thread.sleep + +@HiltAndroidTest +class OfflineDiscussionsE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineDiscussionsE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + + Log.d(PREPARATION_TAG,"Seed a discussion topic for '${course.name}' course.") + val discussion1 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token) + + Log.d(PREPARATION_TAG,"Seed another discussion topic for '${course.name}' course.") + val discussion2 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token) + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + + Log.d(STEP_TAG,"Wait for the Dashboard Page to be rendered.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Select '${course.name}' course and navigate to Discussion List page.") + dashboardPage.selectCourse(course) + courseBrowserPage.selectDiscussions() + + Log.d(STEP_TAG,"Select '$discussion1' discussion topic and assert that there is no reply on the details page as well.") + discussionListPage.selectTopic(discussion1.title) + discussionDetailsPage.assertNoRepliesDisplayed() + + val replyMessage = "My reply" + Log.d(STEP_TAG,"Send a reply with text: '$replyMessage'.") + discussionDetailsPage.sendReply(replyMessage) + sleep(2000) // Allow some time for reply to propagate + + Log.d(STEP_TAG,"Assert the the previously sent reply '$replyMessage', is displayed on the details page.") + discussionDetailsPage.assertRepliesDisplayed() + + Log.d(STEP_TAG, "Navigate back to the Dashboard page.") + ViewUtils.pressBackButton(3) + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Expand '${course.name}' course.") + manageOfflineContentPage.expandCollapseItem(course.name) + + Log.d(STEP_TAG, "Select the 'Discussions' of '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.changeItemSelectionState("Discussions") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + OfflineTestUtils.assertOfflineIndicator() + + Log.d(STEP_TAG, "Select '${course.name}' course and open 'Announcements' menu.") + dashboardPage.selectCourse(course) + + Log.d(STEP_TAG,"Navigate to Discussion List Page.") + courseBrowserPage.selectDiscussions() + + Log.d(STEP_TAG, "Assert that both the '${discussion1.title}' and '${discussion2.title}' discussion are displayed on the Discussion List page.") + discussionListPage.assertTopicDisplayed(discussion1.title) + discussionListPage.assertTopicDisplayed(discussion2.title) + + Log.d(STEP_TAG,"Refresh the page. Assert that the previously sent reply has been counted, and there are no unread replies.") + discussionListPage.assertReplyCount(discussion1.title, 1) + discussionListPage.assertUnreadReplyCount(discussion1.title, 0) + + Log.d(STEP_TAG, "Assert that the due date is the current date (in the expected format).") + val currentDate = getDateInCanvasFormat() + discussionListPage.assertDueDate(discussion1.title, currentDate) + + Log.d(STEP_TAG, "Click on the Search (magnifying glass) icon and the '${discussion1.title}' discussion's title into the search input field.") + discussionListPage.searchable.clickOnSearchButton() + discussionListPage.searchable.typeToSearchBar(discussion1.title) + + Log.d(STEP_TAG, "Assert that only the '${discussion1.title}' discussion displayed as a search result and the other, '${discussion2.title}' discussion has not displayed.") + discussionListPage.assertTopicDisplayed(discussion1.title) + discussionListPage.assertTopicNotDisplayed(discussion2.title) + + Log.d(STEP_TAG, "Click on the 'Clear Search' (X) icon and assert that both of the discussion should be displayed again.") + discussionListPage.searchable.clickOnClearSearchButton() + discussionListPage.waitForDiscussionTopicToDisplay(discussion2.title) + discussionListPage.assertTopicDisplayed(discussion1.title) + + Log.d(STEP_TAG,"Select '${discussion1.title}' discussion and assert if the corresponding discussion title is displayed.") + discussionListPage.selectTopic(discussion1.title) + discussionDetailsPage.assertTitleText(discussion1.title) + + Log.d(STEP_TAG, "Try to click on the (main) 'Reply' button and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.") + discussionDetailsPage.clickReply() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Try to click on the (inner) 'Reply' button (so try to 'reply to a reply') and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.") + discussionDetailsPage.clickOnInnerReply() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG,"Navigate back to Discussion List Page.") + Espresso.pressBack() + + Log.d(STEP_TAG,"Select '${discussion2.title}' discussion and assert if the Discussion Details page is displayed and there is no reply for the discussion yet.") + discussionListPage.selectTopic(discussion2.title) + discussionDetailsPage.assertTitleText(discussion2.title) + discussionDetailsPage.assertNoRepliesDisplayed() + + Log.d(STEP_TAG, "Try to click on 'Add Bookmark' overflow menu and assert that the 'Functionality unavailable while offline' toast message is displayed.") + openOverflowMenu() + discussionDetailsPage.clickOnAddBookmarkMenu() + checkToastText(R.string.notAvailableOffline, activityRule.activity) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineFilesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineFilesE2ETest.kt new file mode 100644 index 0000000000..1670437cc1 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineFilesE2ETest.kt @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.dataseeding.api.FileFolderApi +import com.instructure.dataseeding.model.FileUploadType +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import com.instructure.student.ui.utils.uploadTextFile +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineFilesE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.FILES, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineFilesE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(teachers = 1, courses = 1, students = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + + val testCourseFolderName = "Goodya" + Log.d(PREPARATION_TAG, "Create a course folder within the 'Files' tab with the name: '$testCourseFolderName'.") + val courseRootFolder = FileFolderApi.getCourseRootFolder(course.id, teacher.token) + val courseTestFolder = FileFolderApi.createCourseFolder(courseRootFolder.id, teacher.token, testCourseFolderName) + + Log.d(PREPARATION_TAG, "Create a (text) file within the root folder (so the 'Files' tab file list) of the '${course.name}' course.") + val rootFolderTestTextFile = uploadTextFile(courseRootFolder.id, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE) + + Log.d(PREPARATION_TAG, "Create a (text) file within the '${courseTestFolder.name}' folder of the '${course.name}' course.") + val courseTestFolderTextFile = uploadTextFile(courseTestFolder.id, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE) + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Assert that the '${course.name}' course's checkbox state is 'Unchecked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course.name, MaterialCheckBox.STATE_UNCHECKED) + + Log.d(STEP_TAG, "Expand the course. Select the 'Files' of '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.expandCollapseItem(course.name) + manageOfflineContentPage.changeItemSelectionState("Files") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Select '${course.name}' course and click on 'Files' tab to navigate to the File List Page.") + dashboardPage.selectCourse(course) + courseBrowserPage.selectFiles() + + Log.d(STEP_TAG, "Assert that under the 'Files' tab there are 2 items, a folder and a file which has been seeded recently, and there is 1 item within the folder.") + fileListPage.assertFileListCount(2) + fileListPage.assertFolderSize(courseTestFolder.name, 1) + + Log.d(STEP_TAG, "Assert that the folder's name is '${courseTestFolder.name}' and the file's name is '${rootFolderTestTextFile.fileName}'.") + fileListPage.assertItemDisplayed(rootFolderTestTextFile.fileName) + fileListPage.assertItemDisplayed(courseTestFolder.name) + + Log.d(STEP_TAG, "Open '${courseTestFolder.name}' folder and assert that the '${courseTestFolderTextFile.fileName}' file is displayed within it. Navigate back to File List Page.") + fileListPage.selectItem(courseTestFolder.name) + fileListPage.assertItemDisplayed(courseTestFolderTextFile.fileName) + Espresso.pressBack() + + Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${rootFolderTestTextFile.fileName}', the file's name to the search input field.") + fileListPage.searchable.clickOnSearchButton() + fileListPage.searchable.typeToSearchBar(rootFolderTestTextFile.fileName) + + Log.d(STEP_TAG, "Assert that only 1 file matches for the search text, and it is '${rootFolderTestTextFile.fileName}', and no directories has been shown in the result.") + fileListPage.assertSearchResultCount(1) + fileListPage.assertSearchItemDisplayed(rootFolderTestTextFile.fileName) + fileListPage.assertItemNotDisplayed(testCourseFolderName) + Espresso.closeSoftKeyboard() + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLeftSideMenuE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLeftSideMenuE2ETest.kt new file mode 100644 index 0000000000..84bcbdd3be --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLeftSideMenuE2ETest.kt @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertNoInternetConnectionDialog +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertOfflineIndicator +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.dismissNoInternetConnectionDialog +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineLeftSideMenuE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.LEFT_SIDE_MENU, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineLeftSideMenuUnavailableFunctionsE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1, announcements = 1) + val student = data.studentsList[0] + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + assertOfflineIndicator() + + Log.d(STEP_TAG, "Open Left Side Menu by clicking on the 'hamburger/kebab icon' on the Dashboard Page.") + dashboardPage.openLeftSideMenu() + + Log.d(STEP_TAG, "Assert that the offline indicator is displayed below the user info within the header.") + leftSideNavigationDrawerPage.assertOfflineIndicatorDisplayed() + + Log.d(STEP_TAG, "Assert that the 'Files, Bookmarks, Studio, Color Overlay, Help' menus are disabled in offline mode.") + leftSideNavigationDrawerPage.assertOfflineDisabledMenus(0.5f) + + Log.d(STEP_TAG, "Assert that the 'Settings, Show Grades, Change User, Log Out' menus are enabled in offline mode because they are supported.") + leftSideNavigationDrawerPage.assertOfflineEnabledMenus(1.0f) + + Log.d(STEP_TAG, "Click on 'Files' menu and assert that the 'No Internet Connection' dialog is popping-up. Dismiss it.") + leftSideNavigationDrawerPage.clickFilesMenu() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Click on 'Bookmarks' menu and assert that the 'No Internet Connection' dialog is popping-up. Dismiss it.") + leftSideNavigationDrawerPage.clickBookmarksMenu() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Click on 'Studio' menu and assert that the 'No Internet Connection' dialog is popping-up. Dismiss it.") + leftSideNavigationDrawerPage.clickStudioMenu() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Click on 'Help' menu and assert that the 'No Internet Connection' dialog is popping-up. Dismiss it.") + leftSideNavigationDrawerPage.clickHelpMenu() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device via ADB, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLoginE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLoginE2ETest.kt new file mode 100644 index 0000000000..810839655b --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineLoginE2ETest.kt @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.dataseeding.model.CanvasUserApiModel +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertNoInternetConnectionDialog +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.dismissNoInternetConnectionDialog +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test +import java.lang.Thread.sleep + +@HiltAndroidTest +class OfflineLoginE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflineChangeUserE2E() { + + Log.d(PREPARATION_TAG, "Seeding data.") + val data = seedData(students = 2, teachers = 1, courses = 1) + val student1 = data.studentsList[0] + val student2 = data.studentsList[1] + + Log.d(STEP_TAG, "Login with user: '${student1.name}', login id: '${student1.loginId}'.") + loginWithUser(student1) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline indicator is not displayed because we are in online mode yet.") + dashboardPage.assertOfflineIndicatorNotDisplayed() + + Log.d(STEP_TAG, "Click on 'Change User' button on the left-side menu.") + leftSideNavigationDrawerPage.clickChangeUserMenu() + + Log.d(STEP_TAG, "Login with user: '${student2.name}', login id: '${student2.loginId}'.") + loginWithUser(student2, true) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline indicator is not displayed because we are in online mode yet.") + dashboardPage.assertOfflineIndicatorNotDisplayed() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Click on 'Change User' button on the left-side menu.") + leftSideNavigationDrawerPage.clickChangeUserMenu() + + Log.d(STEP_TAG, "Assert that the previously logins has been displayed. Assert that '${student1.name}' and '${student2.name}' students are displayed within the previous login section.") + loginLandingPage.assertDisplaysPreviousLogins() + loginLandingPage.assertPreviousLoginUserDisplayed(student1.name) + loginLandingPage.assertPreviousLoginUserDisplayed(student2.name) + + Log.d(STEP_TAG, "Try to click on the last saved school's button and assert that the 'No Internet Connection' dialog will be displayed. Dismiss the dialog.") + loginLandingPage.clickOnLastSavedSchoolButton() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Try to click on the 'Find another school' button and assert that the 'No Internet Connection' dialog will be displayed. Dismiss the dialog.") + loginLandingPage.clickFindAnotherSchoolButton() + assertNoInternetConnectionDialog() + dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Login with the previous user, '${student1.name}', with one click, by clicking on the user's name on the bottom.") + loginLandingPage.loginWithPreviousUser(student1) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Assert that the offline indicator is displayed to ensure we are in offline mode, and change user function is supported.") + dashboardPage.waitForRender() + dashboardPage.assertOfflineIndicatorDisplayed() + + Log.d(STEP_TAG, "Click on 'Change User' button on the left-side menu.") + leftSideNavigationDrawerPage.clickChangeUserMenu() + + Log.d(STEP_TAG, "Login with the previous user, '${student2.name}', with one click, by clicking on the user's name on the bottom.") + loginLandingPage.loginWithPreviousUser(student2) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Assert that the offline indicator is displayed to ensure we are in offline mode, and change user function is supported.") + dashboardPage.waitForRender() + dashboardPage.assertOfflineIndicatorDisplayed() + } + + private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) { + + sleep(5100) //Need to wait > 5 seconds before each login attempt because of new 'too many attempts' login policy on web. + + if(lastSchoolSaved) { + Log.d(STEP_TAG,"Click 'Find Another School' button.") + loginLandingPage.clickFindAnotherSchoolButton() + } + else { + Log.d(STEP_TAG, "Click 'Find My School' button.") + loginLandingPage.clickFindMySchoolButton() + } + + Log.d(STEP_TAG,"Enter domain: '${user.domain}'.") + loginFindSchoolPage.enterDomain(user.domain) + + Log.d(STEP_TAG,"Click on 'Next' button on the Toolbar.") + loginFindSchoolPage.clickToolbarNextMenuItem() + loginSignInPage.loginAs(user) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePagesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePagesE2ETest.kt new file mode 100644 index 0000000000..c2a949ce28 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePagesE2ETest.kt @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.Espresso +import androidx.test.espresso.web.webdriver.Locator +import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.dataseeding.api.PagesApi +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertOfflineIndicator +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline +import com.instructure.student.ui.pages.WebViewTextCheck +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflinePagesE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.PAGES, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflinePagesE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + + Log.d(PREPARATION_TAG,"Seed an UNPUBLISHED page for '${course.name}' course.") + val pageUnpublished = PagesApi.createCoursePage(course.id, teacher.token, published = false) + + Log.d(PREPARATION_TAG,"Seed a PUBLISHED page for '${course.name}' course.") + val pagePublished = PagesApi.createCoursePage(course.id, teacher.token, editingRoles = "teachers,students", body = "

Regular Page Text

") + + Log.d(PREPARATION_TAG,"Seed a PUBLISHED, but NOT editable page for '${course.name}' course.") + val pageNotEditable = PagesApi.createCoursePage(course.id, teacher.token, body = "

Regular Page Text

") + + Log.d(PREPARATION_TAG,"Seed a PUBLISHED, FRONT page for '${course.name}' course.") + val pagePublishedFront = PagesApi.createCoursePage(course.id, teacher.token, frontPage = true, editingRoles = "public", body = "

Front Page Text

") + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Assert that the '${course.name}' course's checkbox state is 'Unchecked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course.name, MaterialCheckBox.STATE_UNCHECKED) + + Log.d(STEP_TAG, "Expand the course. Select the 'Pages' of '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.expandCollapseItem(course.name) + manageOfflineContentPage.changeItemSelectionState("Pages") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Select '${course.name}' course and click on 'Pages' tab to navigate to the Page List Page.") + dashboardPage.selectCourse(course) + courseBrowserPage.selectPages() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Page List Page.") + assertOfflineIndicator() + + Log.d(STEP_TAG,"Assert that '${pagePublishedFront.title}' published front page is displayed.") + pageListPage.assertFrontPageDisplayed(pagePublishedFront) + + Log.d(STEP_TAG,"Assert that '${pagePublished.title}' published page is displayed.") + pageListPage.assertRegularPageDisplayed(pagePublished) + + Log.d(STEP_TAG,"Assert that '${pageUnpublished.title}' unpublished page is NOT displayed.") + pageListPage.assertPageNotDisplayed(pageUnpublished) + + Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${pagePublishedFront.title}', the page's name to the search input field.") + pageListPage.searchable.clickOnSearchButton() + pageListPage.searchable.typeToSearchBar(pagePublishedFront.title) + + Log.d(STEP_TAG,"Assert that '${pagePublished.title}' published page is NOT displayed and there is only one page (the front page) is displayed.") + pageListPage.assertPageNotDisplayed(pagePublished) + pageListPage.assertPageListItemCount(1) + + Log.d(STEP_TAG, "Click on clear search icon (X).") + pageListPage.searchable.clickOnClearSearchButton() + + Log.d(STEP_TAG,"Assert that '${pagePublishedFront.title}' published front page is displayed.") + pageListPage.assertFrontPageDisplayed(pagePublishedFront) + + Log.d(STEP_TAG,"Assert that '${pagePublished.title}' published page is displayed.") + pageListPage.assertRegularPageDisplayed(pagePublished) + + Log.d(STEP_TAG,"Assert that '${pageUnpublished.title}' unpublished page is NOT displayed.") + pageListPage.assertPageNotDisplayed(pageUnpublished) + + Log.d(STEP_TAG,"Open '${pagePublishedFront.title}' page. Assert that it is really a front (published) page via web view assertions.") + pageListPage.selectFrontPage(pagePublishedFront) + canvasWebViewPage.runTextChecks(WebViewTextCheck(Locator.ID, "header1", "Front Page Text")) + + Log.d(STEP_TAG,"Navigate back to Pages page.") + Espresso.pressBack() + + Log.d(STEP_TAG, "Select '${pageNotEditable.title}' page. Assert that it is not editable as a student, then navigate back to Page List page.") + pageListPage.selectRegularPage(pageNotEditable) + canvasWebViewPage.assertDoesNotEditable() + Espresso.pressBack() + + Log.d(STEP_TAG,"Open '${pagePublished.title}' page. Assert that it is really a regular published page via web view assertions.") + pageListPage.selectRegularPage(pagePublished) + canvasWebViewPage.runTextChecks(WebViewTextCheck(Locator.ID, "header1", "Regular Page Text")) + + Log.d(STEP_TAG, "Click on the 'Pencil' icon. Assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog by accepting it.") + canvasWebViewPage.clickEditPencilIcon() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + + Log.d(STEP_TAG, "Navigate back to Page List page. Select '${pagePublishedFront.title}' front page.") + Espresso.pressBack() + pageListPage.selectFrontPage(pagePublishedFront) + + Log.d(STEP_TAG, "Click on the 'Pencil' icon. Assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog by accepting it.") + canvasWebViewPage.clickEditPencilIcon() + OfflineTestUtils.assertNoInternetConnectionDialog() + OfflineTestUtils.dismissNoInternetConnectionDialog() + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePeopleE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePeopleE2ETest.kt new file mode 100644 index 0000000000..a48ff20b91 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflinePeopleE2ETest.kt @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import androidx.test.espresso.matcher.ViewMatchers +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflinePeopleE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.PEOPLE, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun testOfflinePeopleE2E() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 1, announcements = 1) + val student = data.studentsList[0] + val teacher = data.teachersList[0] + val course = data.coursesList[0] + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.") + dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content") + + Log.d(STEP_TAG, "Expand '${course.name}' course.") + manageOfflineContentPage.expandCollapseItem(course.name) + + Log.d(STEP_TAG, "Select the 'People' of '${course.name}' course for sync. Click on the 'Sync' button.") + manageOfflineContentPage.changeItemSelectionState("People") + manageOfflineContentPage.clickOnSyncButtonAndConfirm() + + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + dashboardPage.assertCourseOfflineSyncIconVisible(course.name) + device.waitForIdle() + + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") + OfflineTestUtils.assertOfflineIndicator() + + Log.d(STEP_TAG, "Select '${course.name}' course and open 'People' menu.") + dashboardPage.selectCourse(course) + courseBrowserPage.selectPeople() + + Log.d(STEP_TAG, "Select '${teacher.name}' teacher.") + peopleListPage.selectPerson(teacher) + + Log.d(STEP_TAG, "Assert that the compose message icon is not displayed (GONE) because it is not supported in offline mode.") + personDetailsPage.assertComposeMessageIcon(ViewMatchers.Visibility.GONE) + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncProgressE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncProgressE2ETest.kt index 77cea19bc2..9bb2940fa9 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncProgressE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncProgressE2ETest.kt @@ -18,11 +18,13 @@ package com.instructure.student.ui.e2e.offline import android.util.Log import androidx.test.espresso.Espresso +import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory import com.instructure.canvas.espresso.OfflineE2E -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData @@ -33,62 +35,86 @@ import org.junit.Test @HiltAndroidTest class OfflineSyncProgressE2ETest : StudentTest() { + override fun displaysPageObjects() = Unit override fun enableAndConfigureAccessibilityChecks() = Unit @OfflineE2E @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SYNC_PROGRESS, TestCategory.E2E) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SYNC_PROGRESS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) fun testOfflineGlobalCourseSyncProgressE2E() { Log.d(PREPARATION_TAG,"Seeding data.") - val data = seedData(students = 1, teachers = 1, courses = 2, announcements = 1) + val data = seedData(students = 1, teachers = 1, courses = 4, announcements = 3, discussions = 5, syllabusBody = "Syllabus body") val student = data.studentsList[0] val course1 = data.coursesList[0] val course2 = data.coursesList[1] + val course3 = data.coursesList[2] + val course4 = data.coursesList[3] val testAnnouncement = data.announcementsList[0] - Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.") + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") tokenLogin(student) dashboardPage.waitForRender() Log.d(STEP_TAG, "Open global 'Manage Offline Content' page via the more menu of the Dashboard Page.") dashboardPage.openGlobalManageOfflineContentPage() + Log.d(STEP_TAG, "Assert that the '${course1.name}' course's checkbox state is 'Unchecked'.") + manageOfflineContentPage.assertCheckedStateOfItem(course1.name, MaterialCheckBox.STATE_UNCHECKED) + Log.d(STEP_TAG, "Select the entire '${course1.name}' course for sync. Click on the 'Sync' button.") manageOfflineContentPage.changeItemSelectionState(course1.name) + manageOfflineContentPage.changeItemSelectionState(course2.name) + manageOfflineContentPage.changeItemSelectionState(course3.name) manageOfflineContentPage.clickOnSyncButtonAndConfirm() - Log.d(STEP_TAG, "Wait for the 'Download Started' dashboard notification to be displayed, and the to disappear.") + Log.d(STEP_TAG, "Wait for the Dashboard to be rendered.") dashboardPage.waitForRender() - dashboardPage.waitForSyncProgressDownloadStartedNotification() - dashboardPage.waitForSyncProgressDownloadStartedNotificationToDisappear() - Log.d(STEP_TAG, "Wait for the 'Syncing Offline Content' dashboard notification to be displayed, and click on it to enter the Sync Progress Page.") - dashboardPage.waitForSyncProgressStartingNotification() + Log.d(STEP_TAG, "Click on the Dashboard notification to open the Sync Progress Page.") dashboardPage.clickOnSyncProgressNotification() - Log.d(STEP_TAG, "Assert that the Sync Progress has started.") - syncProgressPage.waitForDownloadStarting() - Log.d(STEP_TAG, "Assert that the Sync Progress has been successful (so to have the success title and the course success indicator).") syncProgressPage.assertDownloadProgressSuccessDetails() syncProgressPage.assertCourseSyncedSuccessfully(course1.name) + syncProgressPage.assertCourseSyncedSuccessfully(course2.name) + syncProgressPage.assertCourseSyncedSuccessfully(course3.name) + + Log.d(STEP_TAG, "Get the sum of '${course1.name}', '${course2.name}' and '${course3.name}' courses' sizes and assert that the sum number is displayed under the progress bar.") + val sumOfSyncedCourseSizes = syncProgressPage.getCourseSize(course1.name) + syncProgressPage.getCourseSize(course2.name) + syncProgressPage.getCourseSize(course3.name) + syncProgressPage.assertSumOfCourseSizes(sumOfSyncedCourseSizes) + + Log.d(STEP_TAG, "Expand '${course1.name}' course and assert a few tabs (for example) to ensure they synced well and the success indicator is displayed in their rows.") + syncProgressPage.expandCollapseCourse(course1.name) + syncProgressPage.assertCourseTabSynced("Syllabus") + syncProgressPage.assertCourseTabSynced("Announcements") + syncProgressPage.assertCourseTabSynced("Grades") + device.waitForIdle() Log.d(STEP_TAG, "Navigate back to Dashboard Page and wait for it to be rendered.") Espresso.pressBack() + Log.d(STEP_TAG, "Assert that the offline sync icon is displayed in online mode on the synced courses' course cards.") + dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) + dashboardPage.assertCourseOfflineSyncIconVisible(course2.name) + Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.") - OfflineTestUtils.turnOffConnectionViaADB() + turnOffConnectionViaADB() + OfflineTestUtils.waitForNetworkToGoOffline(device) + + Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.") dashboardPage.waitForRender() Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.") OfflineTestUtils.assertOfflineIndicator() - Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.") + Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced courses' course card.") dashboardPage.assertCourseOfflineSyncIconVisible(course1.name) - dashboardPage.assertCourseOfflineSyncIconGone(course2.name) + dashboardPage.assertCourseOfflineSyncIconVisible(course2.name) + dashboardPage.assertCourseOfflineSyncIconVisible(course3.name) + dashboardPage.assertCourseOfflineSyncIconGone(course4.name) Log.d(STEP_TAG, "Select '${course1.name}' course and open 'Announcements' menu.") dashboardPage.selectCourse(course1) @@ -101,7 +127,7 @@ class OfflineSyncProgressE2ETest : StudentTest() { @After fun tearDown() { Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device via ADB, so it will come back online.") - OfflineTestUtils.turnOnConnectionViaADB() + turnOnConnectionViaADB() } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncSettingsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncSettingsE2ETest.kt new file mode 100644 index 0000000000..6efa56db19 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyncSettingsE2ETest.kt @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.e2e.offline + +import android.util.Log +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.OfflineE2E +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.pandautils.R +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.ViewUtils +import com.instructure.student.ui.utils.seedData +import com.instructure.student.ui.utils.tokenLogin +import dagger.hilt.android.testing.HiltAndroidTest +import org.junit.After +import org.junit.Test + +@HiltAndroidTest +class OfflineSyncSettingsE2ETest : StudentTest() { + + override fun displaysPageObjects() = Unit + + override fun enableAndConfigureAccessibilityChecks() = Unit + + @OfflineE2E + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.OFFLINE_CONTENT, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE) + fun offlineSyncSettingsE2ETest() { + + Log.d(PREPARATION_TAG,"Seeding data.") + val data = seedData(students = 1, teachers = 1, courses = 2, announcements = 1) + val student = data.studentsList[0] + + Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.") + tokenLogin(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open Settings page from the Left Side menu.") + leftSideNavigationDrawerPage.clickSettingsMenu() + + Log.d(STEP_TAG, "Assert that the Offline Sync Settings related information is displayed properly on the Settings Page ('Daily' is the default status).") + settingsPage.assertOfflineContentDisplayed() + settingsPage.assertOfflineContentTitle() + settingsPage.assertOfflineSyncSettingsStatus(R.string.daily) + + Log.d(STEP_TAG, "Open Offline Sync Settings page and wait for it to be loaded.") + settingsPage.openOfflineSyncSettingsPage() + offlineSyncSettingsPage.assertPageObjects() + + Log.d(STEP_TAG, "Assert that further settings, such as the toolbar title is displayed and correct, and both the Auto Content Sync and Wi-Fi Only Sync toggles are displayed and checked by default.") + offlineSyncSettingsPage.assertFurtherSettingsIsDisplayed() + offlineSyncSettingsPage.assertSyncSettingsToolbarTitle() + offlineSyncSettingsPage.assertAutoSyncSwitchIsChecked() + offlineSyncSettingsPage.assertWifiOnlySwitchIsChecked() + + Log.d(STEP_TAG, "Assert that all the descriptions of how these settings are working are displayed.") + offlineSyncSettingsPage.assertSyncSettingsPageDescriptions() + + Log.d(STEP_TAG, "Assert that the sync frequency label is 'Daily', because that is the default setting.") + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.daily) + + Log.d(STEP_TAG, "Switch off the 'Auto Content Sync' toggle, and assert if that the further settings below will disappear.") + offlineSyncSettingsPage.clickAutoSyncSwitch() + + Log.d(STEP_TAG, "Assert that further settings, such as the toolbar title, Auto Content Sync and Wi-Fi Only Sync toggles are NOT displayed.") + offlineSyncSettingsPage.assertFurtherSettingsNotDisplayed() + + Log.d(STEP_TAG, "Switch back the 'Auto Content Sync' toggle, and assert if that the further settings below will be displayed again.") + offlineSyncSettingsPage.clickAutoSyncSwitch() + + Log.d(STEP_TAG, "Assert that further settings, such as the toolbar title is displayed and correct, and both the Auto Content Sync and Wi-Fi Only Sync toggles are displayed again.") + offlineSyncSettingsPage.assertFurtherSettingsIsDisplayed() + + Log.d(STEP_TAG, "Switch off the 'Sync Content Wi-Fi Only' toggle and assert that the confirmation dialog (with the proper texts) is displayed.") + offlineSyncSettingsPage.clickWifiOnlySwitch() + offlineSyncSettingsPage.assertTurnOffWifiOnlyDialogTexts() + + Log.d(STEP_TAG, "Click on the 'TURN OFF' button on the dialog to really turn off the 'Sync Content Wi-Fi Only' switch.") + offlineSyncSettingsPage.clickTurnOff() + + Log.d(STEP_TAG, "Assert that the 'Sync Content Wi-Fi Only' switch is not checked any more.") + offlineSyncSettingsPage.assertWifiOnlySwitchIsNotChecked() + + Log.d(STEP_TAG, "Open the Sync Frequency Settings dialog and select 'Weekly' option.") + offlineSyncSettingsPage.openSyncFrequencySettingsDialog() + offlineSyncSettingsPage.clickSyncFrequencyDialogOption(R.string.weekly) + + Log.d(STEP_TAG, "Assert that the sync frequency label became 'Weekly' (without any manual refresh).") + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.weekly) + + Log.d(STEP_TAG, "Navigate back to Dashboard Page and logout.") + ViewUtils.pressBackButton(2) + leftSideNavigationDrawerPage.logout() + + Log.d(STEP_TAG, "Click 'Find My School' button.") + loginLandingPage.clickFindMySchoolButton() + + Log.d(STEP_TAG, "Enter domain: '${student.domain}'.") + loginFindSchoolPage.enterDomain(student.domain) + + Log.d(STEP_TAG, "Click on 'Next' button on the Toolbar.") + loginFindSchoolPage.clickToolbarNextMenuItem() + + Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.") + loginSignInPage.loginAs(student) + dashboardPage.waitForRender() + + Log.d(STEP_TAG, "Open Settings page from the Left Side menu.") + leftSideNavigationDrawerPage.clickSettingsMenu() + + Log.d(STEP_TAG, "Assert that the Offline Sync Settings frequency text is 'Weekly' (because we set it previously).") + settingsPage.assertOfflineSyncSettingsStatus(R.string.weekly) + + Log.d(STEP_TAG, "Open Offline Sync Settings page and wait for it to be loaded.") + settingsPage.openOfflineSyncSettingsPage() + offlineSyncSettingsPage.assertPageObjects() + + Log.d(STEP_TAG, "Assert that the Offline Sync Settings frequency text is 'Weekly' (because we set it previously) and the 'Sync Content Wi-Fi Only' switch is switched off.") + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.weekly) + offlineSyncSettingsPage.assertWifiOnlySwitchIsNotChecked() + } + + @After + fun tearDown() { + Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device via ADB, so it will come back online.") + turnOnConnectionViaADB() + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/utils/OfflineTestUtils.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/utils/OfflineTestUtils.kt index 717d37af98..c7dbd9c204 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/utils/OfflineTestUtils.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/utils/OfflineTestUtils.kt @@ -16,14 +16,14 @@ */ package com.instructure.student.ui.e2e.offline.utils -import androidx.test.espresso.matcher.ViewMatchers.withChild -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiScrollable import androidx.test.uiautomator.UiSelector import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.click import com.instructure.espresso.matchers.WaitForViewMatcher.waitForView import com.instructure.espresso.page.plus import com.instructure.student.R @@ -31,18 +31,6 @@ import org.hamcrest.CoreMatchers.allOf object OfflineTestUtils { - fun turnOffConnectionViaADB() { - val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - device.executeShellCommand("svc wifi disable") - device.executeShellCommand("svc data disable") - } - - fun turnOnConnectionViaADB() { - val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - device.executeShellCommand("svc wifi enable") - device.executeShellCommand("svc data enable") - } - fun turnOffConnectionOnUI() { val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) @@ -80,4 +68,20 @@ object OfflineTestUtils { ) ).assertDisplayed() } + + fun assertNoInternetConnectionDialog() { + waitForView(withId(R.id.alertTitle) + withText(R.string.noInternetConnectionTitle)).assertDisplayed() + } + + fun dismissNoInternetConnectionDialog() { + onView(withText(android.R.string.ok) + isDescendantOfA(withId(R.id.buttonPanel) + + hasSibling(withId(R.id.topPanel) + + hasDescendant(withText(R.string.noInternetConnectionTitle))))).click() + } + + fun waitForNetworkToGoOffline(device: UiDevice) { + Thread.sleep(10000) //Need to wait a bit here because of a UI glitch that when network state change, the dashboard page 'pops' a bit and it can confuse the automation script. + device.waitForIdle() + device.waitForWindowUpdate(null, 10000) + } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/usergroups/UserGroupFilesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/usergroups/UserGroupFilesE2ETest.kt index e9825d4c3d..1c40730be3 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/usergroups/UserGroupFilesE2ETest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/usergroups/UserGroupFilesE2ETest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 - present Instructure, Inc. + * Copyright (C) 2023 - present Instructure, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ import android.util.Log import androidx.test.espresso.Espresso import androidx.test.espresso.intent.Intents import com.instructure.canvas.espresso.E2E +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.dataseeding.api.GroupsApi -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.SecondaryFeatureCategory -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.seedData import com.instructure.student.ui.utils.tokenLogin diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt index 187ff93b34..75dd998301 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt @@ -17,6 +17,10 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso import androidx.test.espresso.web.webdriver.Locator +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse @@ -28,10 +32,6 @@ import com.instructure.canvasapi2.models.DiscussionTopicHeader import com.instructure.canvasapi2.models.Group import com.instructure.canvasapi2.models.Tab import com.instructure.canvasapi2.models.User -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -52,7 +52,7 @@ class AnnouncementInteractionTest : StudentTest() { // Student enrolled in intended section can see and reply to the announcement // (This kind of seems like more of a test of the mocked endpoint, but we'll go with it.) @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncement_replyToSectionSpecificAnnouncement() { val data = getToCourse(createSections = true) @@ -90,7 +90,7 @@ class AnnouncementInteractionTest : StudentTest() { // User can preview an announcement attachment @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncement_previewAttachment() { val data = getToCourse() @@ -132,7 +132,7 @@ class AnnouncementInteractionTest : StudentTest() { // View/reply to an announcement @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncement_reply() { val data = getToCourse() @@ -156,7 +156,7 @@ class AnnouncementInteractionTest : StudentTest() { // Tests that we can create an announcement (as teacher). @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncementCreate_base() { val data = getToAnnouncementList() @@ -170,7 +170,7 @@ class AnnouncementInteractionTest : StudentTest() { // Tests code around closing / aborting announcement creation (as a teacher) @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncementCreate_abort() { val data = getToAnnouncementList() val course = data.courses.values.first() @@ -188,7 +188,7 @@ class AnnouncementInteractionTest : StudentTest() { // Tests code around creating an announcement with no description (as a teacher) @Test - @TestMetaData(Priority.COMMON, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.COMMON, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncementCreate_missingDescription() { getToAnnouncementList() @@ -198,7 +198,7 @@ class AnnouncementInteractionTest : StudentTest() { // Tests code around creating an announcement with no title (as a teacher) @Test - @TestMetaData(Priority.COMMON, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.COMMON, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testAnnouncementCreate_missingTitle() { getToAnnouncementList() discussionListPage.createAnnouncement("", "description") @@ -206,7 +206,7 @@ class AnnouncementInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testGroupAnnouncementCreateAsStudent() { getToGroup() @@ -217,7 +217,7 @@ class AnnouncementInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION) fun testSearchAnnouncement() { val data = getToAnnouncementList() val course = data.courses.values.first() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt index b78a0e9db0..3d89f7af28 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt @@ -15,6 +15,12 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.checkToastText import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addAssignmentsToGroups @@ -23,25 +29,22 @@ import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.CourseSettings import com.instructure.canvasapi2.utils.toApiString -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.SecondaryFeatureCategory -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.dataseeding.model.SubmissionType +import com.instructure.student.R import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.routeTo import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Assert.assertNotNull import org.junit.Test -import java.util.Calendar +import java.util.* @HiltAndroidTest class AssignmentDetailsInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ONLINE_URL) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ONLINE_URL) fun testSubmission_submitAssignment() { // TODO - Test submitting for each submission type // For now, I'm going to just test one submission type @@ -53,7 +56,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { val course = data.courses.values.first() val student = data.students[0] val token = data.tokenFor(student)!! - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_URL) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_URL)) data.addSubmissionForAssignment( assignmentId = assignment.id, userId = data.users.values.first().id, @@ -118,7 +121,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { @Test @TestMetaData(Priority.COMMON, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) - fun testDisplayBookmarMenu() { + fun testDisplayBookmarkMenu() { val data = setUpData() goToAssignmentList() val assignmentList = data.assignments @@ -194,7 +197,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithoutQuantitativeRestriction() { val data = setUpData() val assignment = addAssignment(data, Assignment.GradingType.LETTER_GRADE, "B", 90.0, 100) @@ -207,7 +210,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.GPA_SCALE, "3.7", 90.0, 100) @@ -220,7 +223,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "90", 90.0, 100) @@ -233,7 +236,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, null, 90.0, 100, excused = true) @@ -246,7 +249,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPercentageAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "90%", 90.0, 100) @@ -259,7 +262,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPassFailAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PASS_FAIL, "complete", 0.0, 0) @@ -272,7 +275,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithQuantitativeRestriction() { val data = setUpData(restrictQuantitativeData = true) val assignment = addAssignment(data, Assignment.GradingType.LETTER_GRADE, "B", 90.0, 100) @@ -285,7 +288,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.GPA_SCALE, "3.7", 90.0, 100) @@ -298,7 +301,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "65", 65.0, 100) @@ -311,7 +314,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, null, 90.0, 100, excused = true) @@ -324,7 +327,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPercentageAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "70%", 70.0, 100) @@ -337,7 +340,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPassFailAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PASS_FAIL, "complete", 0.0, 0) @@ -349,6 +352,190 @@ class AssignmentDetailsInteractionTest : StudentTest() { assignmentDetailsPage.assertScoreNotDisplayed() } + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_MULTIPLE_TYPE) + fun testSubmission_multipleSubmissionType() { + val data = MockCanvas.init( + studentCount = 1, + courseCount = 1 + ) + + val course = data.courses.values.first() + val student = data.students[0] + val token = data.tokenFor(student)!! + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY, Assignment.SubmissionType.ONLINE_UPLOAD, Assignment.SubmissionType.MEDIA_RECORDING, Assignment.SubmissionType.DISCUSSION_TOPIC, Assignment.SubmissionType.ONLINE_URL)) + data.addSubmissionForAssignment( + assignmentId = assignment.id, + userId = data.users.values.first().id, + type = Assignment.SubmissionType.ONLINE_URL.apiString + ) + tokenLogin(data.domain, token, student) + routeTo("courses/${course.id}/assignments", data.domain) + assignmentListPage.waitForPage() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickSubmit() + + assignmentDetailsPage.assertSubmissionTypeDisplayed("Text Entry") + assignmentDetailsPage.assertSubmissionTypeDisplayed("Website URL") + assignmentDetailsPage.assertSubmissionTypeDisplayed("File Upload") + assignmentDetailsPage.assertSubmissionTypeDisplayed("Media Recording") + + //Try 1 submission to check if it's possible to submit even when there are multiple submission types available. + assignmentDetailsPage.selectSubmissionType(SubmissionType.ONLINE_URL) + urlSubmissionUploadPage.submitText("https://google.com") + assignmentDetailsPage.assertStatusSubmitted() + } + + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testReminderSectionIsNotVisibleWhenThereIsNoFutureDueDate() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, -1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + + assignmentDetailsPage.assertReminderSectionNotDisplayed() + } + + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testReminderSectionIsVisibleWhenThereIsFutureDueDate() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + + assignmentDetailsPage.assertReminderSectionDisplayed() + } + + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testAddReminder() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Hour Before") + + assignmentDetailsPage.assertReminderDisplayedWithText("1 Hour Before") + } + + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testRemoveReminder() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Hour Before") + + assignmentDetailsPage.assertReminderDisplayedWithText("1 Hour Before") + + assignmentDetailsPage.removeReminderWithText("1 Hour Before") + + assignmentDetailsPage.assertReminderNotDisplayedWithText("1 Hour Before") + } + + @Test + @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testAddCustomReminder() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.clickCustom() + assignmentDetailsPage.assertDoneButtonIsDisabled() + assignmentDetailsPage.fillQuantity("15") + assignmentDetailsPage.assertDoneButtonIsDisabled() + assignmentDetailsPage.clickHoursBefore() + assignmentDetailsPage.clickDone() + + assignmentDetailsPage.assertReminderDisplayedWithText("15 Hours Before") + } + + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testAddReminderInPastShowsError() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.MINUTE, 30) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Hour Before") + + checkToastText(R.string.reminderInPast, activityRule.activity) + } + + @Test + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testAddReminderForTheSameTimeShowsError() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 1) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Hour Before") + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Hour Before") + + checkToastText(R.string.reminderAlreadySet, activityRule.activity) + } + + @Test + @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) + fun testAddReminderForTheSameTimeWithDifferentMeasureOfTimeShowsError() { + val data = setUpData() + val course = data.courses.values.first() + val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply { + add(Calendar.DAY_OF_MONTH, 10) + }.time.toApiString()) + goToAssignmentList() + + assignmentListPage.clickAssignment(assignment) + assignmentDetailsPage.clickAddReminder() + assignmentDetailsPage.selectTimeOption("1 Week Before") + assignmentDetailsPage.clickAddReminder() + + assignmentDetailsPage.clickCustom() + assignmentDetailsPage.fillQuantity("7") + assignmentDetailsPage.clickDaysBefore() + assignmentDetailsPage.clickDone() + + checkToastText(R.string.reminderAlreadySet, activityRule.activity) + } + private fun setUpData(restrictQuantitativeData: Boolean = false): MockCanvas { // Test clicking on the Submission and Rubric button to load the Submission Details Page val data = MockCanvas.init( @@ -401,7 +588,7 @@ class AssignmentDetailsInteractionTest : StudentTest() { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), gradingType = Assignment.gradingTypeToAPIString(gradingType) ?: "", pointsPossible = maxScore, ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt index b7c95d29ae..fab2876a38 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt @@ -15,17 +15,18 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.CourseSettings -import com.instructure.student.ui.utils.* -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Test @@ -79,7 +80,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.LETTER_GRADE, "B", 90.0, 100) @@ -89,7 +90,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.GPA_SCALE, "3.7", 90.0, 100) @@ -99,7 +100,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "90", 90.0, 100) @@ -109,7 +110,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, null, 90.0, 100, excused = true) @@ -119,7 +120,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPercentageAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "90%", 90.0, 100) @@ -129,7 +130,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPassFailAssignmentWithoutQuantitativeRestriction() { setUpData() val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PASS_FAIL, "complete", 0.0, 0) @@ -139,7 +140,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.LETTER_GRADE, "B", 90.0, 100) @@ -149,7 +150,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.GPA_SCALE, "3.7", 90.0, 100) @@ -159,7 +160,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "90", 90.0, 100) @@ -169,7 +170,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, null, 90.0, 100, excused = true) @@ -179,7 +180,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPercentageAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "80%", 80.0, 100) @@ -189,7 +190,7 @@ class AssignmentListInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION) fun testPassFailAssignmentWithQuantitativeRestriction() { setUpData(restrictQuantitativeData = true) val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PASS_FAIL, "complete", 0.0, 0) @@ -225,7 +226,7 @@ class AssignmentListInteractionTest : StudentTest() { repeat(assignmentCount) { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) assignmentList.add(assignment) } @@ -253,7 +254,7 @@ class AssignmentListInteractionTest : StudentTest() { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), gradingType = Assignment.gradingTypeToAPIString(gradingType) ?: "", pointsPossible = maxScore, ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/BookmarkInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/BookmarkInteractionTest.kt index 2dc4dc3f22..ec8cac9747 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/BookmarkInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/BookmarkInteractionTest.kt @@ -16,16 +16,16 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addBookmark import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvas.espresso.refresh import com.instructure.canvasapi2.models.Assignment -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -38,7 +38,7 @@ class BookmarkInteractionTest : StudentTest() { // Test that we can create a bookmark via the UI and see it in the bookmark list @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION) fun testBookmark_create() { val data = init() val course = data.courses.values.first() @@ -60,7 +60,7 @@ class BookmarkInteractionTest : StudentTest() { // Tests that we can click a bookmark and end up in the bookmarked location @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION) fun testBookmark_click() { val data = init() val student = data.students.first() @@ -83,7 +83,7 @@ class BookmarkInteractionTest : StudentTest() { // Tests that we can change the name of a bookmark and still click through to the intended location @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.BOOKMARKS, TestCategory.INTERACTION) fun testBookmark_changeName() { val data = init() val student = data.students.first() @@ -115,7 +115,7 @@ class BookmarkInteractionTest : StudentTest() { val course = data.courses.values.first() val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) val token = data.tokenFor(student)!! diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt index ec8a032701..f989450db0 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt @@ -17,6 +17,10 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.matcher.ViewMatchers +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment @@ -25,12 +29,6 @@ import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.CourseSettings import com.instructure.canvasapi2.models.Grades import com.instructure.canvasapi2.models.Tab -import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData -import com.instructure.student.R import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -42,7 +40,7 @@ class CourseGradesInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testTotalGradeIsDisplayedWithGradeAndScoreWhenNotRestricted() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade("A", 100.0, data, false) @@ -51,7 +49,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testTotalGradeIsDisplayedWithOnlyScoreWhenNotRestrictedAndThereIsNoGrade() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -60,7 +58,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testGradeIsDisplayedWithOnlyGradeWhenQuantitativeDataIsRestricted() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade("A", 100.0, data, true) @@ -69,7 +67,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testConvertedGradeIsDisplayedWithOnlyScoreWhenRestrictedAndThereIsNoGrade() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -78,7 +76,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -90,7 +88,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -102,7 +100,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPointsAssignmentWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -114,7 +112,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -126,7 +124,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPercentageAssignmentWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -138,7 +136,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPassFailAssignmentWithoutQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = false) @@ -150,7 +148,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testLetterGradeAssignmentWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -162,7 +160,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testGpaScaleAssignmentWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -174,7 +172,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPointsAssignmentWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -186,7 +184,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPointsAssignmentExcusedWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -198,7 +196,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPercentageAssignmentWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -210,7 +208,7 @@ class CourseGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION) fun testPassFailAssignmentWithQuantitativeRestriction() { val data = setUpData(courseCount = 1, favoriteCourseCount = 1) setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true) @@ -250,7 +248,7 @@ class CourseGradesInteractionTest : StudentTest() { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), gradingType = Assignment.gradingTypeToAPIString(gradingType) ?: "", pointsPossible = maxScore, ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseInteractionTest.kt index 6f33a765b5..281aa55f3d 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseInteractionTest.kt @@ -22,16 +22,16 @@ import androidx.test.espresso.web.webdriver.DriverAtoms.findElement import androidx.test.espresso.web.webdriver.DriverAtoms.getText import androidx.test.espresso.web.webdriver.DriverAtoms.webClick import androidx.test.espresso.web.webdriver.Locator +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addFileToCourse import com.instructure.canvas.espresso.mockCanvas.addPageToCourse import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.Tab -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -46,7 +46,7 @@ class CourseInteractionTest : StudentTest() { // Link from a course page to another public course should open in the app @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.COURSE, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.COURSE, TestCategory.INTERACTION) fun testCourse_linkFromCoursePageToPublicCoursePage() { val data = getToCourse(courseCount = 2, favoriteCourseCount = 2) @@ -81,7 +81,7 @@ class CourseInteractionTest : StudentTest() { // user should be able to open/preview course file @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.FILES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.FILES, TestCategory.INTERACTION) fun testCourse_openFile() { // MBL-13499: Don't run this test on API 28 and above until we add HTTPS support diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt index f02805dfff..8392395b13 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt @@ -18,16 +18,16 @@ package com.instructure.student.ui.interaction import androidx.lifecycle.MutableLiveData import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAccountNotification import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.apis.EnrollmentAPI import com.instructure.canvasapi2.models.CourseSettings import com.instructure.canvasapi2.models.Grades -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.pandautils.di.NetworkStateProviderModule import com.instructure.pandautils.utils.NetworkStateProvider import com.instructure.student.espresso.fakes.FakeNetworkStateProvider @@ -93,10 +93,10 @@ class DashboardInteractionTest : StudentTest() { dashboardPage.assertCourseNotShown(nonFavorite) dashboardPage.editFavorites() - editDashboardPage.assertCourseDisplayed(nonFavorite) - editDashboardPage.assertCourseNotFavorited(nonFavorite) - editDashboardPage.favoriteCourse(nonFavorite) - editDashboardPage.assertCourseFavorited(nonFavorite) + allCoursesPage.assertCourseDisplayed(nonFavorite) + allCoursesPage.assertCourseNotFavorited(nonFavorite) + allCoursesPage.favoriteCourse(nonFavorite) + allCoursesPage.assertCourseFavorited(nonFavorite) Espresso.pressBack() @@ -115,10 +115,10 @@ class DashboardInteractionTest : StudentTest() { dashboardPage.assertDisplaysCourse(favorite) dashboardPage.editFavorites() - editDashboardPage.assertCourseDisplayed(favorite) - editDashboardPage.assertCourseFavorited(favorite) - editDashboardPage.unfavoriteCourse(favorite) - editDashboardPage.assertCourseNotFavorited(favorite) + allCoursesPage.assertCourseDisplayed(favorite) + allCoursesPage.assertCourseFavorited(favorite) + allCoursesPage.unfavoriteCourse(favorite) + allCoursesPage.assertCourseNotFavorited(favorite) Espresso.pressBack() @@ -137,9 +137,9 @@ class DashboardInteractionTest : StudentTest() { data.courses.values.forEach { dashboardPage.assertDisplaysCourse(it) } dashboardPage.editFavorites() - toFavorite.forEach { editDashboardPage.assertCourseNotFavorited(it) } - editDashboardPage.selectAllCourses() - toFavorite.forEach { editDashboardPage.assertCourseFavorited(it) } + toFavorite.forEach { allCoursesPage.assertCourseNotFavorited(it) } + allCoursesPage.selectAllCourses() + toFavorite.forEach { allCoursesPage.assertCourseFavorited(it) } Espresso.pressBack() @@ -156,9 +156,9 @@ class DashboardInteractionTest : StudentTest() { toRemove.forEach { dashboardPage.assertDisplaysCourse(it) } dashboardPage.editFavorites() - toRemove.forEach { editDashboardPage.assertCourseFavorited(it) } - editDashboardPage.unselectAllCourses() - toRemove.forEach { editDashboardPage.assertCourseNotFavorited(it) } + toRemove.forEach { allCoursesPage.assertCourseFavorited(it) } + allCoursesPage.unselectAllCourses() + toRemove.forEach { allCoursesPage.assertCourseNotFavorited(it) } Espresso.pressBack() @@ -242,7 +242,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.INTERACTION) fun testDashboardCourses_tappingCourseCardDisplaysCourseBrowser() { // Tapping on a course card opens course browser page val data = setUpData(courseCount = 1, favoriteCourseCount = 1) @@ -260,7 +260,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION) fun testDashboardCourses_gradeIsDisplayedWhenShowGradesIsSelected() { // [Student] Grade is displayed when 'Show Grades' (located in navigation drawer) is selected val data = setUpData(courseCount = 1, favoriteCourseCount = 1) @@ -270,7 +270,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION) fun testDashboardCourses_gradeIsNotDisplayedWhenShowGradesIsDeSelected() { // [Student] Grade is NOT displayed when 'Show Grades' (located in navigation drawer) is de-selected val data = setUpData(courseCount = 1, favoriteCourseCount = 1) @@ -280,7 +280,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION) fun testDashboardCourses_gradeIsDisplayedWithGradeAndScoreWhenNotRestricted() { // [Student] Grade is displayed when 'Show Grades' (located in navigation drawer) is selected val data = setUpData(courseCount = 1, favoriteCourseCount = 1) @@ -291,7 +291,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DASHBOARD, TestCategory.INTERACTION) fun testDashboardCourses_gradeIsDisplayedWithGradeOnlyWhenQuantitativeDataIsRestricted() { // [Student] Grade is displayed when 'Show Grades' (located in navigation drawer) is selected val data = setUpData(courseCount = 1, favoriteCourseCount = 1) @@ -302,7 +302,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineIndicatorDisplayedIfOffline() { goToDashboard(setUpData()) @@ -312,7 +312,7 @@ class DashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineIndicatorNotDisplayedIfOnline() { goToDashboard(setUpData()) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt index 8ae21f49ac..25310d5be8 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt @@ -19,12 +19,23 @@ package com.instructure.student.ui.interaction import android.os.SystemClock.sleep import androidx.test.espresso.Espresso import androidx.test.espresso.web.webdriver.Locator -import com.instructure.canvas.espresso.mockCanvas.* -import com.instructure.canvasapi2.models.* -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addAssignment +import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions +import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse +import com.instructure.canvas.espresso.mockCanvas.addFileToCourse +import com.instructure.canvas.espresso.mockCanvas.addReplyToDiscussion +import com.instructure.canvas.espresso.mockCanvas.init +import com.instructure.canvasapi2.models.Assignment +import com.instructure.canvasapi2.models.CanvasContextPermission +import com.instructure.canvasapi2.models.CourseSettings +import com.instructure.canvasapi2.models.DiscussionEntry +import com.instructure.canvasapi2.models.RemoteFile +import com.instructure.canvasapi2.models.Tab import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -39,7 +50,7 @@ class DiscussionsInteractionTest : StudentTest() { // Verify that a discussion header shows up properly after discussion creation @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionCreate_base() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) @@ -58,7 +69,7 @@ class DiscussionsInteractionTest : StudentTest() { // It's actually impossible to attach anything to a discussion topic with our app, // so the attachment is done behind the scenes, after the fact. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionCreate_withAttachment() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course = data.courses.values.first() @@ -102,7 +113,7 @@ class DiscussionsInteractionTest : StudentTest() { // Test that you can't create a discussion when discussion creation is disabled @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionCreate_disabledWhenNotPermitted() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = false) @@ -113,7 +124,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests that links to other Canvas content routes properly @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_linksRouteInApp() { val data = getToCourse(studentCount = 2, courseCount = 2, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -141,7 +152,7 @@ class DiscussionsInteractionTest : StudentTest() { // Replies automatically get marked as read as the user scrolls through the list @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_postsGetMarkedAsRead() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course = data.courses.values.first() @@ -180,7 +191,7 @@ class DiscussionsInteractionTest : StudentTest() { // Attachment is html, so that we can keep the viewing of it "in-house" // NOTE: Very similar to testDiscussionCreate_withAttachment @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_previewAttachment() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) @@ -222,7 +233,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests that users can like entries and the correct like count is displayed, if the liking is enabled @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionLikePost_base() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) @@ -263,7 +274,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests that like count is shown if only graders can like @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionLikes_whenOnlyGradersCanRate() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course = data.courses.values.first() @@ -300,7 +311,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests that discussion entry liking is not available when disabled @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionLikePost_disabledWhenNotPermitted() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) data.discussionRatingsEnabled = false @@ -329,7 +340,7 @@ class DiscussionsInteractionTest : StudentTest() { // Test basic discussion view @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionView_base() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -349,7 +360,7 @@ class DiscussionsInteractionTest : StudentTest() { // Test that you can reply to a discussion (if enabled) @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionView_replies() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -376,7 +387,7 @@ class DiscussionsInteractionTest : StudentTest() { // Test that replies are not possible when they are not enabled @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionView_repliesHiddenWhenNotPermitted() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -397,7 +408,7 @@ class DiscussionsInteractionTest : StudentTest() { // Test that a reply is displayed properly @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionReply_base() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -425,7 +436,7 @@ class DiscussionsInteractionTest : StudentTest() { // It is a whole other gear to manually specify an attachment the same way that a user would, // so we add the attachments programmatically. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionReply_withAttachment() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -480,7 +491,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests that we can make a threaded reply to a reply @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionReply_threaded() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -517,7 +528,7 @@ class DiscussionsInteractionTest : StudentTest() { // It is a whole other gear to manually specify an attachment the same way that a user would, // so we add the attachments programmatically. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussionReply_threadedWithAttachment() { val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true) val course1 = data.courses.values.first() @@ -581,7 +592,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests a discussion with a linked assignment. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_linkedAssignment() { val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1) @@ -597,7 +608,7 @@ class DiscussionsInteractionTest : StudentTest() { // Add an assignment val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), name = assignmentName, pointsPossible = 12 ) @@ -622,7 +633,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests a discussion with a linked assignment, show possible points if not restricted @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_showPointsIfNotRestricted() { val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1) @@ -638,7 +649,7 @@ class DiscussionsInteractionTest : StudentTest() { // Add an assignment val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), name = assignmentName, pointsPossible = 12 ) @@ -667,7 +678,7 @@ class DiscussionsInteractionTest : StudentTest() { // Tests a discussion with a linked assignment, hide possible points if restricted @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION) fun testDiscussion_hidePointsIfRestricted() { val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1) @@ -683,7 +694,7 @@ class DiscussionsInteractionTest : StudentTest() { // Add an assignment val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), name = assignmentName, pointsPossible = 12 ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt index 8ea359fcf4..e1762cd4be 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt @@ -16,12 +16,12 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLoginElementary @@ -34,7 +34,7 @@ class ElementaryDashboardInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testNavigateToElementaryDashboard() { // User should be able to tap and navigate to dashboard page goToElementaryDashboard(courseCount = 1, favoriteCourseCount = 1) @@ -46,7 +46,7 @@ class ElementaryDashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testTabsNavigation() { goToElementaryDashboard(courseCount = 1, favoriteCourseCount = 1) elementaryDashboardPage.assertElementaryTabVisibleAndSelected(ElementaryDashboardPage.ElementaryTabType.HOMEROOM) @@ -70,7 +70,7 @@ class ElementaryDashboardInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOnlyElementarySpecificNavigationItemsShownInTheNavigationDrawer() { goToElementaryDashboard(courseCount = 1, favoriteCourseCount = 1) elementaryDashboardPage.openDrawer() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryGradesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryGradesInteractionTest.kt index 122ec49631..bad0d87003 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryGradesInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryGradesInteractionTest.kt @@ -17,16 +17,15 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addCourseWithEnrollment import com.instructure.canvas.espresso.mockCanvas.init -import com.instructure.canvasapi2.models.CourseSettings import com.instructure.canvasapi2.models.Enrollment import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest @@ -40,7 +39,7 @@ class ElementaryGradesInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowGrades() { val data = createMockData(courseCount = 3) goToGradesTab(data) @@ -53,7 +52,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testRefresh() { val data = createMockData(courseCount = 1) goToGradesTab(data) @@ -73,7 +72,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenCourseGrades() { val data = createMockData(courseCount = 3) goToGradesTab(data) @@ -91,7 +90,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testChangeGradingPeriod() { val data = createMockData(courseCount = 3, withGradingPeriods = true) goToGradesTab(data) @@ -105,7 +104,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testEmptyView() { val data = createMockData(homeroomCourseCount = 1) goToGradesTab(data) @@ -115,7 +114,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowPercentageOnlyIfNoAlphabeticalGrade() { val data = createMockData(courseCount = 1) goToGradesTab(data) @@ -136,7 +135,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testDontShowProgressWhenQuantitativeDataIsRestricted() { val data = createMockData(courseCount = 1) goToGradesTab(data) @@ -158,7 +157,7 @@ class ElementaryGradesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testDontShowGradeWhenQuantitativeDataIsRestrictedAndThereIsOnlyScore() { val data = createMockData(courseCount = 1) goToGradesTab(data) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt index aa1c84ccdf..007b295f5f 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt @@ -18,6 +18,11 @@ package com.instructure.student.ui.interaction import android.os.Build import androidx.test.espresso.web.webdriver.Locator +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse import com.instructure.canvas.espresso.mockCanvas.addFileToFolder @@ -31,11 +36,6 @@ import com.instructure.canvasapi2.models.DiscussionTopicHeader import com.instructure.canvasapi2.models.Group import com.instructure.canvasapi2.models.Page import com.instructure.canvasapi2.models.Tab -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.SecondaryFeatureCategory -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -58,7 +58,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group opens group browser - eg: "/groups/:id" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION) fun testGroupLink_base() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -67,7 +67,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to groups opens dashboard - eg: "/groups" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DASHBOARD) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_DASHBOARD) fun testGroupLink_dashboard() { setUpGroupAndSignIn() dashboardPage.assertDisplaysGroup(group, course) @@ -75,7 +75,7 @@ class GroupLinksInteractionTest : StudentTest() { // Test not favorite group on dashboard @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DASHBOARD) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_DASHBOARD) fun testGroupLink_dashboard_favoriteLogics() { val data = setUpGroupAndSignIn() val user = data.users.values.first() @@ -91,7 +91,7 @@ class GroupLinksInteractionTest : StudentTest() { // Test that if no groups has selected as favorite then we display all groups @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DASHBOARD) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_DASHBOARD) fun testGroupLink_dashboard_not_selected_displays_all() { val data = setUpGroupAndSignIn(isFavorite = false) val user = data.users.values.first() @@ -107,7 +107,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to file preview opens file - eg: "/groups/:id/files/folder/:id?preview=:id" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_FILES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_FILES) fun testGroupLink_filePreview() { // MBL-13499: This will cause an http request to our mock web server, and http requests from webviews are illegal @@ -128,7 +128,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group announcement opens announcement - eg: "/groups/:id/discussion_topics/:id" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_ANNOUNCEMENTS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_ANNOUNCEMENTS) fun testGroupLink_announcement() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -140,7 +140,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group announcements list opens announcements - eg: "/groups/:id/announcements" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_ANNOUNCEMENTS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_ANNOUNCEMENTS) fun testGroupLink_announcementList() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -150,7 +150,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group discussion opens discussion - eg: "/groups/:id/discussion_topics/:id" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DISCUSSIONS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_DISCUSSIONS) fun testGroupLink_discussion() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -161,7 +161,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group discussion list opens list - eg: "/groups/:id/discussion_topics" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DISCUSSIONS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_DISCUSSIONS) fun testGroupLink_discussionList() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -171,7 +171,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group files list opens group files list - eg: "/groups/:id/files" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_FILES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_FILES) fun testGroupLink_files() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -181,7 +181,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group files folder opens folder - eg: "/groups/:id/files/folder/:id/" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_FILES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_FILES) fun testGroupLink_fileFolder() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -193,7 +193,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group page list opens pages - eg: "/groups/:id/pages" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_PAGES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_PAGES) fun testGroupLink_pagesList() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -203,7 +203,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group page opens page - eg: "/groups/:id/pages/:id" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_PAGES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_PAGES) fun testGroupLink_Page() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) @@ -216,7 +216,7 @@ class GroupLinksInteractionTest : StudentTest() { // Link to group people list opens list - eg: "/groups/:id/users" @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_PEOPLE) + @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, SecondaryFeatureCategory.GROUPS_PEOPLE) fun testGroupLink_people() { setUpGroupAndSignIn() dashboardPage.selectGroup(group) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt index 9b8350907f..fc2ed7ace6 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt @@ -16,14 +16,18 @@ */ package com.instructure.student.ui.interaction -import com.instructure.canvas.espresso.mockCanvas.* +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addAssignment +import com.instructure.canvas.espresso.mockCanvas.addCourseWithEnrollment +import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse +import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.Enrollment import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest @@ -37,7 +41,7 @@ class HomeroomInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testAnnouncementsAndCoursesShowUpOnHomeroom() { val data = createMockDataWithHomeroomCourse(courseCount = 3) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -62,7 +66,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOnlyCoursesShowUpOnHomeroomIfNoHomeroomAnnouncement() { val data = createMockDataWithHomeroomCourse(courseCount = 3) @@ -83,7 +87,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOnlyAnnouncementShowsUpOnHomeroomIfNoCourses() { val data = createMockDataWithHomeroomCourse() val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -102,7 +106,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenCourse() { val data = createMockDataWithHomeroomCourse(courseCount = 3) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -123,7 +127,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testRefreshAfterEnrolledToCourses() { val data = createMockDataWithHomeroomCourse() @@ -156,7 +160,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenHomeroomCourseAnnouncements() { val data = createMockDataWithHomeroomCourse(courseCount = 3, homeroomCourseCount = 2) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -180,7 +184,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenCourseAnnouncements() { val data = createMockDataWithHomeroomCourse(courseCount = 1) @@ -199,7 +203,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowCourseCardWithAnnouncement() { val data = createMockDataWithHomeroomCourse(courseCount = 3) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -220,7 +224,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testDueTodayAndMissingAssignments() { val data = createMockDataWithHomeroomCourse(courseCount = 1) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -230,8 +234,8 @@ class HomeroomInteractionTest : StudentTest() { val courses = data.courses.values.filter { !it.homeroomCourse } - data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) - data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) + data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) goToHomeroomTab(data) @@ -245,7 +249,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenAssignments() { val data = createMockDataWithHomeroomCourse(courseCount = 1) val homeroomCourse = data.courses.values.first { it.homeroomCourse } @@ -255,8 +259,8 @@ class HomeroomInteractionTest : StudentTest() { val courses = data.courses.values.filter { !it.homeroomCourse } - val assignment1 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) - data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + val assignment1 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) + data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) goToHomeroomTab(data) @@ -268,7 +272,7 @@ class HomeroomInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testEmptyState() { val data = createMockDataWithHomeroomCourse() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt index 3fd8e2f5ff..2262539a98 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt @@ -16,7 +16,11 @@ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.StubTablet +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addAssignmentCalendarEvent @@ -26,10 +30,6 @@ import com.instructure.canvasapi2.models.Assignment import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLoginElementary @@ -44,7 +44,7 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowCalendarEvents() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] @@ -59,12 +59,12 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowAssignment() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) val assignmentScheduleItem = data.addAssignmentCalendarEvent(course.id, 2.days.fromNow.iso8601, assignment.name!!, assignment.description!!, true, assignment) goToImportantDatesTab(data) @@ -75,7 +75,7 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testEmptyView() { val data = createMockData(courseCount = 1) @@ -86,7 +86,7 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testPullToRefresh() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] @@ -107,7 +107,7 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenCalendarEvent() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] @@ -127,12 +127,12 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenAssignment() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) val assignmentScheduleItem = data.addAssignmentCalendarEvent(course.id, 2.days.fromNow.iso8601, assignment.name!!, assignment.description!!, true, assignment) goToImportantDatesTab(data) @@ -147,12 +147,12 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowMultipleCalendarEventsOnSameDay() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) data.addAssignmentCalendarEvent(course.id, 2.days.fromNow.iso8601, assignment.name!!, assignment.description!!, true, assignment) val calendarEvent = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event", "Important event description", true) @@ -171,12 +171,12 @@ class ImportantDatesInteractionTest : StudentTest() { @Test @StubTablet(description = "The UI is different on tablet, so we only check the phone version") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testMultipleCalendarEventsOnDifferentDays() { val data = createMockData(courseCount = 1) val course = data.courses.values.toList()[0] - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY)) val twoDaysFromNowEvent = data.addAssignmentCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event two days later", "Important event two days later description", true, assignment) val threeDaysFromNowEvent = data.addCourseCalendarEvent(course.id, diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InAppUpdateInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InAppUpdateInteractionTest.kt index 98af62da5a..489c813e44 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InAppUpdateInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InAppUpdateInteractionTest.kt @@ -207,6 +207,7 @@ class InAppUpdateInteractionTest : StudentTest() { @Test fun showImmediateFlow() { + updatePrefs.clearPrefs() with(appUpdateManager) { setUpdateAvailable(400) setUpdatePriority(4) @@ -270,8 +271,8 @@ class InAppUpdateInteractionTest : StudentTest() { } @Test - @Stub("Unstable, there is a ticket to fix this") fun flexibleUpdateCompletesIfAppRestarts() { + updatePrefs.clearPrefs() with(appUpdateManager) { setUpdateAvailable(400) setUpdatePriority(2) @@ -288,6 +289,7 @@ class InAppUpdateInteractionTest : StudentTest() { @Test fun immediateUpdateCompletion() { + updatePrefs.clearPrefs() with(appUpdateManager) { setUpdateAvailable(400) setUpdatePriority(4) @@ -307,6 +309,7 @@ class InAppUpdateInteractionTest : StudentTest() { @Test fun hideImmediateUpdateFlowIfUserCancels() { + updatePrefs.clearPrefs() with(appUpdateManager) { setUpdateAvailable(400) setUpdatePriority(4) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt index ab6d911ab9..bf6fbcdcec 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt @@ -17,12 +17,24 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso import androidx.test.espresso.matcher.ViewMatchers -import com.instructure.canvas.espresso.mockCanvas.* -import com.instructure.canvasapi2.models.* -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addConversation +import com.instructure.canvas.espresso.mockCanvas.addConversations +import com.instructure.canvas.espresso.mockCanvas.addConversationsToCourseMap +import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions +import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse +import com.instructure.canvas.espresso.mockCanvas.addSentConversation +import com.instructure.canvas.espresso.mockCanvas.createBasicConversation +import com.instructure.canvas.espresso.mockCanvas.init +import com.instructure.canvasapi2.models.Attachment +import com.instructure.canvasapi2.models.CanvasContextPermission +import com.instructure.canvasapi2.models.Conversation +import com.instructure.canvasapi2.models.Course +import com.instructure.canvasapi2.models.User import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt index f70b605a3a..99c1dfdd98 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt @@ -15,11 +15,11 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.Stub -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.ui.utils.StudentTest import dagger.hilt.android.testing.HiltAndroidTest import org.junit.Test @@ -30,13 +30,13 @@ class LoginInteractionTest : StudentTest() { @Stub @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION, true) + @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION) fun testLogin_canFindSchool() { // Should be able to search for and select a school in the "What's your school's name?" page } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION) fun testLogin_qrTutorialPageLoads() { // Should be able to view and assert page objects on the QR tutorial page loginLandingPage.clickQRCodeButton() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt index 20c99a602c..a4af822a17 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt @@ -18,6 +18,11 @@ package com.instructure.student.ui.interaction import android.text.Html import androidx.test.espresso.Espresso import androidx.test.espresso.web.webdriver.Locator +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse @@ -43,11 +48,6 @@ import com.instructure.canvasapi2.models.Tab import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.SecondaryFeatureCategory -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest @@ -71,7 +71,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping an Assignment module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.MODULES_ASSIGNMENTS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, SecondaryFeatureCategory.MODULES_ASSIGNMENTS) fun testModules_launchesIntoAssignment() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -81,7 +81,7 @@ class ModuleInteractionTest : StudentTest() { // Create an assignment and add it as a module item assignment = data.addAssignment( courseId = course1.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) data.addItemToModule( course = course1, @@ -100,7 +100,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping a Discussion module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.MODULES_DISCUSSIONS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, SecondaryFeatureCategory.MODULES_DISCUSSIONS) fun testModules_launchesIntoDiscussion() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -151,7 +151,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping an ExternalURL module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_launchesIntoExternalURL() { // Basic mock setup val externalUrl = "https://www.google.com" @@ -176,7 +176,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping a File module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.MODULES_FILES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, SecondaryFeatureCategory.MODULES_FILES) fun testModules_launchesIntoFile() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -210,7 +210,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping a Page module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.MODULES_PAGES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, SecondaryFeatureCategory.MODULES_PAGES) fun testModules_launchesIntoPage() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -251,7 +251,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping a Quiz module item should navigate to that item's detail page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.EVENTS_QUIZZES) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, SecondaryFeatureCategory.EVENTS_QUIZZES) fun testModules_launchesIntoQuiz() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -314,7 +314,7 @@ class ModuleInteractionTest : StudentTest() { // Tapping a module should collapse and hide all of that module's items in the module list // Tapping a collapsed module should expand it @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_modulesExpandAndCollapse() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -324,7 +324,7 @@ class ModuleInteractionTest : StudentTest() { // Create an assignment and add it as a module item assignment = data.addAssignment( courseId = course1.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) data.addItemToModule( course = course1, @@ -353,7 +353,7 @@ class ModuleInteractionTest : StudentTest() { // After entering the detail page for a module item, pressing the back button or back arrow should navigate back // to the module list. This should also work if the detail page is accessed via deep link @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_navigateBackToModuleListFromModuleItem() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -373,7 +373,7 @@ class ModuleInteractionTest : StudentTest() { // When viewing the detail page for an item in a module with multiple items, the detail page should have // 'next' and 'previous' navigation buttons. Clicking these should navigate to the next/previous module items. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_navigateToNextAndPreviousModuleItems() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -385,7 +385,7 @@ class ModuleInteractionTest : StudentTest() { // Create an assignment and add it as a module item assignment = data.addAssignment( courseId = course1.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) data.addItemToModule( course = course1, @@ -482,7 +482,7 @@ class ModuleInteractionTest : StudentTest() { // Module can't be accessed unless all prerequisites have been fulfilled @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_moduleLockedWithUnfulfilledPrerequisite() { // Basic mock setup @@ -501,7 +501,7 @@ class ModuleInteractionTest : StudentTest() { // And let's add an assignment to the new module var unavailableAssignment = data.addAssignment( courseId = course1.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), // Man, this is a bit hokey, but it's what I had to do to get the assignment to show // up as unavailable in the assignment details page lockInfo = LockInfo( @@ -524,7 +524,7 @@ class ModuleInteractionTest : StudentTest() { // Module can't be accessed until the availability date has passed @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_moduleLockedUntilAvailabilityDate() { // Basic mock setup val data = getToCourseModules(studentCount = 1, courseCount = 1) @@ -541,7 +541,7 @@ class ModuleInteractionTest : StudentTest() { // And let's create an assignment and add it to the "locked" module. val lockedAssignment = data.addAssignment( courseId = course1.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) data.addItemToModule( course = course1, @@ -558,7 +558,7 @@ class ModuleInteractionTest : StudentTest() { // Show possible points for assignments in modules if not restricted @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_showPossiblePointsIfNotRestricted() { val data = getToCourseModules(studentCount = 1, courseCount = 1) val course = data.courses.values.first() @@ -568,7 +568,7 @@ class ModuleInteractionTest : StudentTest() { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), pointsPossible = 10 ) @@ -585,7 +585,7 @@ class ModuleInteractionTest : StudentTest() { // Hide possible points for assignments in modules if restricted @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.MODULES, TestCategory.INTERACTION) fun testModules_hidePossiblePointsIfRestricted() { val data = getToCourseModules(studentCount = 1, courseCount = 1) val course = data.courses.values.first() @@ -595,7 +595,7 @@ class ModuleInteractionTest : StudentTest() { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), pointsPossible = 10 ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NavigationDrawerInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NavigationDrawerInteractionTest.kt index 17ba053fe2..51c5b5dc53 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NavigationDrawerInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NavigationDrawerInteractionTest.kt @@ -23,6 +23,10 @@ import android.util.Log import androidx.lifecycle.MutableLiveData import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Course @@ -31,10 +35,6 @@ import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.canvasapi2.utils.ContextKeeper import com.instructure.loginapi.login.model.SignedInUser import com.instructure.loginapi.login.util.PreviousUsersUtils -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.pandautils.di.NetworkStateProviderModule import com.instructure.pandautils.utils.NetworkStateProvider import com.instructure.student.R @@ -77,7 +77,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should be able to change the user from the navigation drawer @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.INTERACTION) fun testNavDrawer_changeUser() { // This test fails on API-28 in FTL due to a "TOO_MANY_REGISTRATIONS" issue on logout. @@ -123,7 +123,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should be able to log out from the navigation drawer @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.INTERACTION) fun testNavDrawer_logOut() { // This test fails on API-28 in FTL due to a "TOO_MANY_REGISTRATIONS" issue on logout. @@ -141,7 +141,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should open a dialog and send a question for the selected course // (Checks to see that we can fill out the question and the SEND button exists.) @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testHelp_askQuestion() { signInStudent() @@ -152,7 +152,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should open the Canvas guides in a WebView @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testHelp_searchCanvasGuides() { signInStudent() @@ -164,7 +164,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should send an error report // (Checks to see that we can fill out an error report and that the SEND button is displayed.) @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testHelp_reportAProblem() { signInStudent() @@ -181,7 +181,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // // So this is a watered-down test that just checks whether an email app chooser gets displayed. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testHelp_submitFeatureIdea() { signInStudent() @@ -231,7 +231,7 @@ class NavigationDrawerInteractionTest : StudentTest() { // Should send an intent to open the listing for Student App in the Play Store @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testHelp_shareYourLove() { signInStudent() @@ -255,7 +255,7 @@ class NavigationDrawerInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testMenuItemForDefaultStudent() { signInStudent() @@ -263,7 +263,7 @@ class NavigationDrawerInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testMenuItemForElementaryStudent() { signInElementaryStudent() @@ -271,7 +271,7 @@ class NavigationDrawerInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineIndicatorDisplayedIfOffline() { signInStudent() @@ -281,7 +281,7 @@ class NavigationDrawerInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineIndicatorNotDisplayedIfOnline() { signInStudent() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt index 3a28429766..adde4b4802 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt @@ -15,16 +15,20 @@ */ package com.instructure.student.ui.interaction -import com.instructure.canvas.espresso.mockCanvas.* +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addAssignment +import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment +import com.instructure.canvas.espresso.mockCanvas.addSubmissionStreamItem +import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.CourseSettings import com.instructure.dataseeding.util.ago import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -36,7 +40,7 @@ class NotificationInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit // Not used for interaction tests @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testClick_itWorks() { // Test that push notifications work when you click on them val data = goToNotifications() @@ -49,7 +53,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfNotRestricted_points() { val grade = "10.0" val data = goToNotifications( @@ -65,7 +69,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfNotRestricted_percent() { val grade = "10%" val data = goToNotifications( @@ -81,7 +85,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfNotRestricted_letter() { val grade = "A" val data = goToNotifications( @@ -97,7 +101,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfNotRestricted_gpa() { val grade = "GPA" val data = goToNotifications( @@ -113,7 +117,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfNotRestricted_passFail() { val grade = "complete" val data = goToNotifications( @@ -130,7 +134,7 @@ class NotificationInteractionTest : StudentTest() { @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeUpdatedIfRestricted_points() { val grade = "15.0" val data = goToNotifications( @@ -146,7 +150,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_convertGradeIfRestricted_percent() { val grade = "50%" val data = goToNotifications( @@ -162,7 +166,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfRestricted_letter() { val grade = "A" val data = goToNotifications( @@ -178,7 +182,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfRestricted_gpa() { val grade = "GPA" val data = goToNotifications( @@ -194,7 +198,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showGradeIfRestricted_passFail() { val grade = "complete" val data = goToNotifications( @@ -210,7 +214,7 @@ class NotificationInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION) fun testNotificationList_showExcused() { val data = goToNotifications( restrictQuantitativeData = true, @@ -251,7 +255,7 @@ class NotificationInteractionTest : StudentTest() { repeat(numSubmissions) { val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), gradingType = Assignment.gradingTypeToAPIString(gradingType).orEmpty(), pointsPossible = 20 ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/OfflineContentInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/OfflineContentInteractionTest.kt index 2be3ec69ac..d429d3b65d 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/OfflineContentInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/OfflineContentInteractionTest.kt @@ -20,16 +20,16 @@ package com.instructure.student.ui.interaction import android.text.format.Formatter import androidx.test.espresso.Espresso import com.google.android.material.checkbox.MaterialCheckBox +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addFileToCourse import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.Tab import com.instructure.dataseeding.util.Randomizer -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.pandautils.R import com.instructure.pandautils.utils.StorageUtils import com.instructure.student.ui.utils.StudentTest @@ -47,14 +47,14 @@ class OfflineContentInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysNoCourses() { goToOfflineContent(createMockCanvas(courseCount = 0)) manageOfflineContentPage.assertDisplaysNoCourses() } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysEmptyCourse() { val data = createMockCanvas(courseCount = 1, hasTabs = false) goToOfflineContent(data) @@ -63,7 +63,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysCoursesCollapsedIfGlobalOfflineContent() { val data = createMockCanvas() goToOfflineContent(data) @@ -72,15 +72,15 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) - fun displaysCourseExpandedIfCourseOfflineContent() { + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) + fun displaysCourseCollapsedIfCourseOfflineContent() { val data = createMockCanvas() goToOfflineContentByCourse(data) - manageOfflineContentPage.assertDisplaysItemWithExpandedState(data.courses.values.first().name, true) + manageOfflineContentPage.assertDisplaysItemWithExpandedState(data.courses.values.first().name, false) } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysCourseTabsAndFiles() { val data = createMockCanvas(courseCount = 1) goToOfflineContent(data) @@ -90,7 +90,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun expandCourse() { val data = createMockCanvas() goToOfflineContent(data) @@ -98,12 +98,11 @@ class OfflineContentInteractionTest : StudentTest() { manageOfflineContentPage.assertDisplaysItemWithExpandedState(course.name, false) manageOfflineContentPage.expandCollapseItem(course.name) manageOfflineContentPage.assertDisplaysItemWithExpandedState(course.name, true) - manageOfflineContentPage.assertItemDisplayed(data.courseTabs[course.id]!!.first().label!!) getCourseItemNames(data, course).forEach { manageOfflineContentPage.assertItemDisplayed(it) } } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectCourse() { val data = createMockCanvas() goToOfflineContent(data) @@ -115,7 +114,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectTab() { val data = createMockCanvas() goToOfflineContent(data) @@ -129,7 +128,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun expandFilesTab() { val data = createMockCanvas() goToOfflineContent(data) @@ -144,7 +143,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectFilesTab() { val data = createMockCanvas() goToOfflineContent(data) @@ -161,7 +160,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectFile() { val data = createMockCanvas() goToOfflineContent(data) @@ -178,7 +177,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectAllFiles() { val data = createMockCanvas(courseCount = 1) goToOfflineContent(data) @@ -197,7 +196,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectAllTabs() { val data = createMockCanvas() goToOfflineContent(data) @@ -215,7 +214,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun selectAllToggle() { val data = createMockCanvas() goToOfflineContent(data) @@ -230,7 +229,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysDiscardDialogIfNeeded() { goToOfflineContent() Espresso.pressBack() @@ -241,7 +240,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysWifiOnlySyncDialog() { val data = createMockCanvas() val course = data.courses.values.first() @@ -257,7 +256,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun displaysSyncDialog() { val data = createMockCanvas() val course = data.courses.values.first() @@ -273,7 +272,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun savesChangesOnSync() { val data = createMockCanvas() goToOfflineContent(data) @@ -284,7 +283,7 @@ class OfflineContentInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.OFFLINE_CONTENT, TestCategory.INTERACTION) fun calculatesStorageInfoCorrectly() { val data = createMockCanvas(fileCount = 10, largeFiles = true) val course = data.courses.values.first() @@ -353,7 +352,7 @@ class OfflineContentInteractionTest : StudentTest() { } private fun getCourseItemNames(data: MockCanvas, course: Course): List { - return data.courseTabs[course.id]!!.map { it.label!! } + course.name + + return listOf(course.name) + data.courseTabs[course.id]!!.map { it.label!! } + data.folderFiles[data.courseRootFolders[course.id]!!.id]!!.map { it.displayName!! } } @@ -368,9 +367,9 @@ class OfflineContentInteractionTest : StudentTest() { tokenLogin(data.domain, token, student) dashboardPage.waitForRender() leftSideNavigationDrawerPage.clickSettingsMenu() - settingsPage.openOfflineContentPage() - syncSettingsPage.clickWifiOnlySwitch() - syncSettingsPage.clickTurnOff() + settingsPage.openOfflineSyncSettingsPage() + offlineSyncSettingsPage.clickWifiOnlySwitch() + offlineSyncSettingsPage.clickTurnOff() Espresso.pressBack() Espresso.pressBack() dashboardPage.openGlobalManageOfflineContentPage() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PdfInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PdfInteractionTest.kt index 5c744e014f..8c61146e4e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PdfInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PdfInteractionTest.kt @@ -21,11 +21,21 @@ import androidx.test.espresso.web.webdriver.DriverAtoms import androidx.test.espresso.web.webdriver.Locator import androidx.test.platform.app.InstrumentationRegistry import com.instructure.annotations.FileCaching.FileCache -import com.instructure.canvas.espresso.mockCanvas.* +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addAnnotation +import com.instructure.canvas.espresso.mockCanvas.addAssignment +import com.instructure.canvas.espresso.mockCanvas.addAssignmentsToGroups +import com.instructure.canvas.espresso.mockCanvas.addFileToCourse +import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment +import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.Attachment import com.instructure.canvasapi2.models.Tab -import com.instructure.panda_annotations.* import com.instructure.pandautils.loaders.OpenMediaAsyncTaskLoader import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.routeTo @@ -47,14 +57,14 @@ class PdfInteractionTest : StudentTest() { private lateinit var attachment: Attachment @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_viewPdfSubmission() { goToAssignmentPdfSubmission() submissionDetailsPage.assertFileDisplayed(pdfFileName) } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_viewAndSelectAnnotationsInSubmission() { goToAssignmentPdfSubmission() submissionDetailsPage.clickSubmissionContentAtPosition(.5f, .5f) @@ -62,7 +72,7 @@ class PdfInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_selectAndCommentOnAnnotationWithNoExistingComments() { val sentCommentContents = "what up dog" // Configure the comment to be sent in mock Canvas @@ -75,7 +85,7 @@ class PdfInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_selectAndCommentOnAnnotationWithExistingComments() { val sentCommentContents = "what up dog" // Configure the comment to be sent in mock Canvas and the existing comment @@ -89,7 +99,7 @@ class PdfInteractionTest : StudentTest() { @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_openPdfFilesInPSPDFKit() { // Annotation toolbar icon needs to be present val data = getToCourse() @@ -110,7 +120,7 @@ class PdfInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, SecondaryFeatureCategory.SUBMISSIONS_ANNOTATIONS) fun testAnnotations_openPdfsInPSPDFKitFromLinksInAssignment() { // Annotation toolbar icon needs to be present, this link is specific to assignment details, as that was the advertised use case val data = MockCanvas.init( @@ -143,7 +153,7 @@ class PdfInteractionTest : StudentTest() { val pdfUrlElementId = "testLinkElement" val assignmentDescriptionHtml = """pdf baby!!!""" - val assignment = data.addAssignment(courseId = course.id, submissionType = Assignment.SubmissionType.ONLINE_UPLOAD, description = assignmentDescriptionHtml) + val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD), description = assignmentDescriptionHtml) assignmentListPage.waitForPage() assignmentListPage.refresh() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PeopleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PeopleInteractionTest.kt index effce85116..d3339ff86d 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PeopleInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PeopleInteractionTest.kt @@ -15,13 +15,13 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.User -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.routeTo import com.instructure.student.ui.utils.tokenLogin @@ -33,7 +33,7 @@ class PeopleInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit // Not used for interaction tests @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.PEOPLE, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.PEOPLE, TestCategory.INTERACTION) fun testClick_openContextCard() { // Should be able to view all enrolled users and tap on one to open their context card goToPeopleList() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PickerSubmissionUploadInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PickerSubmissionUploadInteractionTest.kt index 3d3bffea00..333abfc1da 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PickerSubmissionUploadInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/PickerSubmissionUploadInteractionTest.kt @@ -23,15 +23,15 @@ import android.net.Uri import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.Stub +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -70,34 +70,34 @@ class PickerSubmissionUploadInteractionTest : StudentTest() { @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testFab_camera() { } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testFab_galleryPicker() { } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testFab_filePicker() { } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testDeleteFile() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testSubmit() { val data = goToSubmissionPicker() @@ -155,7 +155,7 @@ class PickerSubmissionUploadInteractionTest : StudentTest() { // Let's set up an assignment that requires an online upload val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_UPLOAD + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD) ) // Sign in diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ProfileSettingsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ProfileSettingsInteractionTest.kt index a9fcba7951..cb58b48fd2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ProfileSettingsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ProfileSettingsInteractionTest.kt @@ -2,13 +2,13 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso import androidx.test.rule.GrantPermissionRule +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addUserPermissions import com.instructure.canvas.espresso.mockCanvas.init -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -69,7 +69,7 @@ class ProfileSettingsInteractionTest : StudentTest() { // Creates a panda avatar, saves it, and verifies that a new panda avatar was saved. @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testProfileSettings_createPandaAvatar() { val data = MockCanvas.init(studentCount = 1, teacherCount = 1, courseCount = 1, favoriteCourseCount = 1) val student = data.students[0] diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/QuizListInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/QuizListInteractionTest.kt index d35583483c..cd90ead0f5 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/QuizListInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/QuizListInteractionTest.kt @@ -15,15 +15,15 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addQuizToCourse import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.CourseSettings import com.instructure.canvasapi2.models.Quiz -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ResourcesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ResourcesInteractionTest.kt index d4e42a2fcd..c33e422e9c 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ResourcesInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ResourcesInteractionTest.kt @@ -16,12 +16,16 @@ */ package com.instructure.student.ui.interaction -import com.instructure.canvas.espresso.mockCanvas.* +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addCourseWithEnrollment +import com.instructure.canvas.espresso.mockCanvas.addEnrollment +import com.instructure.canvas.espresso.mockCanvas.addLTITool +import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Enrollment -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLoginElementary @@ -34,7 +38,7 @@ class ResourcesInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testImportantLinksAndActionItemsShowUpInResourcesScreen() { val data = createMockDataWithHomeroomCourse(courseCount = 2) @@ -63,7 +67,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOnlyActionItemsShowIfSyllabusIsEmpty() { val data = createMockDataWithHomeroomCourse(courseCount = 2) @@ -91,7 +95,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOnlyLtiToolsShowIfNoHomeroomCourse() { val data = createMockDataWithHomeroomCourse(courseCount = 2, homeroomCourseCount = 0) @@ -113,7 +117,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testRefresh() { val data = createMockDataWithHomeroomCourse(courseCount = 2, homeroomCourseCount = 0) @@ -148,7 +152,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenLtiToolShowsCourseSelector() { val data = createMockDataWithHomeroomCourse(courseCount = 2) @@ -171,7 +175,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenComposeMessageScreen() { val data = createMockDataWithHomeroomCourse(courseCount = 2) @@ -197,7 +201,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testImportantLinksForTwoCourses() { val data = createMockDataWithHomeroomCourse(courseCount = 2) @@ -221,7 +225,7 @@ class ResourcesInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testEmptyState() { val data = createMockDataWithHomeroomCourse(courseCount = 2, homeroomCourseCount = 0) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt index dc0d06eb3b..79f23cc8c2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt @@ -16,7 +16,11 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.StubLandscape +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addTodo @@ -24,15 +28,11 @@ import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.utils.toApiString import com.instructure.espresso.page.getStringFromResource -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.pandautils.utils.date.DateTimeProvider import com.instructure.student.R import com.instructure.student.ui.pages.ElementaryDashboardPage -import com.instructure.student.ui.utils.di.FakeDateTimeProvider import com.instructure.student.ui.utils.StudentTest +import com.instructure.student.ui.utils.di.FakeDateTimeProvider import com.instructure.student.ui.utils.tokenLoginElementary import dagger.hilt.android.testing.HiltAndroidTest import junit.framework.AssertionFailedError @@ -49,7 +49,7 @@ class ScheduleInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowCorrectHeaderItems() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -74,7 +74,7 @@ class ScheduleInteractionTest : StudentTest() { @Test @StubLandscape(description = "This is intentionally stubbed on landscape mode because the item view is too narrow, but that's not a bug, it's intentional.") - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowScheduledAssignments() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -83,7 +83,7 @@ class ScheduleInteractionTest : StudentTest() { courses[0].name = "Course 1" val currentDate = dateTimeProvider.getCalendar().time.toApiString() - val assignment1 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate, name = "Assignment 1") + val assignment1 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate, name = "Assignment 1") goToScheduleTab(data) schedulePage.scrollToPosition(10) @@ -93,7 +93,7 @@ class ScheduleInteractionTest : StudentTest() { @Test @StubLandscape(description = "This is intentionally stubbed on landscape mode because the item view is too narrow, but that's not a bug, it's intentional.") - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowMissingAssignments() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -101,15 +101,15 @@ class ScheduleInteractionTest : StudentTest() { val courses = data.courses.values.filter { !it.homeroomCourse } val currentDate = dateTimeProvider.getCalendar().time.toApiString() - val assignment1 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate) + val assignment1 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate) goToScheduleTab(data) schedulePage.scrollToPosition(12) - schedulePage.assertMissingItemDisplayed(assignment1.name!!, courses[0].name, "10 pts") + schedulePage.assertMissingItemDisplayedInMissingItemSummary(assignment1.name!!, courses[0].name, "10 pts") } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testShowToDoEvents() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -125,7 +125,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testRefresh() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -140,8 +140,8 @@ class ScheduleInteractionTest : StudentTest() { schedulePage.assertNoScheduleItemDisplayed() val currentDate = dateTimeProvider.getCalendar().time.toApiString() - val assignment1 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate) - val assignment2 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate) + val assignment1 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate) + val assignment2 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate) schedulePage.scrollToPosition(0) schedulePage.refresh() @@ -154,7 +154,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testGoBack2Weeks() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -177,7 +177,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testGoForward2Weeks() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -200,7 +200,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenAssignment() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -209,7 +209,7 @@ class ScheduleInteractionTest : StudentTest() { courses[0].name = "Course 1" val currentDate = dateTimeProvider.getCalendar().time.toApiString() - val assignment = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate, name = "Assignment 1") + val assignment = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate, name = "Assignment 1") goToScheduleTab(data) schedulePage.scrollToPosition(9) @@ -220,7 +220,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testOpenCourse() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -228,7 +228,7 @@ class ScheduleInteractionTest : StudentTest() { val courses = data.courses.values.filter { !it.homeroomCourse } val currentDate = dateTimeProvider.getCalendar().time.toApiString() - data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate) + data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate) goToScheduleTab(data) schedulePage.scrollToPosition(8) @@ -239,7 +239,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testMarkAsDone() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -256,7 +256,7 @@ class ScheduleInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.COMMON, FeatureCategory.K5_DASHBOARD, TestCategory.INTERACTION) + @TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION) fun testTodayButton() { setDate(2021, Calendar.AUGUST, 11) val data = createMockData(courseCount = 1) @@ -265,7 +265,7 @@ class ScheduleInteractionTest : StudentTest() { courses[0].name = "Course 1" val currentDate = dateTimeProvider.getCalendar().time.toApiString() - val assignment1 = data.addAssignment(courses[0].id, submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, dueAt = currentDate, name = "Assignment 1") + val assignment1 = data.addAssignment(courses[0].id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = currentDate, name = "Assignment 1") goToScheduleTab(data) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SettingsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SettingsInteractionTest.kt index 4238f38ec8..762fb310e1 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SettingsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SettingsInteractionTest.kt @@ -20,15 +20,15 @@ import android.app.Instrumentation import android.content.Intent import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.StubMultiAPILevel +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.utils.ApiPrefs -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -54,7 +54,7 @@ class SettingsInteractionTest : StudentTest() { // Should launch an intent to go to our canvas-android github page @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testLegal_showCanvasOnGithub() { setUpAndSignIn() @@ -75,7 +75,7 @@ class SettingsInteractionTest : StudentTest() { // Should display terms of use in a WebView @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testLegal_showTermsOfUse() { setUpAndSignIn() @@ -87,7 +87,7 @@ class SettingsInteractionTest : StudentTest() { // Should display the privacy policy in a WebView @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) @StubMultiAPILevel("Failed API levels = { 28 }", "Somehow the Privacy Policy URL does not load on API lvl 28, but does on other API lvl devices.") fun testLegal_showPrivacyPolicy() { setUpAndSignIn() @@ -96,14 +96,14 @@ class SettingsInteractionTest : StudentTest() { settingsPage.openLegalPage() legalPage.openPrivacyPolicy() canvasWebViewPage.acceptCookiePolicyIfNecessary() - canvasWebViewPage.checkWebViewURL("https://www.instructure.com/canvas/privacy") + canvasWebViewPage.checkWebViewURL("https://www.instructure.com/policies/product-privacy-policy") } // Should open a page and have a pairing code that can be refreshed // (Checks to see that we can refresh and get a new code) @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testPairObserver_refreshCode() { setUpAndSignIn() @@ -117,7 +117,7 @@ class SettingsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineContent_notDisplayedIfFeatureIsDisabled() { setUpAndSignIn(offlineEnabled = false) @@ -126,7 +126,7 @@ class SettingsInteractionTest : StudentTest() { } @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.INTERACTION) fun testOfflineContent_displayedIfFeatureIsEnabled() { setUpAndSignIn(offlineEnabled = true) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt index f19c657307..87e4338e7b 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt @@ -24,6 +24,7 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiSelector import com.instructure.canvas.espresso.Stub +import com.instructure.canvas.espresso.StubCoverage import com.instructure.canvas.espresso.StubTablet import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment @@ -131,7 +132,7 @@ class ShareExtensionInteractionTest : StudentTest() { val uri = setupFileOnDevice("sample.jpg") val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - val assignment = data.addAssignment(data.courses.values.first().id, submissionType = Assignment.SubmissionType.ONLINE_UPLOAD) + val assignment = data.addAssignment(data.courses.values.first().id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD)) login(student) device.pressHome() @@ -182,8 +183,8 @@ class ShareExtensionInteractionTest : StudentTest() { val uri = setupFileOnDevice("sample.jpg") val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - data.addAssignment(data.courses.values.first().id, submissionType = Assignment.SubmissionType.ONLINE_UPLOAD) - val assignment2 = data.addAssignment(data.courses.values.first().id, submissionType = Assignment.SubmissionType.ONLINE_UPLOAD) + data.addAssignment(data.courses.values.first().id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD)) + val assignment2 = data.addAssignment(data.courses.values.first().id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD)) login(student) device.pressHome() @@ -233,13 +234,14 @@ class ShareExtensionInteractionTest : StudentTest() { } @Test + @StubCoverage("Cannot init FileUploadWorker and OfflineSyncWorker") fun testFileAssignmentSubmission() { val data = createMockData() val student = data.students[0] val uri = setupFileOnDevice("sample.jpg") val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) - data.addAssignment(data.courses.values.first().id, submissionType = Assignment.SubmissionType.ONLINE_UPLOAD) + data.addAssignment(data.courses.values.first().id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_UPLOAD)) login(student) device.pressHome() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SubmissionDetailsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SubmissionDetailsInteractionTest.kt index e7ed73b4d5..30203de91a 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SubmissionDetailsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SubmissionDetailsInteractionTest.kt @@ -18,13 +18,24 @@ package com.instructure.student.ui.interaction import android.os.SystemClock.sleep import androidx.test.espresso.web.webdriver.Locator +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.Stub -import com.instructure.canvas.espresso.mockCanvas.* -import com.instructure.canvasapi2.models.* -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData +import com.instructure.canvas.espresso.mockCanvas.MockCanvas +import com.instructure.canvas.espresso.mockCanvas.addAssignment +import com.instructure.canvas.espresso.mockCanvas.addFileToCourse +import com.instructure.canvas.espresso.mockCanvas.addRubricToAssignment +import com.instructure.canvas.espresso.mockCanvas.addSubmissionForAssignment +import com.instructure.canvas.espresso.mockCanvas.init +import com.instructure.canvasapi2.models.Assignment +import com.instructure.canvasapi2.models.Attachment +import com.instructure.canvasapi2.models.Author +import com.instructure.canvasapi2.models.Course +import com.instructure.canvasapi2.models.RubricCriterion +import com.instructure.canvasapi2.models.RubricCriterionRating +import com.instructure.canvasapi2.models.SubmissionComment import com.instructure.student.ui.pages.WebViewTextCheck import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -41,12 +52,12 @@ class SubmissionDetailsInteractionTest : StudentTest() { // Clicking the "Description" button on a rubric criterion item should show a new page with the full description // Also checks to see that the rubric criterion is displayed correctly, and responds to clicks correctly @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testRubrics_showCriterionDescription() { val data = getToCourse() val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), pointsPossible = 10 ) @@ -85,13 +96,13 @@ class SubmissionDetailsInteractionTest : StudentTest() { // Should be able to add a comment on a submission @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testComments_addCommentToSingleAttemptSubmission() { val data = getToCourse() val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_URL + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_URL) ) courseBrowserPage.selectAssignments() @@ -113,7 +124,7 @@ class SubmissionDetailsInteractionTest : StudentTest() { val data = getToCourse() val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_URL, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_URL), userSubmitted = true ) @@ -151,14 +162,14 @@ class SubmissionDetailsInteractionTest : StudentTest() { // Student can preview an assignment comment attachment @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testComments_previewAttachment() { val data = getToCourse() val user = data.users.values.first() val assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY) ) // Some html for an attachment @@ -217,14 +228,14 @@ class SubmissionDetailsInteractionTest : StudentTest() { @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testComments_videoCommentPlayback() { // After recording a video comment, user should be able to view a replay } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.INTERACTION) fun testComments_audioCommentPlayback() { // After recording an audio comment, user should be able to hear an audio playback } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt index 63a4f61c12..8b9b613563 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt @@ -15,6 +15,10 @@ */ package com.instructure.student.ui.interaction +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addCourseCalendarEvent @@ -26,10 +30,6 @@ import com.instructure.canvasapi2.models.Tab import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -43,7 +43,7 @@ class SyllabusInteractionTest : StudentTest() { // Tests that we can display a calendar event from the syllabus/summary, // and does some verification of the calendar event. @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.SYLLABUS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.SYLLABUS, TestCategory.INTERACTION) fun testSyllabus_calendarEvent() { val data = goToSyllabus(eventCount = 1, assignmentCount = 0) @@ -87,7 +87,7 @@ class SyllabusInteractionTest : StudentTest() { repeat(assignmentCount) { data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = 2.days.fromNow.iso8601 ) } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyncSettingsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyncSettingsInteractionTest.kt index e81a192070..2a5c54cd5f 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyncSettingsInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyncSettingsInteractionTest.kt @@ -19,10 +19,10 @@ package com.instructure.student.ui.interaction import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.pandautils.R import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -35,51 +35,51 @@ class SyncSettingsInteractionTest : StudentTest() { override fun displaysPageObjects() = Unit @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION) fun testFurtherSettingsDisplayedByDefault() { goToSyncSettings() - syncSettingsPage.assertFurtherSettingsIsDisplayed() + offlineSyncSettingsPage.assertFurtherSettingsIsDisplayed() } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION) fun testClickAutoSyncHidesFurtherSettings() { goToSyncSettings() - syncSettingsPage.clickAutoSyncSwitch() - syncSettingsPage.assertFurtherSettingsNotDisplayed() + offlineSyncSettingsPage.clickAutoSyncSwitch() + offlineSyncSettingsPage.assertFurtherSettingsNotDisplayed() } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION) fun testChangeFrequency() { goToSyncSettings() - syncSettingsPage.assertFrequencyLabelText(R.string.daily) - syncSettingsPage.clickFrequency() - syncSettingsPage.clickDialogOption(R.string.weekly) - syncSettingsPage.assertFrequencyLabelText(R.string.weekly) + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.daily) + offlineSyncSettingsPage.openSyncFrequencySettingsDialog() + offlineSyncSettingsPage.clickSyncFrequencyDialogOption(R.string.weekly) + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.weekly) } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION) fun testChangeContentOverWifiOnly() { goToSyncSettings() - syncSettingsPage.assertWifiOnlySwitchIsChecked() - syncSettingsPage.clickWifiOnlySwitch() - syncSettingsPage.assertDialogDisplayedWithTitle(R.string.syncSettings_wifiConfirmationTitle) - syncSettingsPage.clickTurnOff() - syncSettingsPage.assertWifiOnlySwitchIsNotChecked() + offlineSyncSettingsPage.assertWifiOnlySwitchIsChecked() + offlineSyncSettingsPage.clickWifiOnlySwitch() + offlineSyncSettingsPage.assertTurnOffWifiOnlyDialogTexts() + offlineSyncSettingsPage.clickTurnOff() + offlineSyncSettingsPage.assertWifiOnlySwitchIsNotChecked() } @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.SYNC_SETTINGS, TestCategory.INTERACTION) fun testChangesSavedCorrectly() { val data = createMockCanvas() goToSyncSettings(data) - syncSettingsPage.clickFrequency() - syncSettingsPage.clickDialogOption(R.string.weekly) - syncSettingsPage.clickWifiOnlySwitch() - syncSettingsPage.clickTurnOff() + offlineSyncSettingsPage.openSyncFrequencySettingsDialog() + offlineSyncSettingsPage.clickSyncFrequencyDialogOption(R.string.weekly) + offlineSyncSettingsPage.clickWifiOnlySwitch() + offlineSyncSettingsPage.clickTurnOff() with(activityRule) { finishActivity() @@ -88,8 +88,8 @@ class SyncSettingsInteractionTest : StudentTest() { goToSyncSettings(data) - syncSettingsPage.assertFrequencyLabelText(R.string.weekly) - syncSettingsPage.assertWifiOnlySwitchIsNotChecked() + offlineSyncSettingsPage.assertSyncFrequencyLabelText(R.string.weekly) + offlineSyncSettingsPage.assertWifiOnlySwitchIsNotChecked() } private fun createMockCanvas(): MockCanvas { @@ -104,6 +104,6 @@ class SyncSettingsInteractionTest : StudentTest() { tokenLogin(data.domain, token, student) dashboardPage.waitForRender() leftSideNavigationDrawerPage.clickSettingsMenu() - settingsPage.openOfflineContentPage() + settingsPage.openOfflineSyncSettingsPage() } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/TodoInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/TodoInteractionTest.kt index b7129b3e7e..4e0d5abc4a 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/TodoInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/TodoInteractionTest.kt @@ -16,8 +16,12 @@ package com.instructure.student.ui.interaction import androidx.test.espresso.Espresso +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.StubLandscape import com.instructure.canvas.espresso.StubMultiAPILevel +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.addAssignment import com.instructure.canvas.espresso.mockCanvas.addQuizToCourse @@ -28,10 +32,6 @@ import com.instructure.canvasapi2.models.Quiz import com.instructure.dataseeding.util.days import com.instructure.dataseeding.util.fromNow import com.instructure.dataseeding.util.iso8601 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin import dagger.hilt.android.testing.HiltAndroidTest @@ -47,7 +47,7 @@ class TodoInteractionTest : StudentTest() { // Todo items should be clickable @Test - @TestMetaData(Priority.MANDATORY, FeatureCategory.TODOS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.MANDATORY, FeatureCategory.TODOS, TestCategory.INTERACTION) fun testClick_todoItemClickable() { val data = goToTodos() @@ -67,7 +67,7 @@ class TodoInteractionTest : StudentTest() { @Test @StubLandscape("Stubbed because on lowres device in landscape mode, the space is too narrow to scroll properly. Will be refactored and running when we changed to non-lowres device on nightly runs.") @StubMultiAPILevel("Somehow the 'OK' button within chooseFavoriteCourseFilter row is not clickable and not shown on the layout inspector as well.") - @TestMetaData(Priority.IMPORTANT, FeatureCategory.TODOS, TestCategory.INTERACTION, false) + @TestMetaData(Priority.IMPORTANT, FeatureCategory.TODOS, TestCategory.INTERACTION) fun testFilters() { val data = goToTodos(courseCount = 2, favoriteCourseCount = 1) val favoriteCourse = data.courses.values.first {course -> course.isFavorite} @@ -104,7 +104,7 @@ class TodoInteractionTest : StudentTest() { for(course in data.courses.values) { assignment = data.addAssignment( courseId = course.id, - submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY, + submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY), dueAt = 1.days.fromNow.iso8601 ) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/UserFilesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/UserFilesInteractionTest.kt index 80dbaf73ae..b5493d3b83 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/UserFilesInteractionTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/UserFilesInteractionTest.kt @@ -26,14 +26,16 @@ import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.Intents.intending import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction import androidx.test.espresso.intent.matcher.IntentMatchers.hasType +import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority import com.instructure.canvas.espresso.Stub +import com.instructure.canvas.espresso.StubCoverage +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvas.espresso.mockCanvas.MockCanvas import com.instructure.canvas.espresso.mockCanvas.init -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.pandautils.utils.Const import com.instructure.student.ui.utils.StudentTest import com.instructure.student.ui.utils.tokenLogin @@ -91,7 +93,8 @@ class UserFilesInteractionTest : StudentTest() { // Should be able to upload a file from the user's device // Mocks the result from the expected intent, then uploads it. @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION, false) + @StubCoverage("Cannot init FileUploadWorker and OfflineSyncWorker") + @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION) fun testUpload_deviceFile() { goToFilePicker() @@ -120,7 +123,8 @@ class UserFilesInteractionTest : StudentTest() { // Should be able to upload a file from the camera // Mocks the result from the expected intent, then uploads it. @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION, false) + @StubCoverage("Cannot init FileUploadWorker and OfflineSyncWorker") + @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION) fun testUpload_fileFromCamera() { goToFilePicker() @@ -161,7 +165,8 @@ class UserFilesInteractionTest : StudentTest() { // Should be able to upload a file from the user's photo gallery // Mocks the result from the expected intent, then uploads it. @Test - @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION, false) + @StubCoverage("Cannot init FileUploadWorker and OfflineSyncWorker") + @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.INTERACTION) fun testUpload_gallery() { goToFilePicker() @@ -191,28 +196,28 @@ class UserFilesInteractionTest : StudentTest() { @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION) fun testView_previewAudio() { // Should be able to preview an audio file } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION) fun testView_previewVideo() { // Should be able to preview a video file } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION) fun testView_createDirectory() { // Should be able to create a directory and upload a file to that directory } @Stub @Test - @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION, true) + @TestMetaData(Priority.COMMON, FeatureCategory.FILES, TestCategory.INTERACTION) fun testView_previewImage() { // Should be able to preview an image file } @@ -222,6 +227,9 @@ class UserFilesInteractionTest : StudentTest() { // Set up some rudimentary mock data, navigate to the file list page, then // initiate a file upload private fun goToFilePicker() : MockCanvas { + + File(InstrumentationRegistry.getInstrumentation().targetContext.cacheDir, "file_upload").deleteRecursively() + val data = MockCanvas.init( courseCount = 1, favoriteCourseCount = 1, diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/EditDashboardPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AllCoursesPage.kt similarity index 62% rename from apps/student/src/androidTest/java/com/instructure/student/ui/pages/EditDashboardPage.kt rename to apps/student/src/androidTest/java/com/instructure/student/ui/pages/AllCoursesPage.kt index c4bd4d94cf..d14942bad9 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/EditDashboardPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AllCoursesPage.kt @@ -16,25 +16,31 @@ package com.instructure.student.ui.pages -import androidx.test.espresso.matcher.ViewMatchers.hasDescendant -import androidx.test.espresso.matcher.ViewMatchers.withContentDescription -import androidx.test.espresso.matcher.ViewMatchers.withParent -import androidx.test.espresso.matcher.ViewMatchers.withText +import android.view.View +import androidx.appcompat.widget.AppCompatImageView +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.matcher.ViewMatchers.* import com.instructure.canvasapi2.models.Course +import com.instructure.dataseeding.model.CourseApiModel +import com.instructure.espresso.DoesNotExistAssertion +import com.instructure.espresso.ViewAlphaAssertion import com.instructure.espresso.assertDisplayed import com.instructure.espresso.click import com.instructure.espresso.page.BasePage import com.instructure.espresso.page.onView import com.instructure.espresso.page.plus +import com.instructure.espresso.page.waitForView import com.instructure.espresso.page.withId import com.instructure.espresso.page.withText import com.instructure.espresso.scrollTo import com.instructure.espresso.swipeUp import com.instructure.student.R +import org.hamcrest.Matcher import org.hamcrest.Matchers.allOf +import org.hamcrest.Matchers.anyOf import org.hamcrest.Matchers.containsString -class EditDashboardPage : BasePage(R.id.editDashboardPage) { +class AllCoursesPage : BasePage(R.id.editDashboardPage) { fun assertCourseDisplayed(course: Course) { val itemMatcher = allOf(withText(containsString(course.name)), withId(R.id.title)) @@ -102,6 +108,14 @@ class EditDashboardPage : BasePage(R.id.editDashboardPage) { onView(itemMatcher).assertDisplayed() } + fun assertCourseFavorited(course: CourseApiModel) { + val childMatcher = withContentDescription("Remove from dashboard") + val itemMatcher = allOf( + withContentDescription(containsString("Course ${course.name}, favorite")), + hasDescendant(childMatcher)) + onView(itemMatcher).assertDisplayed() + } + fun selectAllCourses() { val childMatcher = withContentDescription("Add all to dashboard") val itemMatcher = allOf(hasDescendant(withText(R.string.allCoursesCourseHeader)), hasDescendant(childMatcher)) @@ -116,6 +130,17 @@ class EditDashboardPage : BasePage(R.id.editDashboardPage) { onView(withParent(itemMatcher) + childMatcher).click() } + fun openCourse(courseName: String) { + onView(withId(R.id.title) + withText(courseName)).click() + } + + //OfflineMethod + fun assertSelectUnselectAllButtonNotClickable() { + val unselectAllMatcher = withContentDescription("Remove all from dashboard") + val selectAllMatcher = withContentDescription("Add all to dashboard") + onView(anyOf(unselectAllMatcher, selectAllMatcher)).check(matches(isNotClickable())) + } + fun assertCourseMassSelectButtonIsDisplayed(someSelected: Boolean) { if (someSelected) { @@ -149,4 +174,54 @@ class EditDashboardPage : BasePage(R.id.editDashboardPage) { onView(withId(R.id.swipeRefreshLayout) + withParent(withId(R.id.editDashboardPage))).swipeUp() } + //OfflineMethod + fun assertOfflineNoteDisplayed() { + waitForView(withId(R.id.noteTitle) + withText(R.string.allCoursesOfflineNoteTitle)).assertDisplayed() + onView(withId(R.id.note) + withText(R.string.allCoursesOfflineNote)) + } + + //OfflineMethod + fun assertOfflineNoteNotDisplayed() { + onView(withId(R.id.noteTitle) + withText(R.string.allCoursesOfflineNoteTitle)).check(DoesNotExistAssertion(10)) + } + + //OfflineMethod + fun dismissOfflineNoteBox() { + onView(allOf(isAssignableFrom(AppCompatImageView::class.java), hasSibling(withId(R.id.noteTitle)), hasSibling(withId(R.id.note)))).click() + onView(withId(R.id.noteTitle) + withText(R.string.allCoursesOfflineNoteTitle)).check(DoesNotExistAssertion(10)) + } + + //OfflineMethod + private fun assertViewAlpha(matcher: Matcher, expectedAlphaValue: Float) { + onView(matcher).check(ViewAlphaAssertion(expectedAlphaValue)) + } + + //OfflineMethod + fun assertCourseFavouriteStarAlpha(courseName: String, expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.favoriteButton) + hasSibling(withId(R.id.title) + withText(courseName)), expectedAlphaValue) + } + + //OfflineMethod + fun assertCourseTitleAlpha(courseName: String, expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.title) + withText(courseName), expectedAlphaValue) + } + + //OfflineMethod + fun assertCourseOpenButtonAlpha(courseName: String, expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.openButton) + hasSibling(withId(R.id.title) + withText(courseName)), expectedAlphaValue) + } + + //OfflineMethod + fun assertCourseDetailsAlpha(courseName: String, expectedAlphaValue: Float) { + assertCourseFavouriteStarAlpha(courseName, expectedAlphaValue) + assertCourseTitleAlpha(courseName, expectedAlphaValue) + assertCourseOpenButtonAlpha(courseName, expectedAlphaValue) + } + + //OfflineMethod + fun assertCourseOfflineSyncButton(courseName: String, visibility: Visibility) { + onView(withId(R.id.offlineSyncIcon) + hasSibling(withId(R.id.title) + withText(courseName))) + .check(matches(withEffectiveVisibility(visibility))) + } + } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt index 5164267d7f..b001e424f2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt @@ -20,18 +20,25 @@ import android.view.View import android.widget.ScrollView import androidx.appcompat.widget.AppCompatButton import androidx.test.espresso.Espresso +import androidx.test.espresso.Espresso.onData import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction +import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.matcher.RootMatchers.isDialog import androidx.test.espresso.matcher.ViewMatchers +import androidx.test.espresso.matcher.ViewMatchers.hasSibling import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.isEnabled import com.instructure.canvas.espresso.CanvasTest import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.canvas.espresso.stringContainsTextCaseInsensitive import com.instructure.canvas.espresso.waitForMatcherWithSleeps import com.instructure.canvasapi2.models.Assignment +import com.instructure.dataseeding.model.SubmissionType +import com.instructure.espresso.ModuleItemInteractions import com.instructure.espresso.OnViewWithId import com.instructure.espresso.assertContainsText import com.instructure.espresso.assertDisplayed @@ -57,8 +64,10 @@ import com.instructure.espresso.waitForCheck import com.instructure.student.R import org.hamcrest.Matcher import org.hamcrest.Matchers.allOf +import org.hamcrest.Matchers.anything +import org.hamcrest.Matchers.not -open class AssignmentDetailsPage : BasePage(R.id.assignmentDetailsPage) { +open class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage(R.id.assignmentDetailsPage) { val toolbar by OnViewWithId(R.id.toolbar) val points by OnViewWithId(R.id.points) val date by OnViewWithId(R.id.dueDateTextView) @@ -221,6 +230,86 @@ open class AssignmentDetailsPage : BasePage(R.id.assignmentDetailsPage) { waitForView(allOf(withId(R.id.attemptTitle), withAncestor(withId(R.id.attemptSpinner)))).assertDisplayed() waitForView(allOf(withId(R.id.attemptDate), withAncestor(withId(R.id.attemptSpinner)))).assertDisplayed() } + + fun selectSubmissionType(submissionType: SubmissionType) { + val viewMatcher = when (submissionType) { + SubmissionType.ONLINE_TEXT_ENTRY -> withId(R.id.submissionEntryText) + SubmissionType.ONLINE_UPLOAD -> withId(R.id.submissionEntryFile) + SubmissionType.ONLINE_URL -> withId(R.id.submissionEntryWebsite) + SubmissionType.MEDIA_RECORDING -> withId(R.id.submissionEntryMedia) + + else -> {withId(R.id.submissionEntryText)} + } + + onView(viewMatcher).click() + } + + fun assertSubmissionTypeDisplayed(submissionType: String) { + onView(withText(submissionType) + withAncestor(R.id.customPanel)).assertDisplayed() + } + + fun assertReminderSectionNotDisplayed() { + onView(withId(R.id.reminderTitle)).assertNotDisplayed() + onView(withId(R.id.reminderDescription)).assertNotDisplayed() + onView(withId(R.id.reminderAdd)).assertNotDisplayed() + } + + fun assertReminderSectionDisplayed() { + onView(withId(R.id.reminderTitle)).scrollTo().assertDisplayed() + onView(withId(R.id.reminderDescription)).scrollTo().assertDisplayed() + onView(withId(R.id.reminderAdd)).scrollTo().assertDisplayed() + } + + fun clickAddReminder() { + onView(withId(R.id.reminderAdd)).scrollTo().click() + } + + fun selectTimeOption(timeOption: String) { + onView(withText(timeOption)).scrollTo().click() + } + + fun assertReminderDisplayedWithText(text: String) { + onView(withText(text)).scrollTo().assertDisplayed() + } + + fun removeReminderWithText(text: String) { + onView( + allOf( + withId(R.id.remove), + hasSibling(withText(text)) + ) + ).click() + onView(withText(R.string.yes)).scrollTo().click() + } + + fun assertReminderNotDisplayedWithText(text: String) { + onView(withText(text)).check(doesNotExist()) + } + + fun clickCustom() { + onData(anything()).inRoot(isDialog()).atPosition(6).perform(click()) + } + + fun fillQuantity(quantity: String) { + onView(withId(R.id.quantity)).scrollTo().typeText(quantity) + Espresso.closeSoftKeyboard() + } + + fun clickHoursBefore() { + onView(withId(R.id.hours)).scrollTo().click() + } + + fun clickDaysBefore() { + onView(withId(R.id.days)).scrollTo().click() + } + + fun assertDoneButtonIsDisabled() { + onView(withText(R.string.done)).check(matches(not(isEnabled()))) + } + + fun clickDone() { + onView(withText(R.string.done)).click() + } } /** diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CollaborationsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CollaborationsPage.kt index d7dd3b1541..4d40a43b7d 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CollaborationsPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CollaborationsPage.kt @@ -47,18 +47,18 @@ object CollaborationsPage { .checkRepeat(webMatches(getText(), containsString("Start a New Collaboration") ), 30) } - fun assertGoogleDocsChoicePresent() { + fun assertGoogleDocsChoicePresentAsDefaultOption() { Web.onWebView(Matchers.allOf(withId(R.id.contentWebView), isDisplayed())) .withElement(DriverAtoms.findElement(Locator.ID, "collaboration_collaboration_type")) .perform(DriverAtoms.webScrollIntoView()) .check(webMatches(getText(), containsString("Google Docs") )) } - fun assertGoogleDocsExplanationPresent() { + fun assertGoogleDocsWarningDescriptionPresent() { Web.onWebView(Matchers.allOf(withId(R.id.contentWebView), isDisplayed())) .withElement(DriverAtoms.findElement(Locator.ID, "google_docs_description")) .perform(DriverAtoms.webScrollIntoView()) - .check(webMatches(getText(), containsString("Google Docs is a great place to collaborate") )) + .check(webMatches(getText(), containsString("Warning:") )) } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseBrowserPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseBrowserPage.kt index d3a9a95924..87cbc0de71 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseBrowserPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseBrowserPage.kt @@ -17,12 +17,15 @@ package com.instructure.student.ui.pages import android.view.View +import android.widget.LinearLayout +import androidx.constraintlayout.widget.ConstraintLayout import androidx.test.espresso.Espresso.onView import androidx.test.espresso.PerformException import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.action.ViewActions import androidx.test.espresso.assertion.ViewAssertions.doesNotExist +import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.* import com.instructure.canvas.espresso.scrollRecyclerView import com.instructure.canvas.espresso.withCustomConstraints @@ -34,11 +37,15 @@ import com.instructure.espresso.WaitForViewWithId import com.instructure.espresso.assertHasText import com.instructure.espresso.click import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.plus +import com.instructure.espresso.scrollTo import com.instructure.espresso.swipeUp import com.instructure.pandautils.views.SwipeRefreshLayoutAppBar import com.instructure.student.R import org.hamcrest.Matcher import org.hamcrest.Matchers.allOf +import org.hamcrest.Matchers.anyOf +import org.hamcrest.Matchers.not open class CourseBrowserPage : BasePage(R.id.courseBrowserPage) { @@ -140,6 +147,15 @@ open class CourseBrowserPage : BasePage(R.id.courseBrowserPage) { onView(allOf(withText(tabTitle), withId(R.id.label))).check(doesNotExist()) } + //OfflineMethod + fun assertTabDisabled(tabTitle: String) { + onView(allOf(anyOf(isAssignableFrom(LinearLayout::class.java), isAssignableFrom(ConstraintLayout::class.java)), withChild(anyOf(withId(R.id.label), withId(R.id.unsupportedLabel)) + withText(tabTitle)))).scrollTo().check(matches(not(isEnabled()))) + } + + fun assertTabEnabled(tabTitle: String) { + onView(allOf(anyOf(isAssignableFrom(LinearLayout::class.java), isAssignableFrom(ConstraintLayout::class.java)), withChild(anyOf(withId(R.id.label), withId(R.id.unsupportedLabel)) + withText(tabTitle)))).scrollTo().check(matches(isEnabled())) + } + // Minimizes toolbar if it is not already minimized private fun minimizeToolbar() { try { diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt index 78121a4c7e..4ede8e10ec 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt @@ -27,7 +27,6 @@ import androidx.test.espresso.ViewAction import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.platform.app.InstrumentationRegistry import com.instructure.canvas.espresso.scrollRecyclerView @@ -38,10 +37,12 @@ import com.instructure.canvasapi2.models.Group import com.instructure.dataseeding.model.CourseApiModel import com.instructure.dataseeding.model.GroupApiModel import com.instructure.espresso.* +import com.instructure.espresso.matchers.WaitForViewMatcher.waitForViewToBeCompletelyDisplayed import com.instructure.espresso.page.* import com.instructure.student.R import com.instructure.student.ui.utils.ViewUtils import org.hamcrest.CoreMatchers.allOf +import org.hamcrest.CoreMatchers.anyOf import org.hamcrest.CoreMatchers.containsString import org.hamcrest.Matcher import org.hamcrest.Matchers @@ -146,6 +147,10 @@ class DashboardPage : BasePage(R.id.dashboardPage) { onView(hamburgerButtonMatcher).waitForCheck(matches(isDisplayed())) } + fun openLeftSideMenu() { + onView(hamburgerButtonMatcher).click() + } + private fun scrollAndAssertDisplayed(matcher: Matcher) { // Arggghhh... This scrolling logic on the recycler view is really unreliable and seems // to fail for nonsensical reasons. For now, "scrollAndAssertDisplayed"" is just going to @@ -255,20 +260,24 @@ class DashboardPage : BasePage(R.id.dashboardPage) { } fun switchCourseView() { - Espresso.openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getInstrumentation().targetContext) + clickDashboardGlobalOverflowButton() onView(withText(containsString("Switch to"))) .perform(click()); } - //OfflineMethod fun openGlobalManageOfflineContentPage() { - Espresso.openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getInstrumentation().targetContext) - onView(withText(containsString("Manage Offline Content"))) + clickDashboardGlobalOverflowButton() + onView(withText(containsString("Manage Offline Content"))) .perform(click()); } - fun clickEditDashboard() { - onView(withId(R.id.editDashboardTextView)).scrollTo().click() + private fun clickDashboardGlobalOverflowButton() { + waitForViewToBeCompletelyDisplayed(withContentDescription("More options") + withAncestor(R.id.toolbar)) + Espresso.openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getInstrumentation().targetContext) + } + + fun openAllCoursesPage() { + waitForView(withId(R.id.editDashboardTextView)).scrollTo().click() } fun assertCourseNotDisplayed(course: CourseApiModel) { @@ -304,12 +313,16 @@ class DashboardPage : BasePage(R.id.dashboardPage) { } fun clickCourseOverflowMenu(courseTitle: String, menuTitle: String) { + clickOnCourseOverflowButton(courseTitle) + waitForView(withId(R.id.title) + withText(menuTitle)).click() + } + + fun clickOnCourseOverflowButton(courseTitle: String) { val courseOverflowMatcher = withId(R.id.overflow) + withAncestor( withId(R.id.cardView) + withDescendant(withId(R.id.titleTextView) + withText(courseTitle)) ) waitForView(courseOverflowMatcher).scrollTo().click() - waitForView(withId(R.id.title) + withText(menuTitle)).click() } fun assertCourseGrade(courseName: String, courseGrade: String) { @@ -345,6 +358,31 @@ class DashboardPage : BasePage(R.id.dashboardPage) { onView(withId(R.id.offlineIndicator)).check(matches(withEffectiveVisibility(Visibility.GONE))) } + //OfflineMethod + fun waitForOfflineIndicatorNotDisplayed() { + assertDisplaysCourses() + retry(times = 5, delay = 2000) { + assertOfflineIndicatorNotDisplayed() + } + } + + //OfflineMethod + fun waitForOfflineIndicatorDisplayed() { + assertDisplaysCourses() + retry(times = 5, delay = 2000) { + assertOfflineIndicatorDisplayed() + } + } + + //OfflineMethod + fun waitForOfflineSyncDashboardNotifications() { + waitForSyncProgressDownloadStartedNotification() + waitForSyncProgressDownloadStartedNotificationToDisappear() + + waitForSyncProgressStartingNotification() + waitForSyncProgressStartingNotificationToDisappear() + } + //OfflineMethod fun assertCourseOfflineSyncIconVisible(courseName: String) { waitForView(withId(R.id.offlineSyncIcon) + hasSibling(withId(R.id.titleTextView) + withText(courseName))).check(matches(withEffectiveVisibility(Visibility.VISIBLE))) @@ -357,7 +395,8 @@ class DashboardPage : BasePage(R.id.dashboardPage) { //OfflineMethod fun clickOnSyncProgressNotification() { - waitForView(ViewMatchers.withText(com.instructure.pandautils.R.string.syncProgress_syncingOfflineContent)).click() + Thread.sleep(2500) + onView(anyOf(withText(R.string.syncProgress_syncQueued),withText(R.string.syncProgress_downloadStarting), withText(R.string.syncProgress_syncingOfflineContent))).click() } //OfflineMethod @@ -379,6 +418,14 @@ class DashboardPage : BasePage(R.id.dashboardPage) { fun waitForSyncProgressStartingNotificationToDisappear() { ViewUtils.waitForViewToDisappear(withText(com.instructure.pandautils.R.string.syncProgress_syncingOfflineContent), 30) } + + //OfflineMethod + fun assertBottomMenusAreDisabled() { + onView(withId(R.id.bottomNavigationCalendar)).check(matches(isNotEnabled())) + onView(withId(R.id.bottomNavigationToDo)).check(matches(isNotEnabled())) + onView(withId(R.id.bottomNavigationNotifications)).check(matches(isNotEnabled())) + onView(withId(R.id.bottomNavigationInbox)).check(matches(isNotEnabled())) + } } /** diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt index 364b5ac258..63bc20c3ff 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt @@ -23,7 +23,6 @@ import androidx.test.espresso.action.ViewActions.swipeDown import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast -import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches import androidx.test.espresso.web.sugar.Web.onWebView import androidx.test.espresso.web.webdriver.DriverAtoms.findElement @@ -37,6 +36,7 @@ import com.instructure.canvas.espresso.withCustomConstraints import com.instructure.canvas.espresso.withElementRepeat import com.instructure.canvasapi2.models.DiscussionEntry import com.instructure.canvasapi2.models.DiscussionTopicHeader +import com.instructure.espresso.ModuleItemInteractions import com.instructure.espresso.OnViewWithId import com.instructure.espresso.assertDisplayed import com.instructure.espresso.assertGone @@ -47,6 +47,8 @@ import com.instructure.espresso.page.BasePage import com.instructure.espresso.page.plus import com.instructure.espresso.page.waitForViewWithId import com.instructure.espresso.page.withAncestor +import com.instructure.espresso.page.withId +import com.instructure.espresso.page.withText import com.instructure.espresso.scrollTo import com.instructure.student.R import com.instructure.student.ui.utils.TypeInRCETextEditor @@ -55,7 +57,7 @@ import org.hamcrest.Matchers.containsString import org.junit.Assert.assertTrue -class DiscussionDetailsPage : BasePage(R.id.discussionDetailsPage) { +class DiscussionDetailsPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage(R.id.discussionDetailsPage) { private val discussionTopicTitle by OnViewWithId(R.id.discussionTopicTitle) private val replyButton by OnViewWithId(R.id.replyToDiscussionTopic) @@ -91,7 +93,7 @@ class DiscussionDetailsPage : BasePage(R.id.discussionDetailsPage) { onView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)).scrollTo() } - private fun clickReply() { + fun clickReply() { replyButton.click() } @@ -118,11 +120,15 @@ class DiscussionDetailsPage : BasePage(R.id.discussionDetailsPage) { fun sendReply(replyMessage: String) { clickReply() waitForViewWithId(R.id.rce_webView).perform(TypeInRCETextEditor(replyMessage)) - onView(withId(R.id.menu_send)).click() + clickOnSendReplyButton() sleep(3000) // wait out the toast message } + private fun clickOnSendReplyButton() { + onView(withId(R.id.menu_send)).click() + } + fun assertReplyDisplayed(reply: DiscussionEntry, refreshesAllowed: Int = 0) { // Allow up to refreshesAllowed attempt/refresh cycles @@ -314,6 +320,16 @@ class DiscussionDetailsPage : BasePage(R.id.discussionDetailsPage) { onView(withId(R.id.pointsTextView)).assertNotDisplayed() } + fun clickOnInnerReply() { + onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)) + .withElement(findElement(Locator.XPATH, "//div[@class='reply_wrapper' and contains(@id, 'reply')]")) + .perform(webClick()) + } + + fun clickOnAddBookmarkMenu() { + onView(withText("Add Bookmark")).click() + } + private fun isUnreadIndicatorVisible(reply: DiscussionEntry): Boolean { return try { onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt index 28f125e1a9..83a593b0a2 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt @@ -16,7 +16,6 @@ */ package com.instructure.student.ui.pages -import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.platform.app.InstrumentationRegistry @@ -25,6 +24,7 @@ import com.instructure.canvas.espresso.explicitClick import com.instructure.canvas.espresso.scrollRecyclerView import com.instructure.canvas.espresso.waitForMatcherWithRefreshes import com.instructure.canvasapi2.models.DiscussionTopicHeader +import com.instructure.espresso.DoesNotExistAssertion import com.instructure.espresso.OnViewWithId import com.instructure.espresso.RecyclerViewItemCountAssertion import com.instructure.espresso.Searchable @@ -57,7 +57,6 @@ open class DiscussionListPage(val searchable: Searchable) : BasePage(R.id.discus fun waitForDiscussionTopicToDisplay(topicTitle: String) { val matcher = allOf(withText(topicTitle), withId(R.id.discussionTitle)) waitForView(matcher) - } fun assertTopicDisplayed(topicTitle: String) { @@ -67,7 +66,7 @@ open class DiscussionListPage(val searchable: Searchable) : BasePage(R.id.discus } fun assertTopicNotDisplayed(topicTitle: String?) { - onView(allOf(withText(topicTitle))).check(ViewAssertions.doesNotExist()) + onView(allOf(withText(topicTitle))).check(DoesNotExistAssertion(5)) } fun assertEmpty() { diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt index 1a5b4edd07..786d1e2406 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt @@ -20,9 +20,7 @@ import androidx.appcompat.widget.AppCompatButton import androidx.test.espresso.Espresso import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.action.ViewActions.swipeDown -import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.* import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.canvas.espresso.scrollRecyclerView @@ -58,6 +56,11 @@ class FileListPage(val searchable: Searchable) : BasePage(R.id.fileListPage) { waitForView(matcher).scrollTo().assertDisplayed() } + fun assertSearchItemDisplayed(itemName: String) { + val matcher = allOf(withId(R.id.fileName), withAncestor(R.id.fileSearchRecyclerView), withText(itemName)) + waitForView(matcher).scrollTo().assertDisplayed() + } + fun assertItemNotDisplayed(itemName: String) { val matcher = allOf(withId(R.id.fileName), withText(itemName)) onView(matcher).assertNotDisplayed() @@ -127,14 +130,14 @@ class FileListPage(val searchable: Searchable) : BasePage(R.id.fileListPage) { fun assertSearchResultCount(expectedCount: Int) { Thread.sleep(2000) onView(withId(R.id.fileSearchRecyclerView) + withAncestor(R.id.container)).check( - ViewAssertions.matches(ViewMatchers.hasChildCount(expectedCount)) + matches(hasChildCount(expectedCount)) ) } fun assertFileListCount(expectedCount: Int) { Thread.sleep(2000) - onView(withId(R.id.listView) + withAncestor(R.id.container)).check( - ViewAssertions.matches(ViewMatchers.hasChildCount(expectedCount)) + onView(withId(R.id.listView) + withAncestor(R.id.fileListPage)).check( + matches(hasChildCount(expectedCount)) ) } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileUploadPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileUploadPage.kt index 158d895e8b..752a4875cc 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileUploadPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileUploadPage.kt @@ -16,11 +16,9 @@ */ package com.instructure.student.ui.pages -import android.widget.Button import androidx.test.espresso.Espresso.onView import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.espresso.matcher.ViewMatchers -import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom import androidx.test.espresso.matcher.ViewMatchers.withId import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.espresso.OnViewWithId @@ -34,7 +32,6 @@ import com.instructure.espresso.page.withDescendant import com.instructure.espresso.page.withText import com.instructure.espresso.scrollTo import com.instructure.student.R -import org.hamcrest.core.AllOf.allOf class FileUploadPage : BasePage() { private val cameraButton by OnViewWithId(R.id.fromCamera) @@ -56,7 +53,7 @@ class FileUploadPage : BasePage() { } fun clickUpload() { - onView(allOf(isAssignableFrom(Button::class.java), withText(R.string.upload))).click() + onView(withText(R.string.upload)).click() } fun clickTurnIn() { diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/GoToQuizPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/GoToQuizPage.kt new file mode 100644 index 0000000000..9d6cc3af2c --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/GoToQuizPage.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.pages + +import com.instructure.espresso.ModuleItemInteractions +import com.instructure.espresso.OnViewWithText +import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.click +import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.plus +import com.instructure.espresso.page.withAncestor +import com.instructure.espresso.page.withId +import com.instructure.espresso.page.withText +import com.instructure.student.R + +class GoToQuizPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage() { + + private val goToQuizButton by OnViewWithText(R.string.goToQuiz) + + fun clickGoToQuizButton() { + goToQuizButton.click() + } + + fun assertQuizTitle(expectedTitle: String) { + onView(withId(R.id.quizTitle) + withText(expectedTitle) + withAncestor(R.id.quizInfoContainer)).assertDisplayed() + } +} diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt index 959dee5ad9..bb24ae21e7 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt @@ -126,7 +126,7 @@ class InboxConversationPage : BasePage(R.id.inboxConversationPage) { } fun assertNoSubjectDisplayed() { - onView(withId(R.id.subjectView) + withText(R.string.noSubject)).assertDisplayed() + onView(withId(R.id.subjectView) + withParent(withId(R.id.header)) + withText(R.string.noSubject)).assertDisplayed() } fun refresh() { diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxPage.kt index 47ac688d03..f3fa937f0e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxPage.kt @@ -145,7 +145,6 @@ class InboxPage : BasePage(R.id.inboxPage) { hasSibling(allOf(withId(R.id.subjectView), withText(subject)))) waitForMatcherWithRefreshes(matcher) // May need to refresh before the star shows up onView(matcher).scrollTo().assertDisplayed() - } fun assertConversationNotStarred(subject: String) { @@ -154,9 +153,7 @@ class InboxPage : BasePage(R.id.inboxPage) { hasSibling(withId(R.id.userName)), hasSibling(withId(R.id.date)), hasSibling(allOf(withId(R.id.subjectView), withText(subject)))) - waitForMatcherWithRefreshes(matcher) // May need to refresh before the star shows up onView(matcher).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE))) - } fun assertUnreadMarkerVisibility(conversation: Conversation, visibility: ViewMatchers.Visibility) { @@ -192,7 +189,7 @@ class InboxPage : BasePage(R.id.inboxPage) { } } - fun assertInboxEmpty() { + fun assertInboxEmpty() { waitForView(withId(R.id.emptyInboxView)).assertDisplayed() } @@ -303,4 +300,8 @@ class InboxPage : BasePage(R.id.inboxPage) { editToolbar.assertVisibility(visibility) } + fun assertConversationSubject(expectedSubject: String) { + onView(withId(R.id.subjectView) + withText(expectedSubject) + withAncestor(R.id.inboxRecyclerView)).assertDisplayed() + } + } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt index da39b4cefe..0fa4f1c98e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt @@ -12,8 +12,22 @@ import com.instructure.canvas.espresso.CanvasTest import com.instructure.canvas.espresso.waitForMatcherWithSleeps import com.instructure.canvasapi2.models.User import com.instructure.dataseeding.model.CanvasUserApiModel -import com.instructure.espresso.* -import com.instructure.espresso.page.* +import com.instructure.espresso.OnViewWithContentDescription +import com.instructure.espresso.OnViewWithId +import com.instructure.espresso.ViewAlphaAssertion +import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.assertNotDisplayed +import com.instructure.espresso.click +import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.onViewWithId +import com.instructure.espresso.page.onViewWithText +import com.instructure.espresso.page.waitForView +import com.instructure.espresso.page.waitForViewWithId +import com.instructure.espresso.page.withId +import com.instructure.espresso.scrollTo +import com.instructure.espresso.swipeDown +import com.instructure.espresso.swipeUp import com.instructure.student.R import org.hamcrest.CoreMatchers import org.hamcrest.Matcher @@ -86,6 +100,10 @@ class LeftSideNavigationDrawerPage : BasePage() { clickMenu(R.id.navigationDrawerItem_bookmarks) } + fun clickStudioMenu() { + clickMenu(R.id.navigationDrawerItem_studio) + } + fun clickSettingsMenu() { clickMenu(R.id.navigationDrawerSettings) } @@ -181,6 +199,73 @@ class LeftSideNavigationDrawerPage : BasePage() { logoutButton.assertDisplayed() } + //OfflineMethod + private fun assertViewAlpha(matcher: Matcher, expectedAlphaValue: Float) { + onView(matcher).check(ViewAlphaAssertion(expectedAlphaValue)) + } + + //OfflineMethod + private fun assertFilesMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_files), expectedAlphaValue) + } + + //OfflineMethod + private fun assertBookmarksMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_bookmarks), expectedAlphaValue) + } + + //OfflineMethod + private fun assertStudioMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_studio), expectedAlphaValue) + } + + //OfflineMethod + private fun assertSettingsMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerSettings), expectedAlphaValue) + } + + //OfflineMethod + private fun assertShowGradesMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_showGrades), expectedAlphaValue) + } + + //OfflineMethod + private fun assertColorOverlayMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_colorOverlay), expectedAlphaValue) + } + + //OfflineMethod + private fun assertHelpMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_help), expectedAlphaValue) + } + + //OfflineMethod + private fun assertChangeUserMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_changeUser), expectedAlphaValue) + } + + //OfflineMethod + private fun assertLogoutMenuAlphaValue(expectedAlphaValue: Float) { + assertViewAlpha(withId(R.id.navigationDrawerItem_logout), expectedAlphaValue) + } + + //OfflineMethod + fun assertOfflineDisabledMenus(expectedAlphaValue: Float) { + assertFilesMenuAlphaValue(expectedAlphaValue) + assertBookmarksMenuAlphaValue(expectedAlphaValue) + assertStudioMenuAlphaValue(expectedAlphaValue) + assertColorOverlayMenuAlphaValue(expectedAlphaValue) + assertHelpMenuAlphaValue(expectedAlphaValue) + } + + //OfflineMethod + fun assertOfflineEnabledMenus(expectedAlphaValue: Float) { + assertSettingsMenuAlphaValue(expectedAlphaValue) + assertShowGradesMenuAlphaValue(expectedAlphaValue) + assertChangeUserMenuAlphaValue(expectedAlphaValue) + assertLogoutMenuAlphaValue(expectedAlphaValue) + } + /** * Custom ViewAction to set a SwitchCompat to the desired on/off position * [position]: true -> "on", false -> "off" diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageDetailsPage.kt new file mode 100644 index 0000000000..81b06aaf67 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageDetailsPage.kt @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package com.instructure.student.ui.pages + +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches +import androidx.test.espresso.web.model.Atoms +import androidx.test.espresso.web.sugar.Web.onWebView +import com.instructure.espresso.ModuleItemInteractions +import com.instructure.espresso.page.BasePage +import com.instructure.student.R +import org.hamcrest.Matchers.allOf +import org.hamcrest.Matchers.containsString + +class PageDetailsPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage() { + + fun webAssertPageUrl(pageUrl: String) { + onWebView(allOf(withId(R.id.contentWebView), isDisplayed())) + .check(webMatches(Atoms.getCurrentUrl(), containsString(pageUrl))) + } + +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt index f5458663e5..6a73ea9746 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt @@ -16,12 +16,18 @@ */ package com.instructure.student.ui.pages +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.matcher.ViewMatchers +import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility import com.instructure.canvasapi2.models.User import com.instructure.espresso.OnViewWithId import com.instructure.espresso.assertContainsText import com.instructure.espresso.click import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.withId import com.instructure.student.R +import org.hamcrest.Matchers class PersonDetailsPage: BasePage(R.id.clickContainer) { @@ -37,4 +43,9 @@ class PersonDetailsPage: BasePage(R.id.clickContainer) { fun assertIsPerson(user: User) { userName.assertContainsText(user.name) } + + //OfflineMethod + fun assertComposeMessageIcon(visibility: ViewMatchers.Visibility) { + onView(Matchers.allOf(withId(R.id.compose))).check(matches(withEffectiveVisibility(visibility))) + } } \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SchedulePage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SchedulePage.kt index 2e38a15188..2fc890500e 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SchedulePage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SchedulePage.kt @@ -20,6 +20,7 @@ import android.view.View import androidx.test.espresso.NoMatchingViewException import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.contrib.RecyclerViewActions +import androidx.test.espresso.matcher.ViewMatchers.hasSibling import com.instructure.espresso.* import com.instructure.espresso.page.* import com.instructure.pandautils.binding.BindableViewHolder @@ -81,13 +82,13 @@ class SchedulePage : BasePage(R.id.schedulePage) { var i: Int = 0 while (true) { scrollToPosition(i) - Thread.sleep(500) + Thread.sleep(300) try { if(target == null) onView(withParent(itemId) + withText(itemName)).scrollTo() else onView(target + withText(itemName)).scrollTo() break } catch(e: NoMatchingViewException) { - i++ + i+=2 } } } @@ -100,16 +101,22 @@ class SchedulePage : BasePage(R.id.schedulePage) { waitForView(withAncestor(R.id.plannerItems) + withText(scheduleItemName)).assertDisplayed() } - fun assertMissingItemDisplayed(itemName: String, courseName: String, pointsPossible: String) { + fun assertMissingItemDisplayedOnPlannerItem(itemName: String, courseName: String, pointsPossible: String) { + val titleMatcher = withId(R.id.title) + withText(itemName) + val courseNameMatcher = withId(R.id.scheduleCourseHeaderText) + withText(courseName) + val pointsPossibleMatcher = withId(R.id.points) + withText(pointsPossible) + + onView(withId(R.id.plannerItems) + hasSibling(courseNameMatcher) + withDescendant(titleMatcher) + withDescendant(pointsPossibleMatcher) + withDescendant(withText(R.string.missingAssignment))) + .scrollTo() + .assertDisplayed() + } + + fun assertMissingItemDisplayedInMissingItemSummary(itemName: String, courseName: String, pointsPossible: String) { val titleMatcher = withId(R.id.title) + withText(itemName) val courseNameMatcher = withId(R.id.courseName) + withText(courseName) val pointsPossibleMatcher = withId(R.id.points) + withText(pointsPossible) - onView( - withId(R.id.missingItemLayout) + withDescendant(titleMatcher) + withDescendant( - courseNameMatcher - ) + withDescendant(pointsPossibleMatcher) - ) + onView(withId(R.id.missingItemLayout) + withDescendant(courseNameMatcher) + withDescendant(titleMatcher) + withDescendant(pointsPossibleMatcher)) .scrollTo() .assertDisplayed() } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SettingsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SettingsPage.kt index 8f40d0d703..0792369df0 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SettingsPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SettingsPage.kt @@ -16,12 +16,22 @@ */ package com.instructure.student.ui.pages -import com.instructure.espresso.* -import com.instructure.espresso.page.* +import androidx.test.espresso.matcher.ViewMatchers.hasSibling +import com.instructure.espresso.OnViewWithId +import com.instructure.espresso.TextViewColorAssertion +import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.assertNotDisplayed +import com.instructure.espresso.click +import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.plus +import com.instructure.espresso.page.withId +import com.instructure.espresso.page.withParent +import com.instructure.espresso.page.withText +import com.instructure.espresso.scrollTo import com.instructure.student.R class SettingsPage : BasePage(R.id.settingsFragment) { - private val toolbar by OnViewWithId(R.id.toolbar) private val profileSettingLabel by OnViewWithId(R.id.profileSettings) private val accountPreferencesLabel by OnViewWithId(R.id.accountPreferences) private val pushNotificationsLabel by OnViewWithId(R.id.pushNotifications) @@ -81,15 +91,30 @@ class SettingsPage : BasePage(R.id.settingsFragment) { appThemeStatus.check(TextViewColorAssertion(expectedTextColor)) } - fun openOfflineContentPage() { + //OfflineMethod + fun openOfflineSyncSettingsPage() { offlineContent.scrollTo().click() } + //OfflineMethod fun assertOfflineContentDisplayed() { offlineContent.scrollTo().assertDisplayed() } + //OfflineMethod fun assertOfflineContentNotDisplayed() { offlineContent.assertNotDisplayed() } + + //OfflineMethod + fun assertOfflineContentTitle() { + onView(withId(R.id.offlineContentTitle) + withText(R.string.offlineContent)).assertDisplayed() + } + + //OfflineMethod + fun assertOfflineSyncSettingsStatus(expectedStatus: Int) { + onView(withId(R.id.offlineSyncSettingsStatus) + withText(expectedStatus) + withParent(R.id.offlineSyncSettingsContainer) + + hasSibling(withId(R.id.offlineSyncSettingsTitle) + withText(R.string.offlineSyncSettingsTitle))).assertDisplayed() + } + } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyncSettingsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyncSettingsPage.kt deleted file mode 100644 index a7f2db9f3b..0000000000 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyncSettingsPage.kt +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2023 - present Instructure, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package com.instructure.student.ui.pages - -import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.isChecked -import androidx.test.espresso.matcher.ViewMatchers.isNotChecked -import com.instructure.espresso.* -import com.instructure.espresso.page.BasePage -import com.instructure.espresso.page.onViewWithText -import com.instructure.pandautils.R - -class SyncSettingsPage : BasePage(R.id.syncSettingsPage) { - - private val toolbar by OnViewWithId(R.id.toolbar) - private val autoSyncSwitch by OnViewWithId(R.id.autoSyncSwitch) - private val furtherSettings by OnViewWithId(R.id.furtherSettings) - private val syncFrequencyLabel by OnViewWithId(R.id.syncFrequencyLabel) - private val wifiOnlySwitch by OnViewWithId(R.id.wifiOnlySwitch) - - fun clickAutoSyncSwitch() { - autoSyncSwitch.click() - } - - fun clickFrequency() { - syncFrequencyLabel.click() - } - - fun clickDialogOption(stringResId: Int) { - onViewWithText(stringResId).click() - } - - fun clickWifiOnlySwitch() { - wifiOnlySwitch.click() - } - - fun clickTurnOff() { - onViewWithText(R.string.syncSettings_wifiConfirmationPositiveButton).click() - } - - fun assertFurtherSettingsIsDisplayed() { - furtherSettings.assertDisplayed() - } - - fun assertFurtherSettingsNotDisplayed() { - furtherSettings.assertNotDisplayed() - } - - fun assertFrequencyLabelText(expected: Int) { - syncFrequencyLabel.assertHasText(expected) - } - - fun assertWifiOnlySwitchIsChecked() { - wifiOnlySwitch.check(matches(isChecked())) - } - - fun assertWifiOnlySwitchIsNotChecked() { - wifiOnlySwitch.check(matches(isNotChecked())) - } - - fun assertDialogDisplayedWithTitle(title: Int) { - onViewWithText(title).assertDisplayed() - } -} diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/ManageOfflineContentPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/ManageOfflineContentPage.kt index 87d65a84ae..a64ec38b56 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/ManageOfflineContentPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/ManageOfflineContentPage.kt @@ -17,16 +17,36 @@ package com.instructure.student.ui.pages.offline +import androidx.test.espresso.Espresso import androidx.test.espresso.matcher.ViewMatchers +import androidx.test.espresso.matcher.ViewMatchers.Visibility import androidx.test.espresso.matcher.ViewMatchers.hasSibling import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility +import androidx.test.espresso.contrib.RecyclerViewActions +import androidx.test.espresso.matcher.ViewMatchers.* import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.canvas.espresso.hasCheckedState import com.instructure.canvas.espresso.withRotation -import com.instructure.espresso.* +import com.instructure.espresso.ConstraintLayoutItemCountAssertion +import com.instructure.espresso.ConstraintLayoutItemCountAssertionWithMatcher +import com.instructure.espresso.DoesNotExistAssertion +import com.instructure.espresso.OnViewWithId +import com.instructure.espresso.WaitForViewWithId import com.instructure.espresso.actions.ForceClick -import com.instructure.espresso.page.* +import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.click +import com.instructure.espresso.matchers.WaitForViewMatcher +import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.plus +import com.instructure.espresso.page.waitForView +import com.instructure.espresso.page.withAncestor +import com.instructure.espresso.page.withId +import com.instructure.espresso.page.withParent +import com.instructure.espresso.page.withText +import com.instructure.espresso.scrollTo import com.instructure.pandautils.R +import com.instructure.pandautils.binding.BindableViewHolder import org.hamcrest.CoreMatchers.allOf class ManageOfflineContentPage : BasePage(R.id.manageOfflineContentPage) { @@ -34,43 +54,37 @@ class ManageOfflineContentPage : BasePage(R.id.manageOfflineContentPage) { private val syncButton by OnViewWithId(R.id.syncButton) private val storageInfoContainer by WaitForViewWithId(R.id.storageInfoContainer) - //OfflineMethod fun changeItemSelectionState(itemName: String) { + onView(withId(R.id.offlineContentRecyclerView)) + .perform(RecyclerViewActions.scrollTo(hasDescendant(withText(itemName)))) onView(withId(R.id.checkbox) + hasSibling(withId(R.id.title) + withText(itemName))).scrollTo().click() } - //OfflineMethod fun expandCollapseItem(itemName: String) { - onView(withId(R.id.arrow) + withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE) + hasSibling(withId(R.id.title) + withText(itemName))).scrollTo().perform(ForceClick()) + onView(withId(R.id.arrow) + withEffectiveVisibility(Visibility.VISIBLE) + hasSibling(withId(R.id.title) + withText(itemName))).scrollTo().perform(ForceClick()) } - //OfflineMethod fun expandCollapseFiles() { expandCollapseItem("Files") } - //OfflineMethod fun clickOnSyncButton() { syncButton.click() } - //OfflineMethod fun clickOnSyncButtonAndConfirm() { clickOnSyncButton() confirmSync() } - //OfflineMethod private fun confirmSync() { waitForView(withText("Sync") + withAncestor(R.id.buttonPanel)).click() } - //OfflineMethod fun confirmDiscardChanges() { waitForView(withText("Discard") + withAncestor(R.id.buttonPanel)).click() } - //OfflineMethod fun assertStorageInfoDetails() { onView(withId(R.id.storageLabel) + withText(R.string.offline_content_storage)).assertDisplayed() onView(withId(R.id.storageInfo) + containsTextCaseInsensitive("Used")).assertDisplayed() @@ -80,85 +94,84 @@ class ManageOfflineContentPage : BasePage(R.id.manageOfflineContentPage) { onView(withId(R.id.remainingLabel) + withText(R.string.offline_content_remaining)).assertDisplayed() } - //OfflineMethod fun assertSelectButtonText(selectAll: Boolean) { - if(selectAll) waitForView(withId(R.id.menu_select_all) + withText(R.string.offline_content_select_all)).assertDisplayed() + if (selectAll) waitForView(withId(R.id.menu_select_all) + withText(R.string.offline_content_select_all)).assertDisplayed() else waitForView(withId(R.id.menu_select_all) + withText(R.string.offline_content_deselect_all)).assertDisplayed() } - //OfflineMethod fun clickOnSelectAllButton() { waitForView(withId(R.id.menu_select_all) + withText(R.string.offline_content_select_all)).click() } - //OfflineMethod fun clickOnDeselectAllButton() { waitForView(withId(R.id.menu_select_all) + withText(R.string.offline_content_deselect_all)).click() } - //OfflineMethod fun assertCourseCountWithMatcher(expectedCount: Int) { - ConstraintLayoutItemCountAssertionWithMatcher((allOf(withId(R.id.arrow), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))), expectedCount) + ConstraintLayoutItemCountAssertionWithMatcher((allOf(withId(R.id.arrow), withEffectiveVisibility(Visibility.VISIBLE))), expectedCount) } - //OfflineMethod fun assertCourseCount(expectedCount: Int) { - onView((allOf(withId(R.id.arrow), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))).check(ConstraintLayoutItemCountAssertion(expectedCount)) + onView((allOf(withId(R.id.arrow), withEffectiveVisibility(Visibility.VISIBLE)))).check(ConstraintLayoutItemCountAssertion(expectedCount)) } - //OfflineMethod fun assertToolbarTexts(courseName: String) { onView(withText(courseName) + withParent(R.id.toolbar) + withAncestor(R.id.manageOfflineContentPage)).assertDisplayed() onView(withText(R.string.offline_content_toolbar_title) + withParent(R.id.toolbar) + withAncestor(R.id.manageOfflineContentPage)).assertDisplayed() } - //OfflineMethod fun assertCheckedStateOfItem(itemName: String, state: Int) { - onView(withId(R.id.checkbox) + hasSibling(withId(R.id.title) + withText(itemName)) + hasCheckedState(state)).scrollTo().assertDisplayed() + val matcher = withId(R.id.checkbox) + hasSibling(withId(R.id.title) + withText(itemName)) + hasCheckedState(state) + onView(withId(R.id.offlineContentRecyclerView)) + .perform(RecyclerViewActions.scrollTo(hasDescendant(withText(itemName)))) + onView(matcher).scrollTo().assertDisplayed() } - //OfflineMethod fun waitForItemDisappear(itemName: String) { - onView(withId(R.id.checkbox) + hasSibling(withId(R.id.title) + withText(itemName))).check(DoesNotExistAssertion(5)) + waitForView(withId(R.id.checkbox) + hasSibling(withId(R.id.title) + withText(itemName))).check(DoesNotExistAssertion(5)) } - //OfflineMethod fun assertDisplaysNoCourses() { - onView(withText(R.string.offline_content_empty_message)).assertDisplayed() + Espresso.onView(ViewMatchers.withText(R.string.offline_content_empty_message)).assertDisplayed() } - //OfflineMethod fun assertDisplaysEmptyCourse() { - onView(withText(R.string.offline_content_empty_course_message)).assertDisplayed() + Espresso.onView(ViewMatchers.withText(R.string.offline_content_empty_course_message)).scrollTo().assertDisplayed() } - //OfflineMethod fun assertDisplaysItemWithExpandedState(title: String, expanded: Boolean) { - onView(withId(R.id.arrow) + Espresso.onView( + ViewMatchers.withId(R.id.arrow) + withRotation(if (expanded) 180f else 0f) - + withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE) - + hasSibling(withId(R.id.title) + withText(title)) + + withEffectiveVisibility(Visibility.VISIBLE) + + hasSibling(ViewMatchers.withId(R.id.title) + ViewMatchers.withText(title)) ).scrollTo().assertDisplayed() } - //OfflineMethod fun assertItemDisplayed(title: String) { - onView(withId(R.id.title) + withText(title)).scrollTo().assertDisplayed() + val matcher = withId(R.id.title) + withText(title) + onView(withId(R.id.offlineContentRecyclerView)) + .perform(RecyclerViewActions.scrollTo(hasDescendant(matcher))) + onView(matcher).scrollTo().assertDisplayed() } - //OfflineMethod fun assertDiscardDialogDisplayed() { - waitForView(withText(R.string.offline_content_discard_dialog_title)).assertDisplayed() + WaitForViewMatcher.waitForView(ViewMatchers.withText(R.string.offline_content_discard_dialog_title)) + .assertDisplayed() } - //OfflineMethod fun assertSyncDialogDisplayed(text: String) { - waitForView(withText(text)).assertDisplayed() + WaitForViewMatcher.waitForView(ViewMatchers.withText(text)).assertDisplayed() } - //OfflineMethod fun assertStorageInfoText(storageInfoText: String) { - onView(withId(R.id.storageInfo) + withText(storageInfoText)).assertDisplayed() + Espresso.onView( + ViewMatchers.withId(R.id.storageInfo) + ViewMatchers.withText( + storageInfoText + ) + ).assertDisplayed() } } + + diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/OfflineSyncSettingsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/OfflineSyncSettingsPage.kt new file mode 100644 index 0000000000..d27445850e --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/OfflineSyncSettingsPage.kt @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.instructure.student.ui.pages.offline + +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.matcher.ViewMatchers.isChecked +import androidx.test.espresso.matcher.ViewMatchers.isNotChecked +import com.instructure.espresso.OnViewWithId +import com.instructure.espresso.assertDisplayed +import com.instructure.espresso.assertHasText +import com.instructure.espresso.assertNotDisplayed +import com.instructure.espresso.click +import com.instructure.espresso.page.BasePage +import com.instructure.espresso.page.onView +import com.instructure.espresso.page.onViewWithText +import com.instructure.espresso.page.plus +import com.instructure.espresso.page.waitForView +import com.instructure.espresso.page.withAncestor +import com.instructure.espresso.page.withId +import com.instructure.espresso.page.withParent +import com.instructure.espresso.page.withText +import com.instructure.pandautils.R + +class OfflineSyncSettingsPage : BasePage(R.id.syncSettingsPage) { + + private val toolbar by OnViewWithId(R.id.toolbar) + private val autoSyncSwitch by OnViewWithId(R.id.autoSyncSwitch) + private val furtherSettings by OnViewWithId(R.id.furtherSettings) + private val syncFrequencyLabel by OnViewWithId(R.id.syncFrequencyLabel) + private val wifiOnlySwitch by OnViewWithId(R.id.wifiOnlySwitch) + + fun clickAutoSyncSwitch() { + autoSyncSwitch.click() + } + + fun openSyncFrequencySettingsDialog() { + syncFrequencyLabel.click() + } + + fun clickSyncFrequencyDialogOption(stringResId: Int) { + onView(withText(stringResId) + withParent(R.id.select_dialog_listview)).click() + } + + fun clickWifiOnlySwitch() { + wifiOnlySwitch.click() + } + + fun clickTurnOff() { + onViewWithText(R.string.syncSettings_wifiConfirmationPositiveButton).click() + } + + fun assertTurnOffWifiOnlyDialogTexts() { + waitForView(withId(R.id.alertTitle) + withText(R.string.syncSettings_wifiConfirmationTitle)).assertDisplayed() + waitForView(withText(R.string.syncSettings_wifiConfirmationPositiveButton) + withAncestor(R.id.buttonPanel)).assertDisplayed() + onView(withText(R.string.synySettings_wifiConfirmationMessage)).assertDisplayed() + } + + fun assertFurtherSettingsIsDisplayed() { + furtherSettings.assertDisplayed() + } + + fun assertFurtherSettingsNotDisplayed() { + furtherSettings.assertNotDisplayed() + } + + fun assertSyncFrequencyLabelText(expected: Int) { + syncFrequencyLabel.assertHasText(expected) + } + + fun assertSyncFrequencyTitleText() { + onView(withText(R.string.syncSettings_syncFrequencyTitle) + withParent(R.id.syncFrequencyContainer)).assertDisplayed() + } + + fun assertWifiOnlySwitchIsChecked() { + wifiOnlySwitch.check(matches(isChecked())) + } + + fun assertWifiOnlySwitchIsNotChecked() { + wifiOnlySwitch.check(matches(isNotChecked())) + } + + fun assertAutoSyncSwitchIsChecked() { + autoSyncSwitch.check(matches(isChecked())) + } + + fun assertAutoSyncSwitchIsNotChecked() { + autoSyncSwitch.check(matches(isNotChecked())) + } + + fun assertDialogDisplayedWithTitle(title: String) { + onViewWithText(title).assertDisplayed() + } + + fun assertSyncSettingsToolbarTitle() { + onView(withText(com.instructure.student.R.string.syncSettings_toolbarTitle) + withParent(withId( + com.instructure.student.R.id.toolbar) + withAncestor(com.instructure.student.R.id.syncSettingsPage))).assertDisplayed() + } + + fun assertSyncSettingsPageDescriptions() { + onView(withText(R.string.syncSettings_autoContentSyncDescription)).assertDisplayed() + onView(withText(R.string.syncSettings_syncFrequencyDescription)).assertDisplayed() + onView(withText(R.string.syncSettings_wifiOnlyDescription)).assertDisplayed() + } + +} diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/SyncProgressPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/SyncProgressPage.kt index f49c368035..dfb0cd3307 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/SyncProgressPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/SyncProgressPage.kt @@ -17,12 +17,15 @@ package com.instructure.student.ui.pages.offline +import android.widget.TextView import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.hasSibling import com.instructure.canvas.espresso.containsTextCaseInsensitive import com.instructure.espresso.OnViewWithId +import com.instructure.espresso.assertContainsText import com.instructure.espresso.assertDisplayed import com.instructure.espresso.assertVisibility +import com.instructure.espresso.click import com.instructure.espresso.page.BasePage import com.instructure.espresso.page.onView import com.instructure.espresso.page.plus @@ -32,6 +35,7 @@ import com.instructure.espresso.page.withId import com.instructure.espresso.page.withParent import com.instructure.espresso.page.withText import com.instructure.pandautils.R +import com.instructure.student.ui.utils.getView class SyncProgressPage : BasePage(R.id.syncProgressPage) { @@ -55,4 +59,32 @@ class SyncProgressPage : BasePage(R.id.syncProgressPage) { onView(withId(R.id.courseName) + withText(courseName) + withAncestor(R.id.syncProgressPage)).assertDisplayed() onView(withId(R.id.successIndicator) + withParent(withId(R.id.actionContainer) + hasSibling(withId(R.id.courseName) + withText(courseName)))).assertVisibility(ViewMatchers.Visibility.VISIBLE) } + + fun expandCollapseCourse(courseName: String) { + onView(withId(R.id.toggleButton) + hasSibling(withId(R.id.courseName) + withText(courseName))).click() + } + + fun assertCourseTabSynced(tabName: String) { + onView(withId(R.id.successIndicator) + withParent(withId(R.id.actionContainer) + hasSibling(withId(R.id.tabTitle) + withText(tabName)))).assertVisibility(ViewMatchers.Visibility.VISIBLE) + } + + fun getCourseSize(courseName: String): Int { + val courseSizeView = onView(withId(R.id.courseSize) + hasSibling(withId(R.id.courseName) + withText(courseName))) + val courseSizeText = (courseSizeView.getView() as TextView).text.toString() + return courseSizeText.split(" ")[0].toInt() + } + + fun assertSumOfCourseSizes(expectedSize: Int) { + if(expectedSize > 999) { + val convertedSumSize = convertKiloBytesToMegaBytes(expectedSize) + onView(withId(R.id.downloadProgressText)).assertContainsText(convertedSumSize.toString()) + } + else { + onView(withId(R.id.downloadProgressText)).assertContainsText(expectedSize.toString()) + } + } + + private fun convertKiloBytesToMegaBytes(kilobytes: Int): Double { + return kilobytes / 1000.0 + } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/DiscussionSubmissionViewRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/DiscussionSubmissionViewRenderTest.kt index aa025108c2..b76a80cf54 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/DiscussionSubmissionViewRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/DiscussionSubmissionViewRenderTest.kt @@ -15,10 +15,10 @@ */ package com.instructure.student.ui.renderTests -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.espresso.StudentRenderTest import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.DiscussionSubmissionViewFragment import com.instructure.student.ui.pages.renderPages.DiscussionSubmissionViewRenderPage diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt index bc0a772bb7..b1a7a71639 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt @@ -18,16 +18,16 @@ package com.instructure.student.ui.renderTests import androidx.test.espresso.assertion.ViewAssertions.doesNotExist import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.Course import com.instructure.espresso.assertDisplayed import com.instructure.espresso.assertHasText import com.instructure.espresso.assertNotDisplayed import com.instructure.espresso.assertVisible -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData import com.instructure.student.R import com.instructure.student.espresso.StudentRenderTest import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt index 7f1ec29f08..c3ddebf0ee 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt @@ -18,11 +18,15 @@ package com.instructure.student.ui.renderTests import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.SecondaryFeatureCategory +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.models.Submission import com.instructure.canvasapi2.models.User -import com.instructure.panda_annotations.* import com.instructure.student.PendingSubmissionComment import com.instructure.student.db.Db import com.instructure.student.db.getInstance @@ -131,7 +135,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSingleComment() { val state = SubmissionCommentsViewState( commentStates = listOf(commentItemIsAudience), @@ -143,7 +150,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSingleSubmission() { val state = SubmissionCommentsViewState( commentStates = listOf(submissionItem) @@ -153,7 +163,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSinglePendingComment() { val state = SubmissionCommentsViewState( commentStates = listOf(pendingCommentItem) @@ -163,7 +176,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSingleCommentDisplaysAuthorPronoun() { val commentItem = commentItemIsAudience.copy(authorPronouns = "Pro/Noun") val state = SubmissionCommentsViewState(commentStates = listOf(commentItem)) @@ -172,7 +188,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSingleSubmissionDisplaysAuthorPronoun() { val commentItem = submissionItem.copy(authorPronouns = "Pro/Noun") val state = SubmissionCommentsViewState(commentStates = listOf(commentItem)) @@ -181,7 +200,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testSinglePendingCommentDisplaysAuthorPronoun() { val commentItem = pendingCommentItem.copy(authorPronouns = "Pro/Noun") val state = SubmissionCommentsViewState(commentStates = listOf(commentItem)) @@ -190,7 +212,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testEmptyState() { val state = SubmissionCommentsViewState( commentStates = listOf(CommentItemState.Empty) @@ -200,7 +225,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testFailedCommentDisplaysRetryAndDeleteOptions() { db.setCommentError(true, pendingCommentItem.pendingComment.id) val state = SubmissionCommentsViewState( @@ -212,7 +240,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testMixedCommentsAndSubmission() { val state = SubmissionCommentsViewState( commentStates = listOf(commentItemIsAudience, submissionItem, commentItemNotAudience) @@ -228,7 +259,10 @@ class SubmissionCommentsRenderTest: StudentRenderTest() { } @Test - @TestMetaData(Priority.COMMON,FeatureCategory.ASSIGNMENTS,TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) + @TestMetaData( + Priority.COMMON, + FeatureCategory.ASSIGNMENTS, + TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS) fun testAudienceDistinction() { val state = SubmissionCommentsViewState( commentStates = listOf(commentItemIsAudience, commentItemNotAudience) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt index 904e9a4b77..97b2ca7df8 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt @@ -16,10 +16,10 @@ package com.instructure.student.ui.renderTests import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.instructure.panda_annotations.FeatureCategory -import com.instructure.panda_annotations.Priority -import com.instructure.panda_annotations.TestCategory -import com.instructure.panda_annotations.TestMetaData +import com.instructure.canvas.espresso.FeatureCategory +import com.instructure.canvas.espresso.Priority +import com.instructure.canvas.espresso.TestCategory +import com.instructure.canvas.espresso.TestMetaData import com.instructure.student.FileSubmission import com.instructure.student.espresso.StudentRenderTest import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionModel diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/views/GradeCellRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/views/GradeCellRenderTest.kt index 432f6a7c6c..ecb161ed32 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/views/GradeCellRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/views/GradeCellRenderTest.kt @@ -37,6 +37,7 @@ class GradeCellRenderTest : StudentRenderTest() { val submittedTitle by OnViewWithId(R.id.submittedTitle) val submittedSubtitle by OnViewWithId(R.id.submittedSubtitle) val pointsLabel by OnViewWithId(R.id.pointsLabel) + val yourGrade by OnViewWithId(R.id.yourGrade) val latePenalty by OnViewWithId(R.id.latePenalty) val finalGrade by OnViewWithId(R.id.finalGrade) val grade by OnViewWithId(R.id.grade) @@ -122,7 +123,8 @@ class GradeCellRenderTest : StudentRenderTest() { score = "91", showPointsLabel = true, outOf = "Out of 100 pts", - latePenalty = "Late Penalty (-2 pts)", + yourGrade = "Your Grade: 91 pts", + latePenalty = "Late Penalty: -2 pts", finalGrade = "Final Grade: 89 pts" ) setupViewWithState(state) @@ -132,6 +134,7 @@ class GradeCellRenderTest : StudentRenderTest() { score.assertDisplayed() pointsLabel.assertDisplayed() outOf.assertDisplayed() + yourGrade.assertDisplayed() latePenalty.assertDisplayed() finalGrade.assertDisplayed() } @@ -140,6 +143,7 @@ class GradeCellRenderTest : StudentRenderTest() { with(gradeCell) { score.assertHasText(state.score) outOf.assertHasText(state.outOf) + yourGrade.assertHasText(state.yourGrade) latePenalty.assertHasText(state.latePenalty) finalGrade.assertHasText(state.finalGrade) } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt new file mode 100644 index 0000000000..078ec98f70 --- /dev/null +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + */ + +package com.instructure.student.ui.utils + +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import com.instructure.student.activity.LoginActivity +import org.junit.Rule + +abstract class StudentComposeTest : StudentTest() { + + @get:Rule(order = 1) + val composeTestRule = createAndroidComposeRule() +} \ No newline at end of file diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt index 331d138f10..2bdebb30ac 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt @@ -32,8 +32,10 @@ import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers import androidx.test.espresso.matcher.ViewMatchers import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice import com.instructure.canvas.espresso.CanvasTest import com.instructure.espresso.InstructureActivityTestRule +import com.instructure.espresso.ModuleItemInteractions import com.instructure.espresso.Searchable import com.instructure.espresso.swipeRight import com.instructure.pandautils.utils.Const @@ -42,6 +44,7 @@ import com.instructure.student.R import com.instructure.student.activity.LoginActivity import com.instructure.student.espresso.StudentHiltTestApplication_Application import com.instructure.student.ui.pages.AboutPage +import com.instructure.student.ui.pages.AllCoursesPage import com.instructure.student.ui.pages.AnnotationCommentListPage import com.instructure.student.ui.pages.AnnouncementListPage import com.instructure.student.ui.pages.AssignmentDetailsPage @@ -56,11 +59,11 @@ import com.instructure.student.ui.pages.CourseGradesPage import com.instructure.student.ui.pages.DashboardPage import com.instructure.student.ui.pages.DiscussionDetailsPage import com.instructure.student.ui.pages.DiscussionListPage -import com.instructure.student.ui.pages.EditDashboardPage import com.instructure.student.ui.pages.ElementaryCoursePage import com.instructure.student.ui.pages.ElementaryDashboardPage import com.instructure.student.ui.pages.FileListPage import com.instructure.student.ui.pages.FileUploadPage +import com.instructure.student.ui.pages.GoToQuizPage import com.instructure.student.ui.pages.GradesPage import com.instructure.student.ui.pages.GroupBrowserPage import com.instructure.student.ui.pages.HelpPage @@ -77,6 +80,7 @@ import com.instructure.student.ui.pages.ModuleProgressionPage import com.instructure.student.ui.pages.ModulesPage import com.instructure.student.ui.pages.NewMessagePage import com.instructure.student.ui.pages.NotificationPage +import com.instructure.student.ui.pages.PageDetailsPage import com.instructure.student.ui.pages.PageListPage import com.instructure.student.ui.pages.PairObserverPage import com.instructure.student.ui.pages.PandaAvatarPage @@ -95,11 +99,11 @@ import com.instructure.student.ui.pages.ShareExtensionStatusPage import com.instructure.student.ui.pages.ShareExtensionTargetPage import com.instructure.student.ui.pages.SubmissionDetailsPage import com.instructure.student.ui.pages.SyllabusPage -import com.instructure.student.ui.pages.SyncSettingsPage import com.instructure.student.ui.pages.TextSubmissionUploadPage import com.instructure.student.ui.pages.TodoPage import com.instructure.student.ui.pages.UrlSubmissionUploadPage import com.instructure.student.ui.pages.offline.ManageOfflineContentPage +import com.instructure.student.ui.pages.offline.OfflineSyncSettingsPage import com.instructure.student.ui.pages.offline.SyncProgressPage import dagger.hilt.android.testing.HiltAndroidRule import instructure.rceditor.RCETextEditor @@ -112,6 +116,8 @@ import javax.inject.Inject abstract class StudentTest : CanvasTest() { + val device: UiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) + override val activityRule: InstructureActivityTestRule = StudentActivityTestRule(LoginActivity::class.java) @@ -147,7 +153,7 @@ abstract class StudentTest : CanvasTest() { */ val annotationCommentListPage = AnnotationCommentListPage() val announcementListPage = AnnouncementListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn)) - val assignmentDetailsPage = AssignmentDetailsPage() + val assignmentDetailsPage = AssignmentDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item)) val assignmentListPage = AssignmentListPage(Searchable(R.id.search, R.id.search_src_text)) val bookmarkPage = BookmarkPage() val calendarEventPage = CalendarEventPage() @@ -160,9 +166,9 @@ abstract class StudentTest : CanvasTest() { val courseGradesPage = CourseGradesPage() val dashboardPage = DashboardPage() val leftSideNavigationDrawerPage = LeftSideNavigationDrawerPage() - val discussionDetailsPage = DiscussionDetailsPage() + val discussionDetailsPage = DiscussionDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item)) val discussionListPage = DiscussionListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn)) - val editDashboardPage = EditDashboardPage() + val allCoursesPage = AllCoursesPage() val fileListPage = FileListPage(Searchable(R.id.search, R.id.queryInput, R.id.clearButton, R.id.backButton)) val fileUploadPage = FileUploadPage() val helpPage = HelpPage() @@ -178,6 +184,7 @@ abstract class StudentTest : CanvasTest() { val newMessagePage = NewMessagePage() val notificationPage = NotificationPage() val pageListPage = PageListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn)) + val pageDetailsPage = PageDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item)) val pairObserverPage = PairObserverPage() val pandaAvatarPage = PandaAvatarPage() val peopleListPage = PeopleListPage() @@ -187,6 +194,7 @@ abstract class StudentTest : CanvasTest() { val qrLoginPage = QRLoginPage() val quizListPage = QuizListPage() val quizTakingPage = QuizTakingPage() + val goToQuizPage = GoToQuizPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item)) val remoteConfigSettingsPage = RemoteConfigSettingsPage() val settingsPage = SettingsPage() val submissionDetailsPage = SubmissionDetailsPage() @@ -202,7 +210,7 @@ abstract class StudentTest : CanvasTest() { val importantDatesPage = ImportantDatesPage() val shareExtensionTargetPage = ShareExtensionTargetPage() val shareExtensionStatusPage = ShareExtensionStatusPage() - val syncSettingsPage = SyncSettingsPage() + val offlineSyncSettingsPage = OfflineSyncSettingsPage() val manageOfflineContentPage = ManageOfflineContentPage() val syncProgressPage = SyncProgressPage() diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt index 991c0e1778..02c6b4d5e4 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt @@ -23,6 +23,7 @@ import android.content.Intent import android.net.Uri import android.os.Environment import androidx.fragment.app.FragmentActivity +import androidx.test.espresso.Espresso import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId @@ -58,7 +59,11 @@ fun StudentTest.slowLogIn(enrollmentType: String = EnrollmentTypes.STUDENT_ENROL return user } -fun StudentTest.seedDataForK5( +fun StudentTest.openOverflowMenu() { + Espresso.openActionBarOverflowOrOptionsMenu(InstrumentationRegistry.getInstrumentation().targetContext) +} + +fun seedDataForK5( teachers: Int = 0, tas: Int = 0, pastCourses: Int = 0, @@ -69,7 +74,8 @@ fun StudentTest.seedDataForK5( announcements: Int = 0, discussions: Int = 0, syllabusBody: String? = null, - gradingPeriods: Boolean = false): SeedApi.SeededDataApiModel { + gradingPeriods: Boolean = false +): SeedApi.SeededDataApiModel { val request = SeedApi.SeedDataRequest ( teachers = teachers, @@ -88,7 +94,7 @@ fun StudentTest.seedDataForK5( return SeedApi.seedDataForSubAccount(request) } -fun StudentTest.seedData( +fun seedData( teachers: Int = 0, tas: Int = 0, pastCourses: Int = 0, @@ -100,7 +106,8 @@ fun StudentTest.seedData( locked: Boolean = false, discussions: Int = 0, syllabusBody: String? = null, - gradingPeriods: Boolean = false): SeedApi.SeededDataApiModel { + gradingPeriods: Boolean = false +): SeedApi.SeededDataApiModel { val request = SeedApi.SeedDataRequest ( teachers = teachers, @@ -119,15 +126,16 @@ fun StudentTest.seedData( return SeedApi.seedData(request) } -fun StudentTest.seedAssignments( - courseId: Long, - assignments: Int = 1, - withDescription: Boolean = false, - lockAt: String = "", - unlockAt: String = "", - dueAt: String = "", - submissionTypes: List = emptyList(), - teacherToken: String): List { +fun seedAssignments( + courseId: Long, + assignments: Int = 1, + withDescription: Boolean = false, + lockAt: String = "", + unlockAt: String = "", + dueAt: String = "", + submissionTypes: List = emptyList(), + teacherToken: String +): List { return AssignmentsApi.seedAssignments(AssignmentsApi.CreateAssignmentRequest( courseId = courseId, @@ -203,7 +211,7 @@ fun StudentTest.tokenLoginElementary(user: CanvasUserApiModel) { elementaryDashboardPage.assertPageObjects() } -fun StudentTest.routeTo(route: String) { +fun routeTo(route: String) { val url = "canvas-student://${CanvasNetworkAdapter.canvasDomain}/$route" val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val context = InstrumentationRegistry.getInstrumentation().targetContext @@ -213,7 +221,7 @@ fun StudentTest.routeTo(route: String) { context.startActivity(intent) } -fun StudentTest.routeTo(route: String, domain: String) { +fun routeTo(route: String, domain: String) { val url = "canvas-student://$domain/$route" val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val context = InstrumentationRegistry.getInstrumentation().targetContext @@ -223,39 +231,41 @@ fun StudentTest.routeTo(route: String, domain: String) { context.startActivity(intent) } -fun StudentTest.routeTo(route: Route, activity: FragmentActivity) { +fun routeTo(route: Route, activity: FragmentActivity) { RouteMatcher.route(activity, route) } -fun StudentTest.seedAssignmentSubmission( - submissionSeeds: List, - assignmentId: Long, - courseId: Long, - studentToken: String, - commentSeeds: List = kotlin.collections.emptyList() +fun seedAssignmentSubmission( + submissionSeeds: List, + assignmentId: Long, + courseId: Long, + studentToken: String, + commentSeeds: List = emptyList() ): List { // Upload one submission file for each submission seed submissionSeeds.forEach { it.attachmentsList.add( when (it.submissionType) { - SubmissionType.ONLINE_UPLOAD -> uploadTextFile(courseId, assignmentId, studentToken, + SubmissionType.ONLINE_UPLOAD -> uploadTextFile( + courseId, assignmentId, studentToken, FileUploadType.ASSIGNMENT_SUBMISSION ) else -> AttachmentApiModel(displayName="", fileName="", id=0L) // Not handled right now } - ); + ) } // Add attachments to comment seeds commentSeeds.forEach { - val fileAttachments: MutableList = kotlin.collections.mutableListOf() + val fileAttachments: MutableList = mutableListOf() for (i in 0..it.amount) { if (it.fileType != FileType.NONE) { fileAttachments.add(when (it.fileType) { - FileType.PDF -> kotlin.TODO() - FileType.TEXT -> uploadTextFile(courseId, assignmentId, studentToken, + FileType.PDF -> TODO() + FileType.TEXT -> uploadTextFile( + courseId, assignmentId, studentToken, FileUploadType.COMMENT_ATTACHMENT ) else -> throw RuntimeException("Unknown file type passed into StudentTest.seedAssignmentSubmission") // Unknown type @@ -266,19 +276,15 @@ fun StudentTest.seedAssignmentSubmission( it.attachmentsList.addAll(fileAttachments) } - // Seed the submissions - val submissionRequest = SubmissionsApi.SubmissionSeedRequest( - assignmentId = assignmentId, - courseId = courseId, - studentToken = studentToken, - commentSeedsList = commentSeeds, - submissionSeedsList = submissionSeeds - ) - - return SubmissionsApi.seedAssignmentSubmission(submissionRequest) + return SubmissionsApi.seedAssignmentSubmission(courseId, studentToken, assignmentId, commentSeeds, submissionSeeds) } -fun StudentTest.uploadTextFile(courseId: Long, assignmentId: Long, token: String, fileUploadType: FileUploadType): AttachmentApiModel { +fun uploadTextFile( + courseId: Long, + assignmentId: Long? = null, + token: String, + fileUploadType: FileUploadType +): AttachmentApiModel { // Create the file val file = File( @@ -294,10 +300,11 @@ fun StudentTest.uploadTextFile(courseId: Long, assignmentId: Long, token: String // Start the Canvas file upload process return FileUploadsApi.uploadFile( - courseId, - assignmentId, - file.readBytes(), - file.name, - token, - fileUploadType) + courseId, + assignmentId, + file.readBytes(), + file.name, + token, + fileUploadType + ) } diff --git a/apps/student/src/main/AndroidManifest.xml b/apps/student/src/main/AndroidManifest.xml index 064bc4dabb..121b471855 100644 --- a/apps/student/src/main/AndroidManifest.xml +++ b/apps/student/src/main/AndroidManifest.xml @@ -40,6 +40,7 @@ + - + @@ -296,6 +298,11 @@ + + + ?) @@ -130,6 +138,8 @@ abstract class CallbackActivity : ParentActivity(), OnUnreadCountInvalidated, No getUnreadNotificationCount() + featureFlagProvider.fetchEnvironmentFeatureFlags() + initialCoreDataLoadingComplete() } catch { initialCoreDataLoadingComplete() diff --git a/apps/student/src/main/java/com/instructure/student/activity/InterwebsToApplication.kt b/apps/student/src/main/java/com/instructure/student/activity/InterwebsToApplication.kt index f73493b59f..75b0f78651 100644 --- a/apps/student/src/main/java/com/instructure/student/activity/InterwebsToApplication.kt +++ b/apps/student/src/main/java/com/instructure/student/activity/InterwebsToApplication.kt @@ -27,11 +27,13 @@ import android.view.View import android.view.Window import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import com.instructure.canvasapi2.managers.OAuthManager import com.instructure.canvasapi2.models.AccountDomain import com.instructure.canvasapi2.utils.Analytics import com.instructure.canvasapi2.utils.AnalyticsEventConstants import com.instructure.canvasapi2.utils.AnalyticsParamConstants import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.canvasapi2.utils.weave.apiAsync import com.instructure.canvasapi2.utils.weave.catch import com.instructure.canvasapi2.utils.weave.tryWeave import com.instructure.loginapi.login.tasks.LogoutTask @@ -45,6 +47,7 @@ import com.instructure.pandautils.utils.Utils.generateUserAgent import com.instructure.student.R import com.instructure.student.databinding.InterwebsToApplicationBinding import com.instructure.student.databinding.LoadingCanvasViewBinding +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.router.RouteMatcher import com.instructure.student.tasks.StudentLogoutTask import com.instructure.student.util.LoggingUtility @@ -65,12 +68,15 @@ class InterwebsToApplication : AppCompatActivity() { @Inject lateinit var typefaceBehavior: TypefaceBehavior + @Inject + lateinit var alarmScheduler: AlarmScheduler + private var loadingJob: Job? = null public override fun onCreate(savedInstanceState: Bundle?) { requestWindowFeature(Window.FEATURE_NO_TITLE) super.onCreate(savedInstanceState) - setContentView(R.layout.interwebs_to_application) + setContentView(binding.root) loadingBinding = LoadingCanvasViewBinding.bind(binding.root) loadingBinding.loadingRoute.visibility = View.VISIBLE @@ -106,7 +112,13 @@ class InterwebsToApplication : AppCompatActivity() { // This is an App Link from a QR code, let's try to login the user and launch navigationActivity try { if(signedIn) { // If the user is already signed in, use the QR Switch - StudentLogoutTask(type = LogoutTask.Type.QR_CODE_SWITCH, uri = data, canvasForElementaryFeatureFlag = featureFlagProvider.getCanvasForElementaryFlag(), typefaceBehavior = typefaceBehavior).execute() + StudentLogoutTask( + type = LogoutTask.Type.QR_CODE_SWITCH, + uri = data, + canvasForElementaryFeatureFlag = featureFlagProvider.getCanvasForElementaryFlag(), + typefaceBehavior = typefaceBehavior, + alarmScheduler = alarmScheduler + ).execute() finish() return@tryWeave } @@ -117,6 +129,13 @@ class InterwebsToApplication : AppCompatActivity() { val tokenResponse = performSSOLogin(data, this@InterwebsToApplication) + val authResult = apiAsync { OAuthManager.getAuthenticatedSession(ApiPrefs.fullDomain, it) }.await() + if (authResult.isSuccess) { + authResult.dataOrNull?.sessionUrl?.let { + binding.dummyWebView.loadUrl(it) + } + } + val canvasForElementary = featureFlagProvider.getCanvasForElementaryFlag() // Add delay for animation and launch Navigation Activity diff --git a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt index 674981de32..59da6b00bd 100644 --- a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt +++ b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt @@ -52,9 +52,23 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics import com.instructure.canvasapi2.CanvasRestAdapter import com.instructure.canvasapi2.managers.GroupManager import com.instructure.canvasapi2.managers.UserManager -import com.instructure.canvasapi2.models.* -import com.instructure.canvasapi2.utils.* -import com.instructure.canvasapi2.utils.weave.* +import com.instructure.canvasapi2.models.CanvasContext +import com.instructure.canvasapi2.models.Group +import com.instructure.canvasapi2.models.LaunchDefinition +import com.instructure.canvasapi2.models.StorageQuotaExceededError +import com.instructure.canvasapi2.models.User +import com.instructure.canvasapi2.utils.APIHelper +import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.canvasapi2.utils.LocaleUtils +import com.instructure.canvasapi2.utils.Logger +import com.instructure.canvasapi2.utils.MasqueradeHelper +import com.instructure.canvasapi2.utils.Pronouns +import com.instructure.canvasapi2.utils.weave.WeaveJob +import com.instructure.canvasapi2.utils.weave.awaitApi +import com.instructure.canvasapi2.utils.weave.catch +import com.instructure.canvasapi2.utils.weave.tryLaunch +import com.instructure.canvasapi2.utils.weave.tryWeave +import com.instructure.canvasapi2.utils.weave.weave import com.instructure.interactions.FragmentInteractions import com.instructure.interactions.FullScreenInteractions import com.instructure.interactions.Navigation @@ -77,21 +91,54 @@ import com.instructure.pandautils.room.offline.DatabaseProvider import com.instructure.pandautils.room.offline.OfflineDatabase import com.instructure.pandautils.typeface.TypefaceBehavior import com.instructure.pandautils.update.UpdateManager -import com.instructure.pandautils.utils.* +import com.instructure.pandautils.utils.ActivityResult +import com.instructure.pandautils.utils.Const +import com.instructure.pandautils.utils.NetworkStateProvider +import com.instructure.pandautils.utils.OnActivityResults +import com.instructure.pandautils.utils.OnBackStackChangedEvent +import com.instructure.pandautils.utils.PermissionReceiver +import com.instructure.pandautils.utils.ProfileUtils import com.instructure.pandautils.utils.RequestCodes.CAMERA_PIC_REQUEST import com.instructure.pandautils.utils.RequestCodes.PICK_FILE_FROM_DEVICE import com.instructure.pandautils.utils.RequestCodes.PICK_IMAGE_GALLERY +import com.instructure.pandautils.utils.ThemePrefs +import com.instructure.pandautils.utils.ViewStyler +import com.instructure.pandautils.utils.applyTheme +import com.instructure.pandautils.utils.hideKeyboard +import com.instructure.pandautils.utils.items +import com.instructure.pandautils.utils.onClickWithRequireNetwork +import com.instructure.pandautils.utils.post +import com.instructure.pandautils.utils.postSticky +import com.instructure.pandautils.utils.setGone +import com.instructure.pandautils.utils.setVisible +import com.instructure.pandautils.utils.setupAsBackButton +import com.instructure.pandautils.utils.toast import com.instructure.student.R import com.instructure.student.databinding.ActivityNavigationBinding import com.instructure.student.databinding.LoadingCanvasViewBinding import com.instructure.student.databinding.NavigationDrawerBinding import com.instructure.student.dialog.BookmarkCreationDialog -import com.instructure.student.events.* +import com.instructure.student.events.CoreDataFinishedLoading +import com.instructure.student.events.CourseColorOverlayToggledEvent +import com.instructure.student.events.ShowConfettiEvent +import com.instructure.student.events.ShowGradesToggledEvent +import com.instructure.student.events.StatusBarColorChangeEvent +import com.instructure.student.events.UserUpdatedEvent +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.features.files.list.FileListFragment import com.instructure.student.features.modules.progression.CourseModuleProgressionFragment import com.instructure.student.features.navigation.NavigationRepository import com.instructure.student.flutterChannels.FlutterComm -import com.instructure.student.fragment.* +import com.instructure.student.fragment.BookmarksFragment +import com.instructure.student.fragment.CalendarEventFragment +import com.instructure.student.fragment.CalendarFragment +import com.instructure.student.fragment.DashboardFragment +import com.instructure.student.fragment.InboxComposeMessageFragment +import com.instructure.student.fragment.InboxConversationFragment +import com.instructure.student.fragment.InboxRecipientsFragment +import com.instructure.student.fragment.LtiLaunchFragment +import com.instructure.student.fragment.NotificationListFragment +import com.instructure.student.fragment.ToDoListFragment import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEffectHandler import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui.SubmissionDetailsEmptyContentFragment import com.instructure.student.navigation.AccountMenuItem @@ -105,11 +152,16 @@ import com.instructure.student.util.Analytics import com.instructure.student.util.AppShortcutManager import com.instructure.student.util.StudentPrefs import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import java.util.* +import java.util.ArrayDeque +import java.util.Deque import javax.inject.Inject private const val BOTTOM_NAV_SCREEN = "bottomNavScreen" @@ -143,9 +195,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. @Inject lateinit var databaseProvider: DatabaseProvider - @Inject - lateinit var featureFlagProvider: FeatureFlagProvider - @Inject lateinit var repository: NavigationRepository @@ -158,6 +207,9 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. @Inject lateinit var firebaseCrashlytics: FirebaseCrashlytics + @Inject + lateinit var alarmScheduler: AlarmScheduler + private var routeJob: WeaveJob? = null private var debounceJob: Job? = null private var drawerItemSelectedJob: Job? = null @@ -207,7 +259,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. StudentLogoutTask( if (ApiPrefs.isStudentView) LogoutTask.Type.LOGOUT else LogoutTask.Type.SWITCH_USERS, typefaceBehavior = typefaceBehavior, - databaseProvider = databaseProvider + databaseProvider = databaseProvider, + alarmScheduler = alarmScheduler ).execute() } R.id.navigationDrawerItem_logout -> { @@ -217,7 +270,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. StudentLogoutTask( LogoutTask.Type.LOGOUT, typefaceBehavior = typefaceBehavior, - databaseProvider = databaseProvider + databaseProvider = databaseProvider, + alarmScheduler = alarmScheduler ).execute() } .setNegativeButton(android.R.string.cancel, null) @@ -230,7 +284,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. R.id.navigationDrawerItem_stopMasquerading -> { MasqueradeHelper.stopMasquerading(startActivityClass) } - R.id.navigationDrawerSettings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) + R.id.navigationDrawerSettings -> startActivity(SettingsActivity.createIntent(applicationContext, featureFlagProvider.offlineEnabled())) } } } @@ -305,8 +359,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. setupNavDrawerItems() - loadFeatureFlags() - checkAppUpdates() val savedBottomScreens = savedInstanceState?.getStringArrayList(BOTTOM_SCREENS_BUNDLE_KEY) @@ -330,6 +382,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. } catch { firebaseCrashlytics.recordException(it) } + + scheduleAlarms() } private fun handleTokenCheck(online: Boolean?) { @@ -339,18 +393,17 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. lifecycleScope.launch { val isTokenValid = repository.isTokenValid() if (!isTokenValid) { - StudentLogoutTask(LogoutTask.Type.LOGOUT, typefaceBehavior = typefaceBehavior, databaseProvider = databaseProvider).execute() + StudentLogoutTask( + LogoutTask.Type.LOGOUT, + typefaceBehavior = typefaceBehavior, + databaseProvider = databaseProvider, + alarmScheduler = alarmScheduler + ).execute() } } } } - private fun loadFeatureFlags() { - lifecycleScope.launch { - featureFlagProvider.fetchEnvironmentFeatureFlags() - } - } - private fun requestNotificationsPermission() { if (checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) { notificationsPermissionContract.launch(Manifest.permission.POST_NOTIFICATIONS) @@ -398,7 +451,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. if (ApiPrefs.user == null ) { // Hard case to repro but it's possible for a user to force exit the app before we finish saving the user but they will still launch into the app // If that happens, log out - StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider).execute() + StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider, alarmScheduler = alarmScheduler).execute() } setupBottomNavigation() @@ -675,7 +728,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. override fun overrideFont() { super.overrideFont() - typefaceBehavior.overrideFont(navigationBehavior.fontFamily.fontPath) + typefaceBehavior.overrideFont(navigationBehavior.canvasFont) } //endregion @@ -905,6 +958,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. private fun selectBottomNavFragment(fragmentClass: Class) { val selectedFragment = supportFragmentManager.findFragmentByTag(fragmentClass.name) + (topFragment as? DashboardFragment)?.cancelCardDrag() + if (selectedFragment == null) { val fragment = createBottomNavFragment(fragmentClass.name) val newArguments = if (fragment?.arguments != null) fragment.requireArguments() else Bundle() @@ -1226,6 +1281,12 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. } } + private fun scheduleAlarms() { + lifecycleScope.launch { + alarmScheduler.scheduleAllAlarmsForCurrentUser() + } + } + companion object { fun createIntent(context: Context, route: Route): Intent { return Intent(context, NavigationActivity::class.java).apply { putExtra(Route.ROUTE, route) } diff --git a/apps/student/src/main/java/com/instructure/student/activity/SettingsActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/SettingsActivity.kt index 78a7509f68..edaed771de 100644 --- a/apps/student/src/main/java/com/instructure/student/activity/SettingsActivity.kt +++ b/apps/student/src/main/java/com/instructure/student/activity/SettingsActivity.kt @@ -18,9 +18,11 @@ package com.instructure.student.activity import android.content.Context import android.content.Intent +import android.content.res.Configuration import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment +import com.instructure.interactions.FragmentInteractions import com.instructure.pandautils.analytics.SCREEN_VIEW_SETTINGS import com.instructure.pandautils.analytics.ScreenView import com.instructure.pandautils.binding.viewBinding @@ -31,6 +33,8 @@ import com.instructure.student.databinding.ActivitySettingsBinding import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject +private const val OFFLINE_ENABLED = "offlineEnabled" + @ScreenView(SCREEN_VIEW_SETTINGS) @AndroidEntryPoint class SettingsActivity : AppCompatActivity(){ @@ -40,10 +44,12 @@ class SettingsActivity : AppCompatActivity(){ private val binding by viewBinding(ActivitySettingsBinding::inflate) + var offlineEnabled: Boolean = false + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + offlineEnabled = intent.getBooleanExtra(OFFLINE_ENABLED, false) setContentView(binding.root) - networkStateProvider.isOnlineLiveData.observe(this) { isOnline -> binding.offlineIndicator.root.setVisible(!isOnline) } @@ -51,6 +57,17 @@ class SettingsActivity : AppCompatActivity(){ private val currentFragment: Fragment? get() = supportFragmentManager.fragments.last() + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + applyThemeForAllFragments() + } + + private fun applyThemeForAllFragments() { + supportFragmentManager.fragments.forEach { + (it as? FragmentInteractions)?.applyTheme() + } + } + fun addFragment(fragment: Fragment) { val ft = supportFragmentManager.beginTransaction() currentFragment?.let { ft.hide(it) } @@ -60,8 +77,10 @@ class SettingsActivity : AppCompatActivity(){ } companion object { - fun createIntent(context: Context): Intent { - return Intent(context, SettingsActivity::class.java) + fun createIntent(context: Context, offlineEnabled: Boolean): Intent { + return Intent(context, SettingsActivity::class.java).apply { + putExtra(OFFLINE_ENABLED, offlineEnabled) + } } } } diff --git a/apps/student/src/main/java/com/instructure/student/adapter/BaseListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/BaseListRecyclerAdapter.kt index d801682e61..773e3221f7 100644 --- a/apps/student/src/main/java/com/instructure/student/adapter/BaseListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/adapter/BaseListRecyclerAdapter.kt @@ -102,8 +102,8 @@ abstract class BaseListRecyclerAdapter, T : Recycler fun onCallbackFinished() { isLoadedFirstPage = true shouldShowLoadingFooter() - adapterToRecyclerViewCallback.setDisplayNoConnection(false) - adapterToRecyclerViewCallback.setIsEmpty(isAllPagesLoaded && size() == 0) + adapterToRecyclerViewCallback?.setDisplayNoConnection(false) + adapterToRecyclerViewCallback?.setIsEmpty(isAllPagesLoaded && size() == 0) } /** diff --git a/apps/student/src/main/java/com/instructure/student/adapter/BookmarkRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/BookmarkRecyclerAdapter.kt index e65d179e7c..e3f695019e 100644 --- a/apps/student/src/main/java/com/instructure/student/adapter/BookmarkRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/adapter/BookmarkRecyclerAdapter.kt @@ -18,7 +18,6 @@ package com.instructure.student.adapter import android.content.Context -import android.os.Handler import android.view.View import android.widget.FrameLayout import android.widget.ImageView @@ -30,7 +29,6 @@ import com.instructure.canvasapi2.models.Bookmark import com.instructure.canvasapi2.utils.APIHelper import com.instructure.canvasapi2.utils.ApiType import com.instructure.canvasapi2.utils.LinkHeaders -import com.instructure.pandautils.utils.ColorKeeper import com.instructure.pandautils.utils.ColorUtils import com.instructure.pandautils.utils.textAndIconColor import com.instructure.student.R @@ -39,7 +37,7 @@ import com.instructure.student.router.RouteMatcher import com.instructure.student.util.CacheControlFlags import retrofit2.Call import retrofit2.Response -import java.util.Locale +import java.util.* class BookmarkRecyclerAdapter(context: Context, isShortcutActivity: Boolean, private val mAdapterToFragmentCallback: BookmarkAdapterToFragmentCallback) : BaseListRecyclerAdapter(context, Bookmark::class.java) { @@ -81,7 +79,7 @@ class BookmarkRecyclerAdapter(context: Context, isShortcutActivity: Boolean, pri override fun onFail(call: Call>?, error: Throwable, response: Response<*>?) { if (response != null && !APIHelper.isCachedResponse(response) || !APIHelper.hasNetworkConnection()) { - adapterToRecyclerViewCallback.setIsEmpty(true) + adapterToRecyclerViewCallback?.setIsEmpty(true) } } diff --git a/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt index 725f9456d3..66b1837c5f 100644 --- a/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt @@ -135,6 +135,8 @@ class DashboardRecyclerAdapter( val dashboardCards = repository.getDashboardCourses(isRefresh) val syncedCourseIds = repository.getSyncedCourseIds() + resetData() + mCourseMap = courses.associateBy { it.id } // Map not null is needed because the dashboard api can return unpublished courses @@ -158,10 +160,10 @@ class DashboardRecyclerAdapter( notifyDataSetChanged() isAllPagesLoaded = true - if (itemCount == 0) adapterToRecyclerViewCallback.setIsEmpty(true) + if (itemCount == 0) adapterToRecyclerViewCallback?.setIsEmpty(true) mAdapterToFragmentCallback.onRefreshFinished() } catch { - adapterToRecyclerViewCallback.setDisplayNoConnection(true) + adapterToRecyclerViewCallback?.setDisplayNoConnection(true) mAdapterToFragmentCallback.onRefreshFinished() } } diff --git a/apps/student/src/main/java/com/instructure/student/adapter/ExpandableRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/ExpandableRecyclerAdapter.kt index 9f99e78f10..d26c813838 100644 --- a/apps/student/src/main/java/com/instructure/student/adapter/ExpandableRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/adapter/ExpandableRecyclerAdapter.kt @@ -35,14 +35,14 @@ abstract class ExpandableRecyclerAdapter() { override fun onResponse(response: Response, linkHeaders: LinkHeaders, type: ApiType) { removeItem(todo) - adapterToRecyclerViewCallback.setIsEmpty(size() == 0) + adapterToRecyclerViewCallback?.setIsEmpty(size() == 0) } override fun onFail(call: Call?, error: Throwable, response: Response<*>?) { diff --git a/apps/student/src/main/java/com/instructure/student/di/AlarmSchedulerModule.kt b/apps/student/src/main/java/com/instructure/student/di/AlarmSchedulerModule.kt new file mode 100644 index 0000000000..ee3ad2f563 --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/di/AlarmSchedulerModule.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.instructure.student.di + +import android.content.Context +import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.pandautils.room.appdatabase.daos.ReminderDao +import com.instructure.student.features.assignments.reminder.AlarmScheduler +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent + +@Module +@InstallIn(SingletonComponent::class) +class AlarmSchedulerModule { + + @Provides + fun provideAlarmScheduler(@ApplicationContext context: Context, reminderDao: ReminderDao, apiPrefs: ApiPrefs): AlarmScheduler { + return AlarmScheduler(context, reminderDao, apiPrefs) + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/di/ApplicationModule.kt b/apps/student/src/main/java/com/instructure/student/di/ApplicationModule.kt new file mode 100644 index 0000000000..38d3f681b2 --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/di/ApplicationModule.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + */ + +package com.instructure.student.di + +import com.instructure.pandautils.utils.LogoutHelper +import com.instructure.student.util.StudentLogoutHelper +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent + +@Module +@InstallIn(SingletonComponent::class) +class ApplicationModule { + + @Provides + fun provideLogoutHelper(): LogoutHelper { + return StudentLogoutHelper() + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/di/DashboardModule.kt b/apps/student/src/main/java/com/instructure/student/di/DashboardModule.kt index e31afb88a7..ce8ef99516 100644 --- a/apps/student/src/main/java/com/instructure/student/di/DashboardModule.kt +++ b/apps/student/src/main/java/com/instructure/student/di/DashboardModule.kt @@ -19,6 +19,7 @@ package com.instructure.student.di import androidx.fragment.app.FragmentActivity import com.instructure.canvasapi2.apis.CourseAPI import com.instructure.canvasapi2.apis.GroupAPI +import com.instructure.canvasapi2.apis.UserAPI import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.pandautils.features.dashboard.edit.EditDashboardRouter import com.instructure.pandautils.features.dashboard.notifications.DashboardRouter @@ -56,9 +57,10 @@ class DashboardModule { fun provideDashboardNetworkDataSource( courseApi: CourseAPI.CoursesInterface, groupApi: GroupAPI.GroupInterface, - apiPrefs: ApiPrefs + apiPrefs: ApiPrefs, + userApi: UserAPI.UsersInterface ): DashboardNetworkDataSource { - return DashboardNetworkDataSource(courseApi, groupApi, apiPrefs) + return DashboardNetworkDataSource(courseApi, groupApi, apiPrefs, userApi) } @Provides diff --git a/apps/student/src/main/java/com/instructure/student/di/LoginModule.kt b/apps/student/src/main/java/com/instructure/student/di/LoginModule.kt index 24914b2cd9..5672e1660e 100644 --- a/apps/student/src/main/java/com/instructure/student/di/LoginModule.kt +++ b/apps/student/src/main/java/com/instructure/student/di/LoginModule.kt @@ -20,6 +20,7 @@ import androidx.fragment.app.FragmentActivity import com.instructure.loginapi.login.LoginNavigation import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter import com.instructure.pandautils.room.offline.DatabaseProvider +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.features.login.StudentAcceptableUsePolicyRouter import com.instructure.student.features.login.StudentLoginNavigation import dagger.Module @@ -32,12 +33,16 @@ import dagger.hilt.android.components.ActivityComponent class LoginModule { @Provides - fun provideAcceptabelUsePolicyRouter(activity: FragmentActivity, databaseProvider: DatabaseProvider): AcceptableUsePolicyRouter { - return StudentAcceptableUsePolicyRouter(activity, databaseProvider) + fun provideAcceptabelUsePolicyRouter( + activity: FragmentActivity, + databaseProvider: DatabaseProvider, + alarmScheduler: AlarmScheduler + ): AcceptableUsePolicyRouter { + return StudentAcceptableUsePolicyRouter(activity, databaseProvider, alarmScheduler) } @Provides - fun provideLoginNavigation(activity: FragmentActivity, databaseProvider: DatabaseProvider): LoginNavigation { - return StudentLoginNavigation(activity, databaseProvider) + fun provideLoginNavigation(activity: FragmentActivity, databaseProvider: DatabaseProvider, alarmScheduler: AlarmScheduler): LoginNavigation { + return StudentLoginNavigation(activity, databaseProvider, alarmScheduler) } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/AssignmentDetailsModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/AssignmentDetailsModule.kt index 05e0815954..36ec1daf56 100644 --- a/apps/student/src/main/java/com/instructure/student/di/feature/AssignmentDetailsModule.kt +++ b/apps/student/src/main/java/com/instructure/student/di/feature/AssignmentDetailsModule.kt @@ -18,6 +18,7 @@ package com.instructure.student.di.feature import com.instructure.canvasapi2.apis.* +import com.instructure.pandautils.room.appdatabase.daos.ReminderDao import com.instructure.pandautils.room.offline.daos.QuizDao import com.instructure.pandautils.room.offline.facade.AssignmentFacade import com.instructure.pandautils.room.offline.facade.CourseFacade @@ -59,8 +60,9 @@ class AssignmentDetailsModule { networkStateProvider: NetworkStateProvider, localDataSource: AssignmentDetailsLocalDataSource, networkDataSource: AssignmentDetailsNetworkDataSource, - featureFlagProvider: FeatureFlagProvider + featureFlagProvider: FeatureFlagProvider, + reminderDao: ReminderDao ): AssignmentDetailsRepository { - return AssignmentDetailsRepository(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider) + return AssignmentDetailsRepository(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider, reminderDao) } } diff --git a/apps/student/src/main/java/com/instructure/student/dialog/EditTextDialog.kt b/apps/student/src/main/java/com/instructure/student/dialog/EditTextDialog.kt index be1de289a2..1cf2d568e4 100644 --- a/apps/student/src/main/java/com/instructure/student/dialog/EditTextDialog.kt +++ b/apps/student/src/main/java/com/instructure/student/dialog/EditTextDialog.kt @@ -66,7 +66,14 @@ class EditTextDialog : AppCompatDialogFragment() { ViewStyler.themeEditText(requireContext(), binding.textInput, ThemePrefs.brandColor) binding.textInput.setText(mDefaultText) - binding.textInput.selectAll() + + val endIndex = mDefaultText.lastIndexOf(".") + if (endIndex != -1) { + binding.textInput.setSelection(0, endIndex) + } else { + binding.textInput.selectAll() + } + binding.textInput.requestFocus() val dialog = AlertDialog.Builder(requireContext()) .setCancelable(true) diff --git a/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt b/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt index d163ee5069..d0e1a5018c 100644 --- a/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt +++ b/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt @@ -87,7 +87,7 @@ class LegalDialogStyled : AppCompatDialogFragment() { } binding.privacyPolicy.onClick { - val intent = InternalWebViewActivity.createIntent(activity, "https://www.instructure.com/canvas/privacy", getString(R.string.privacyPolicy), false) + val intent = InternalWebViewActivity.createIntent(activity, "https://www.instructure.com/policies/product-privacy-policy", getString(R.string.privacyPolicy), false) requireContext().startActivity(intent) dialog?.dismiss() } diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt index 5dc83c242f..d9cf249358 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt @@ -17,9 +17,14 @@ package com.instructure.student.features.assignments.details +import android.app.AlarmManager import android.app.Dialog +import android.content.Context +import android.content.Intent import android.net.Uri +import android.os.Build import android.os.Bundle +import android.provider.Settings import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -27,10 +32,17 @@ import android.webkit.WebView import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.fragment.app.viewModels +import com.google.android.material.snackbar.Snackbar import com.instructure.canvasapi2.CanvasRestAdapter -import com.instructure.canvasapi2.models.* +import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.Assignment.SubmissionType -import com.instructure.canvasapi2.utils.* +import com.instructure.canvasapi2.models.CanvasContext +import com.instructure.canvasapi2.models.Course +import com.instructure.canvasapi2.models.LTITool +import com.instructure.canvasapi2.models.RemoteFile +import com.instructure.canvasapi2.utils.Analytics +import com.instructure.canvasapi2.utils.AnalyticsEventConstants +import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.canvasapi2.utils.pageview.PageView import com.instructure.canvasapi2.utils.pageview.PageViewUrlParam import com.instructure.interactions.bookmarks.Bookmarkable @@ -41,7 +53,18 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_ASSIGNMENT_DETAILS import com.instructure.pandautils.analytics.ScreenView import com.instructure.pandautils.features.discussion.router.DiscussionRouterFragment import com.instructure.pandautils.features.shareextension.ShareFileSubmissionTarget -import com.instructure.pandautils.utils.* +import com.instructure.pandautils.utils.Const +import com.instructure.pandautils.utils.LongArg +import com.instructure.pandautils.utils.ParcelableArg +import com.instructure.pandautils.utils.PermissionUtils +import com.instructure.pandautils.utils.ViewStyler +import com.instructure.pandautils.utils.makeBundle +import com.instructure.pandautils.utils.orDefault +import com.instructure.pandautils.utils.setVisible +import com.instructure.pandautils.utils.setupAsBackButton +import com.instructure.pandautils.utils.showThemed +import com.instructure.pandautils.utils.toast +import com.instructure.pandautils.utils.withArgs import com.instructure.pandautils.views.CanvasWebView import com.instructure.pandautils.views.RecordingMediaType import com.instructure.student.R @@ -49,7 +72,12 @@ import com.instructure.student.activity.BaseRouterActivity import com.instructure.student.databinding.DialogSubmissionPickerBinding import com.instructure.student.databinding.DialogSubmissionPickerMediaBinding import com.instructure.student.databinding.FragmentAssignmentDetailsBinding -import com.instructure.student.fragment.* +import com.instructure.student.features.assignments.reminder.CustomReminderDialog +import com.instructure.student.fragment.BasicQuizViewFragment +import com.instructure.student.fragment.InternalWebviewFragment +import com.instructure.student.fragment.LtiLaunchFragment +import com.instructure.student.fragment.ParentFragment +import com.instructure.student.fragment.StudioWebViewFragment import com.instructure.student.mobius.assignmentDetails.getVideoUri import com.instructure.student.mobius.assignmentDetails.launchAudio import com.instructure.student.mobius.assignmentDetails.needsPermissions @@ -134,6 +162,11 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable { } } + override fun onResume() { + super.onResume() + checkAlarmPermissionResult() + } + private fun handleAction(action: AssignmentDetailAction) { val canvasContext = canvasContext as? CanvasContext ?: run { toast(R.string.generalUnexpectedError) @@ -194,6 +227,15 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable { is AssignmentDetailAction.OnDiscussionHeaderAttachmentClicked -> { showDiscussionAttachments(action.attachments) } + is AssignmentDetailAction.ShowReminderDialog -> { + checkAlarmPermission() + } + is AssignmentDetailAction.ShowCustomReminderDialog -> { + showCustomReminderDialog() + } + is AssignmentDetailAction.ShowDeleteReminderConfirmationDialog -> { + showDeleteReminderConfirmationDialog(action.onConfirmed) + } } } @@ -387,6 +429,80 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable { ) } + private fun checkAlarmPermission() { + val alarmManager = context?.getSystemService(Context.ALARM_SERVICE) as AlarmManager + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + if (alarmManager.canScheduleExactAlarms()) { + showCreateReminderDialog() + } else { + viewModel.checkingReminderPermission = true + startActivity( + Intent( + Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM, + Uri.parse("package:" + requireContext().packageName) + ) + ) + } + } else { + showCreateReminderDialog() + } + } + + private fun checkAlarmPermissionResult() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && viewModel.checkingReminderPermission) { + if ((context?.getSystemService(Context.ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()) { + showCreateReminderDialog() + } else { + Snackbar.make(requireView(), getString(R.string.reminderPermissionNotGrantedError), Snackbar.LENGTH_LONG).show() + } + } + } + + private fun showCreateReminderDialog() { + val choices = listOf( + ReminderChoice.Minute(5), + ReminderChoice.Minute(15), + ReminderChoice.Minute(30), + ReminderChoice.Hour(1), + ReminderChoice.Day(1), + ReminderChoice.Week(1), + ReminderChoice.Custom, + ) + + AlertDialog.Builder(requireContext()) + .setTitle(R.string.reminderTitle) + .setNegativeButton(R.string.cancel, null) + .setSingleChoiceItems( + choices.map { + if (it is ReminderChoice.Custom) { + it.getText(resources) + } else { + getString(R.string.reminderBefore, it.getText(resources)) + } + }.toTypedArray(), -1 + ) { dialog, which -> + viewModel.onReminderSelected(choices[which]) + dialog.dismiss() + } + .showThemed() + } + + private fun showCustomReminderDialog() { + CustomReminderDialog.newInstance().show(childFragmentManager, null) + } + + private fun showDeleteReminderConfirmationDialog(onConfirmed: () -> Unit) { + AlertDialog.Builder(requireContext()) + .setTitle(R.string.deleteReminderTitle) + .setMessage(R.string.deleteReminderMessage) + .setNegativeButton(R.string.no, null) + .setPositiveButton(R.string.yes) { dialog, _ -> + onConfirmed() + dialog.dismiss() + } + .showThemed() + } + companion object { fun makeRoute(course: CanvasContext, assignmentId: Long): Route { val bundle = course.makeBundle { putLong(Const.ASSIGNMENT_ID, assignmentId) } diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsRepository.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsRepository.kt index 0a7d26035d..475df251da 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsRepository.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsRepository.kt @@ -17,11 +17,14 @@ package com.instructure.student.features.assignments.details +import androidx.lifecycle.LiveData import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.LTITool import com.instructure.canvasapi2.models.Quiz import com.instructure.pandautils.repository.Repository +import com.instructure.pandautils.room.appdatabase.daos.ReminderDao +import com.instructure.pandautils.room.appdatabase.entities.ReminderEntity import com.instructure.pandautils.utils.FeatureFlagProvider import com.instructure.pandautils.utils.NetworkStateProvider import com.instructure.student.features.assignments.details.datasource.AssignmentDetailsDataSource @@ -32,7 +35,8 @@ class AssignmentDetailsRepository( localDataSource: AssignmentDetailsLocalDataSource, networkDataSource: AssignmentDetailsNetworkDataSource, networkStateProvider: NetworkStateProvider, - featureFlagProvider: FeatureFlagProvider + featureFlagProvider: FeatureFlagProvider, + private val reminderDao: ReminderDao ) : Repository(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider) { suspend fun getCourseWithGrade(courseId: Long, forceNetwork: Boolean): Course { @@ -54,4 +58,23 @@ class AssignmentDetailsRepository( suspend fun getLtiFromAuthenticationUrl(url: String, forceNetwork: Boolean): LTITool? { return dataSource().getLtiFromAuthenticationUrl(url, forceNetwork) } + + fun getRemindersByAssignmentIdLiveData(userId: Long, assignmentId: Long): LiveData> { + return reminderDao.findByAssignmentIdLiveData(userId, assignmentId) + } + + suspend fun deleteReminderById(id: Long) { + reminderDao.deleteById(id) + } + + suspend fun addReminder(userId: Long, assignment: Assignment, text: String, time: Long) = reminderDao.insert( + ReminderEntity( + userId = userId, + assignmentId = assignment.id, + htmlUrl = assignment.htmlUrl.orEmpty(), + name = assignment.name.orEmpty(), + text = text, + time = time + ) + ) } diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewData.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewData.kt index 5058b054a4..9327ac087a 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewData.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewData.kt @@ -1,13 +1,20 @@ package com.instructure.student.features.assignments.details +import android.content.res.Resources import android.text.Spanned import androidx.annotation.ColorRes import androidx.databinding.BaseObservable import androidx.databinding.Bindable -import com.instructure.canvasapi2.models.* +import com.instructure.canvasapi2.models.Assignment +import com.instructure.canvasapi2.models.Course +import com.instructure.canvasapi2.models.LTITool +import com.instructure.canvasapi2.models.Quiz +import com.instructure.canvasapi2.models.RemoteFile import com.instructure.pandautils.features.assignmentdetails.AssignmentDetailsAttemptItemViewModel import com.instructure.pandautils.utils.ThemedColor +import com.instructure.student.R import com.instructure.student.features.assignments.details.gradecellview.GradeCellViewData +import com.instructure.student.features.assignments.details.itemviewmodels.ReminderItemViewModel data class AssignmentDetailsViewData( val courseColor: ThemedColor, @@ -32,7 +39,9 @@ data class AssignmentDetailsViewData( val discussionHeaderViewData: DiscussionHeaderViewData? = null, val quizDetails: QuizViewViewData? = null, val attemptsViewData: AttemptsViewData? = null, - @Bindable var hasDraft: Boolean = false + @Bindable var hasDraft: Boolean = false, + val showReminders: Boolean = false, + @Bindable var reminders: List = emptyList() ) : BaseObservable() { val firstAttemptOrNull = attempts.firstOrNull() val noDescriptionVisible = description.isEmpty() && !fullLocked @@ -51,6 +60,32 @@ data class DiscussionHeaderViewData( val onAttachmentClicked: () -> Unit ) +data class ReminderViewData(val id: Long, val text: String) + +sealed class ReminderChoice { + data class Minute(val quantity: Int) : ReminderChoice() + data class Hour(val quantity: Int) : ReminderChoice() + data class Day(val quantity: Int) : ReminderChoice() + data class Week(val quantity: Int) : ReminderChoice() + data object Custom : ReminderChoice() + + fun getText(resources: Resources) = when (this) { + is Minute -> resources.getQuantityString(R.plurals.reminderMinute, quantity, quantity) + is Hour -> resources.getQuantityString(R.plurals.reminderHour, quantity, quantity) + is Day -> resources.getQuantityString(R.plurals.reminderDay, quantity, quantity) + is Week -> resources.getQuantityString(R.plurals.reminderWeek, quantity, quantity) + is Custom -> resources.getString(R.string.reminderCustom) + } + + fun getTimeInMillis() = when (this) { + is Minute -> quantity * 60 * 1000L + is Hour -> quantity * 60 * 60 * 1000L + is Day -> quantity * 24 * 60 * 60 * 1000L + is Week -> quantity * 7 * 24 * 60 * 60 * 1000L + else -> 0 + } +} + sealed class AssignmentDetailAction { data class ShowToast(val message: String) : AssignmentDetailAction() data class NavigateToLtiScreen(val url: String) : AssignmentDetailAction() @@ -76,4 +111,7 @@ sealed class AssignmentDetailAction { data class ShowSubmitDialog(val assignment: Assignment, val studioLTITool: LTITool?) : AssignmentDetailAction() data class NavigateToUploadStatusScreen(val submissionId: Long) : AssignmentDetailAction() data class OnDiscussionHeaderAttachmentClicked(val attachments: List) : AssignmentDetailAction() + data object ShowReminderDialog : AssignmentDetailAction() + data object ShowCustomReminderDialog : AssignmentDetailAction() + data class ShowDeleteReminderConfirmationDialog(val onConfirmed: () -> Unit) : AssignmentDetailAction() } diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt index 345659d12b..603dc0c104 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt @@ -20,11 +20,24 @@ package com.instructure.student.features.assignments.details import android.app.Application import android.content.Context import android.content.res.Resources -import androidx.lifecycle.* +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope import com.instructure.canvasapi2.managers.SubmissionManager import com.instructure.canvasapi2.models.* import com.instructure.canvasapi2.models.Assignment.SubmissionType -import com.instructure.canvasapi2.utils.* +import com.instructure.canvasapi2.utils.Analytics +import com.instructure.canvasapi2.utils.AnalyticsEventConstants +import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.canvasapi2.utils.DateHelper +import com.instructure.canvasapi2.utils.NumberHelper +import com.instructure.canvasapi2.utils.Pronouns +import com.instructure.canvasapi2.utils.isNullOrEmpty +import com.instructure.canvasapi2.utils.isRtl +import com.instructure.canvasapi2.utils.isValid import com.instructure.interactions.bookmarks.Bookmarker import com.instructure.interactions.router.RouterParams import com.instructure.pandautils.BR @@ -32,10 +45,17 @@ import com.instructure.pandautils.features.assignmentdetails.AssignmentDetailsAt import com.instructure.pandautils.features.assignmentdetails.AssignmentDetailsAttemptViewData import com.instructure.pandautils.mvvm.Event import com.instructure.pandautils.mvvm.ViewState -import com.instructure.pandautils.utils.* +import com.instructure.pandautils.room.appdatabase.entities.ReminderEntity +import com.instructure.pandautils.utils.AssignmentUtils2 +import com.instructure.pandautils.utils.ColorKeeper +import com.instructure.pandautils.utils.Const +import com.instructure.pandautils.utils.HtmlContentFormatter +import com.instructure.pandautils.utils.orDefault import com.instructure.student.R import com.instructure.student.db.StudentDb import com.instructure.student.features.assignments.details.gradecellview.GradeCellViewData +import com.instructure.student.features.assignments.details.itemviewmodels.ReminderItemViewModel +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.mobius.assignmentDetails.getFormattedAttemptDate import com.instructure.student.mobius.assignmentDetails.uploadAudioRecording import com.instructure.student.util.getStudioLTITool @@ -44,7 +64,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import java.io.File import java.text.DateFormat -import java.util.* +import java.util.Date +import java.util.Locale import javax.inject.Inject import com.instructure.student.Submission as DatabaseSubmission @@ -56,7 +77,8 @@ class AssignmentDetailsViewModel @Inject constructor( private val htmlContentFormatter: HtmlContentFormatter, private val colorKeeper: ColorKeeper, private val application: Application, - apiPrefs: ApiPrefs, + private val apiPrefs: ApiPrefs, + private val alarmScheduler: AlarmScheduler, database: StudentDb ) : ViewModel(), Query.Listener { @@ -95,6 +117,19 @@ class AssignmentDetailsViewModel @Inject constructor( private val submissionQuery = database.submissionQueries.getSubmissionsByAssignmentId(assignmentId, apiPrefs.user?.id.orDefault()) + private val remindersObserver = Observer> { + _data.value?.reminders = mapReminders(it) + _data.value?.notifyPropertyChanged(BR.reminders) + } + + private val remindersLiveData = assignmentDetailsRepository.getRemindersByAssignmentIdLiveData( + apiPrefs.user?.id.orDefault(), assignmentId + ).apply { + observeForever(remindersObserver) + } + + var checkingReminderPermission = false + init { markSubmissionAsRead() submissionQuery.addListener(this) @@ -102,6 +137,11 @@ class AssignmentDetailsViewModel @Inject constructor( loadData() } + override fun onCleared() { + super.onCleared() + remindersLiveData.removeObserver(remindersObserver) + } + override fun queryResultsChanged() { viewModelScope.launch { val submission = submissionQuery.executeAsList().lastOrNull() @@ -227,7 +267,6 @@ class AssignmentDetailsViewModel @Inject constructor( } } - @Suppress("DEPRECATION") private suspend fun getViewData(assignment: Assignment, hasDraft: Boolean): AssignmentDetailsViewData { val points = if (restrictQuantitativeData) { "" @@ -242,7 +281,7 @@ class AssignmentDetailsViewModel @Inject constructor( val assignmentState = AssignmentUtils2.getAssignmentState(assignment, assignment.submission, false) // Don't mark LTI assignments as missing when overdue as they usually won't have a real submission for it - val isMissing = assignment.submission?.missing.orDefault() || (assignment.turnInType != Assignment.TurnInType.EXTERNAL_TOOL + val isMissing = assignment.isMissing() || (assignment.turnInType != Assignment.TurnInType.EXTERNAL_TOOL && assignment.dueAt != null && assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_MISSING) @@ -269,8 +308,11 @@ class AssignmentDetailsViewModel @Inject constructor( val submittedStatusIcon = if (assignment.isSubmitted) R.drawable.ic_complete_solid else R.drawable.ic_no // Submission Status under title - We only show Graded or nothing at all for PAPER/NONE - val submissionStatusVisible = assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_GRADED - || (assignment.turnInType != Assignment.TurnInType.ON_PAPER && assignment.turnInType != Assignment.TurnInType.NONE) + val submissionStatusVisible = + assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_GRADED + || assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_MISSING + || assignmentState == AssignmentUtils2.ASSIGNMENT_STATE_GRADED_MISSING + || (assignment.turnInType != Assignment.TurnInType.ON_PAPER && assignment.turnInType != Assignment.TurnInType.NONE) if (assignment.isLocked) { val lockedMessage = if (assignment.lockInfo?.contextModule != null) { @@ -340,10 +382,11 @@ class AssignmentDetailsViewModel @Inject constructor( ) // Observers shouldn't see the submit button OR if the course is soft concluded - val submitVisible = if (isObserver || !course?.isBetweenValidDateRange().orDefault()) { - false - } else { - when (assignment.turnInType) { + val submitVisible = when { + isObserver -> false + !course?.isBetweenValidDateRange().orDefault() -> false + assignment.submission?.excused.orDefault() -> false + else -> when (assignment.turnInType) { Assignment.TurnInType.QUIZ, Assignment.TurnInType.DISCUSSION -> true Assignment.TurnInType.ONLINE, Assignment.TurnInType.EXTERNAL_TOOL -> assignment.isAllowedToSubmit else -> false @@ -443,7 +486,9 @@ class AssignmentDetailsViewModel @Inject constructor( discussionHeaderViewData = discussionHeaderViewData, quizDetails = quizViewViewData, attemptsViewData = attemptsViewData, - hasDraft = hasDraft + hasDraft = hasDraft, + showReminders = assignment.dueDate?.after(Date()).orDefault(), + reminders = mapReminders(remindersLiveData.value.orEmpty()) ) } @@ -451,6 +496,21 @@ class AssignmentDetailsViewModel @Inject constructor( _events.postValue(Event(action)) } + private fun mapReminders(reminders: List) = reminders.map { + ReminderItemViewModel(ReminderViewData(it.id, resources.getString(R.string.reminderBefore, it.text))) { + postAction(AssignmentDetailAction.ShowDeleteReminderConfirmationDialog { + deleteReminderById(it) + }) + } + } + + private fun deleteReminderById(id: Long) { + alarmScheduler.cancelAlarm(id) + viewModelScope.launch { + assignmentDetailsRepository.deleteReminderById(id) + } + } + fun refresh() { _state.postValue(ViewState.Refresh) loadData(true) @@ -556,4 +616,55 @@ class AssignmentDetailsViewModel @Inject constructor( fun showContent(viewState: ViewState?): Boolean { return (viewState == ViewState.Success || viewState == ViewState.Refresh) && assignment != null } + + fun onAddReminderClicked() { + postAction(AssignmentDetailAction.ShowReminderDialog) + } + + fun onReminderSelected(reminderChoice: ReminderChoice) { + if (reminderChoice == ReminderChoice.Custom) { + postAction(AssignmentDetailAction.ShowCustomReminderDialog) + } else { + setReminder(reminderChoice) + } + } + + private fun setReminder(reminderChoice: ReminderChoice) { + val assignment = assignment ?: return + val alarmTimeInMillis = getAlarmTimeInMillis(reminderChoice) ?: return + val reminderText = reminderChoice.getText(resources) + + if (alarmTimeInMillis < System.currentTimeMillis()) { + postAction(AssignmentDetailAction.ShowToast(resources.getString(R.string.reminderInPast))) + return + } + + if (remindersLiveData.value?.any { it.time == alarmTimeInMillis }.orDefault()) { + postAction(AssignmentDetailAction.ShowToast(resources.getString(R.string.reminderAlreadySet))) + return + } + + viewModelScope.launch { + val reminderId = assignmentDetailsRepository.addReminder( + apiPrefs.user?.id.orDefault(), + assignment, + reminderText, + alarmTimeInMillis + ) + + alarmScheduler.scheduleAlarm( + assignment.id, + assignment.htmlUrl.orEmpty(), + assignment.name.orEmpty(), + reminderText, + alarmTimeInMillis, + reminderId + ) + } + } + + private fun getAlarmTimeInMillis(reminderChoice: ReminderChoice): Long? { + val dueDate = assignment?.dueDate?.time ?: return null + return dueDate - reminderChoice.getTimeInMillis() + } } diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/gradecellview/GradeCellViewData.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/gradecellview/GradeCellViewData.kt index 7fb3b6eae8..fe8c7ca580 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/gradecellview/GradeCellViewData.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/gradecellview/GradeCellViewData.kt @@ -24,6 +24,7 @@ data class GradeCellViewData( val grade: String = "", val gradeCellContentDescription: String = "", val outOf: String = "", + val yourGrade: String = "", val latePenalty: String = "", val finalGrade: String = "", val stats: GradeCellViewState.GradeStats? = null @@ -39,7 +40,6 @@ data class GradeCellViewData( } companion object { - @Suppress("DEPRECATION") fun fromSubmission( resources: Resources, courseColor: ThemedColor, @@ -145,7 +145,7 @@ data class GradeCellViewData( gradeCellContentDescription = contentDescription, ) } else { - val score = NumberHelper.formatDecimal(submission.enteredScore, 2, true) + val score = NumberHelper.formatDecimal(submission.score, 2, true) val chartPercent = (submission.enteredScore / assignment.pointsPossible).coerceIn(0.0, 1.0).toFloat() // If grading type is Points, don't show the grade since we're already showing it as the score var grade = if (assignment.gradingType != Assignment.POINTS_TYPE) submission.grade.orEmpty() else "" @@ -170,12 +170,15 @@ data class GradeCellViewData( var latePenalty = "" var finalGrade = "" + var yourGrade = "" // Adjust for late penalty, if any if (submission.pointsDeducted.orDefault() > 0.0) { grade = "" // Grade will be shown in the 'final grade' text val pointsDeducted = NumberHelper.formatDecimal(submission.pointsDeducted.orDefault(), 2, true) - latePenalty = resources.getString(R.string.latePenalty, pointsDeducted) + val achievedScore = NumberHelper.formatDecimal(submission.enteredScore, 2, true) + yourGrade = resources.getString(R.string.yourGrade, achievedScore) + latePenalty = resources.getString(R.string.latePenaltyUpdated, pointsDeducted) finalGrade = resources.getString(R.string.finalGradeFormatted, submission.grade) } @@ -210,6 +213,7 @@ data class GradeCellViewData( grade = grade, gradeCellContentDescription = gradeCellContentDescription, outOf = outOfText, + yourGrade = yourGrade, latePenalty = latePenalty, finalGrade = finalGrade, stats = stats diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/itemviewmodels/ReminderItemViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/itemviewmodels/ReminderItemViewModel.kt new file mode 100644 index 0000000000..bbd443a22c --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/itemviewmodels/ReminderItemViewModel.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.instructure.student.features.assignments.details.itemviewmodels + +import com.instructure.pandautils.mvvm.ItemViewModel +import com.instructure.student.R +import com.instructure.student.features.assignments.details.ReminderViewData + +class ReminderItemViewModel( + val data: ReminderViewData, + val onRemoveClick: (Long) -> Unit +) : ItemViewModel { + override val layoutId: Int + get() = R.layout.view_reminder +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt index e198678fb9..97c13658cc 100644 --- a/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt @@ -75,7 +75,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { private var canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT) - private lateinit var recyclerAdapter: AssignmentListRecyclerAdapter + private var recyclerAdapter: AssignmentListRecyclerAdapter? = null private var termAdapter: TermSpinnerAdapter? = null private var filterPosition = 0 @@ -118,7 +118,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { override fun onRefreshFinished() { if (!isAdded) return // Refresh can finish after user has left screen, causing emptyView to be null setRefreshing(false) - if (recyclerAdapter.size() == 0) { + if (recyclerAdapter?.size() == 0) { setEmptyView(binding.emptyView, R.drawable.ic_panda_space, R.string.noAssignments, R.string.noAssignmentsSubtext) } } @@ -140,14 +140,16 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { binding.sortByTextView.setText(sortOrder.buttonTextRes) binding.sortByButton.contentDescription = getString(sortOrder.contentDescriptionRes) - configureRecyclerView( + recyclerAdapter?.let { + configureRecyclerView( view, requireContext(), - recyclerAdapter, + it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView - ) + ) + } binding.appbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, i -> // Workaround for Toolbar not showing with swipe to refresh @@ -230,7 +232,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { dialog.dismiss() filterPosition = index filter = AssignmentListFilter.values()[index] - recyclerAdapter.filter = filter + recyclerAdapter?.filter = filter updateBadge() } @@ -262,7 +264,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { } else { emptyView.emptyViewText(getString(R.string.noItemsMatchingQuery, query)) } - recyclerAdapter.searchQuery = query + recyclerAdapter?.searchQuery = query } ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext) } @@ -290,22 +292,22 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { termSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) { if (adapter.getItem(i)!!.title == getString(R.string.assignmentsListAllGradingPeriods)) { - recyclerAdapter.loadAssignment() + recyclerAdapter?.loadAssignment() } else { - recyclerAdapter.loadAssignmentsForGradingPeriod(adapter.getItem(i)!!.id, true) + recyclerAdapter?.loadAssignmentsForGradingPeriod(adapter.getItem(i)!!.id, true) termSpinner.isEnabled = false adapter.isLoading = true adapter.notifyDataSetChanged() } - recyclerAdapter.currentGradingPeriod = adapter.getItem(i) + recyclerAdapter?.currentGradingPeriod = adapter.getItem(i) } override fun onNothingSelected(adapterView: AdapterView<*>) {} } // If we have a "current" grading period select it - if (hasGradingPeriods && recyclerAdapter.currentGradingPeriod != null) { - val position = adapter.getPositionForId(recyclerAdapter.currentGradingPeriod?.id ?: 0) + if (hasGradingPeriods && recyclerAdapter?.currentGradingPeriod != null) { + val position = adapter.getPositionForId(recyclerAdapter?.currentGradingPeriod?.id ?: 0) if (position != -1) { termSpinner.setSelection(position) } else { @@ -318,16 +320,17 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { override fun onConfigurationChanged(newConfig: Configuration) = with(binding) { super.onConfigurationChanged(newConfig) - configureRecyclerView( + recyclerAdapter?.let { + configureRecyclerView( requireView(), requireContext(), - recyclerAdapter, + it, R.id.swipeRefreshLayout, R.id.emptyView, - R.id.listView, - R.string.noAssignments - ) - if (recyclerAdapter.size() == 0) { + R.id.listView + ) + } + if (recyclerAdapter?.size() == 0) { emptyView.changeTextSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { @@ -348,7 +351,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { override fun onDestroy() { super.onDestroy() - recyclerAdapter.cancel() + recyclerAdapter?.cancel() } companion object { diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/AlarmScheduler.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/AlarmScheduler.kt new file mode 100644 index 0000000000..1243b77cc5 --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/AlarmScheduler.kt @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.instructure.student.features.assignments.reminder + +import android.app.AlarmManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.os.Build +import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.pandautils.room.appdatabase.daos.ReminderDao +import com.instructure.student.receivers.AlarmReceiver + +class AlarmScheduler(private val context: Context, private val reminderDao: ReminderDao, private val apiPrefs: ApiPrefs) { + + private val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager + + fun scheduleAlarm(assignmentId: Long, assignmentPath: String, assignmentName: String, dueIn: String, timeInMillis: Long, reminderId: Long) { + val intent = Intent(context, AlarmReceiver::class.java) + intent.putExtra(AlarmReceiver.ASSIGNMENT_ID, assignmentId) + intent.putExtra(AlarmReceiver.ASSIGNMENT_PATH, assignmentPath) + intent.putExtra(AlarmReceiver.ASSIGNMENT_NAME, assignmentName) + intent.putExtra(AlarmReceiver.DUE_IN, dueIn) + + val pendingIntent = PendingIntent.getBroadcast( + context, + reminderId.toInt(), + intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !alarmManager.canScheduleExactAlarms()) return + + alarmManager.setExact(AlarmManager.RTC_WAKEUP, timeInMillis, pendingIntent) + } + + suspend fun scheduleAllAlarmsForCurrentUser() { + val reminders = reminderDao.findByUserId(apiPrefs.user?.id ?: return) + reminders.forEach { + scheduleAlarm(it.assignmentId, it.htmlUrl, it.name, it.text, it.time, it.id) + } + } + + fun cancelAlarm(reminderId: Long) { + val intent = Intent(context, AlarmReceiver::class.java) + + val pendingIntent = PendingIntent.getBroadcast( + context, + reminderId.toInt(), + intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + + alarmManager.cancel(pendingIntent) + } + + suspend fun cancelAllAlarmsForCurrentUser() { + val reminders = reminderDao.findByUserId(apiPrefs.user?.id ?: return) + reminders.forEach { + cancelAlarm(it.id) + } + } +} diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/CustomReminderDialog.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/CustomReminderDialog.kt new file mode 100644 index 0000000000..311829ba1f --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/features/assignments/reminder/CustomReminderDialog.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.instructure.student.features.assignments.reminder + +import android.app.Dialog +import android.content.res.ColorStateList +import android.os.Bundle +import android.widget.Button +import androidx.appcompat.app.AlertDialog +import androidx.core.widget.doAfterTextChanged +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.viewModels +import com.instructure.pandautils.utils.ThemePrefs +import com.instructure.student.R +import com.instructure.student.databinding.DialogCustomReminderBinding +import com.instructure.student.features.assignments.details.AssignmentDetailsViewModel +import com.instructure.student.features.assignments.details.ReminderChoice +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class CustomReminderDialog : DialogFragment() { + + private lateinit var binding: DialogCustomReminderBinding + private val parentViewModel: AssignmentDetailsViewModel by viewModels(ownerProducer = { + requireParentFragment() + }) + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + binding = DialogCustomReminderBinding.inflate(layoutInflater, null, false) + + return AlertDialog.Builder(requireContext()) + .setView(binding.root) + .setTitle(R.string.customReminderTitle) + .setPositiveButton(R.string.done) { _, _ -> + val quantity = binding.quantity.text.toString().toIntOrNull() ?: return@setPositiveButton + when (binding.choices.checkedRadioButtonId) { + R.id.minutes -> parentViewModel.onReminderSelected(ReminderChoice.Minute(quantity)) + R.id.hours -> parentViewModel.onReminderSelected(ReminderChoice.Hour(quantity)) + R.id.days -> parentViewModel.onReminderSelected(ReminderChoice.Day(quantity)) + R.id.weeks -> parentViewModel.onReminderSelected(ReminderChoice.Week(quantity)) + } + } + .setNegativeButton(R.string.cancel, null) + .create().apply { + setOnShowListener { + getButton(AlertDialog.BUTTON_NEGATIVE)?.setTextColor(ThemePrefs.textButtonColor) + setupPositiveButton(getButton(AlertDialog.BUTTON_POSITIVE)) + } + } + } + + private fun setupPositiveButton(button: Button) { + button.isEnabled = false + button.setTextColor( + ColorStateList( + arrayOf(intArrayOf(-android.R.attr.state_enabled), intArrayOf()), + intArrayOf(requireContext().getColor(R.color.textDark), ThemePrefs.textButtonColor) + ) + ) + binding.choices.setOnCheckedChangeListener { _, _ -> updateButtonState(button) } + binding.quantity.doAfterTextChanged { updateButtonState(button) } + } + + private fun updateButtonState(button: Button) { + button.isEnabled = binding.choices.checkedRadioButtonId != -1 && binding.quantity.text.isNotEmpty() + } + + companion object { + fun newInstance() = CustomReminderDialog() + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt b/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt index 68c048d916..79ca2d53e8 100644 --- a/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt @@ -213,14 +213,20 @@ class CourseBrowserFragment : Fragment(), FragmentInteractions, AppBarLayout.OnO // Load Pages List if (tabs.any { it.tabId == Tab.PAGES_ID }) { // Do not load the pages list if the tab is hidden or locked. - RouteMatcher.route(requireActivity(), TabHelper.getRouteByTabId(tab, canvasContext)) + val route = TabHelper.getRouteByTabId(tab, canvasContext) + route?.arguments = route?.arguments?.apply { + putString(PageDetailsFragment.PAGE_NAME, homePageTitle) + } ?: Bundle() + RouteMatcher.route(requireActivity(), route) } // If the home tab is a Page and we clicked it lets route directly there. - RouteMatcher.route( - requireActivity(), - PageDetailsFragment.makeRoute(canvasContext, Page.FRONT_PAGE_NAME) - .apply { ignoreDebounce = true }) + val route = PageDetailsFragment.makeFrontPageRoute(canvasContext) + .apply { ignoreDebounce = true } + route.arguments = route.arguments.apply { + putString(PageDetailsFragment.PAGE_NAME, homePageTitle) + } + RouteMatcher.route(requireActivity(), route) } else { val route = TabHelper.getRouteByTabId(tab, canvasContext)?.apply { ignoreDebounce = true } RouteMatcher.route(requireActivity(), route) diff --git a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardLocalDataSource.kt b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardLocalDataSource.kt index d6f4fd1f7d..ff40b2e37b 100644 --- a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardLocalDataSource.kt +++ b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardLocalDataSource.kt @@ -16,8 +16,10 @@ */ package com.instructure.student.features.dashboard +import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.DashboardCard +import com.instructure.canvasapi2.models.DashboardPositions import com.instructure.canvasapi2.models.Group import com.instructure.pandautils.room.offline.daos.DashboardCardDao import com.instructure.pandautils.room.offline.entities.DashboardCardEntity @@ -43,4 +45,28 @@ class DashboardLocalDataSource( suspend fun saveDashboardCards(dashboardCards: List) { dashboardCardDao.updateEntities(dashboardCards.map { DashboardCardEntity(it) }) } + + suspend fun updateDashboardCardsOrder(dashboardPositions: DashboardPositions) { + val cards = dashboardCardDao.findAll() + val coursesWithPosition = dashboardPositions.positions + .map { Pair(CanvasContext.fromContextCode(it.key), it.value) } + .filter { it.first is Course } + .associate { Pair((it.first as Course).id, it.second) } + + // If somehow we end up with different items in the positions response than the stored dashboard cards we should return and not update the positions + val cardIds = cards.map { it.id }.toSet() + val positionUpdateIds = coursesWithPosition.keys + if (cardIds != positionUpdateIds) return + + val newCards = cards.map { + val newPosition = coursesWithPosition[it.id] + if (newPosition != null) { + it.copy(position = newPosition) + } else { + it + } + } + + dashboardCardDao.updateEntities(newCards) + } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardNetworkDataSource.kt b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardNetworkDataSource.kt index b60a138f73..d12d9f323e 100644 --- a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardNetworkDataSource.kt +++ b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardNetworkDataSource.kt @@ -18,17 +18,21 @@ package com.instructure.student.features.dashboard import com.instructure.canvasapi2.apis.CourseAPI import com.instructure.canvasapi2.apis.GroupAPI +import com.instructure.canvasapi2.apis.UserAPI import com.instructure.canvasapi2.builders.RestParams import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.DashboardCard +import com.instructure.canvasapi2.models.DashboardPositions import com.instructure.canvasapi2.models.Group import com.instructure.canvasapi2.utils.ApiPrefs +import com.instructure.canvasapi2.utils.DataResult import com.instructure.canvasapi2.utils.depaginate class DashboardNetworkDataSource( private val courseApi: CourseAPI.CoursesInterface, private val groupApi: GroupAPI.GroupInterface, - private val apiPrefs: ApiPrefs + private val apiPrefs: ApiPrefs, + private val userApi: UserAPI.UsersInterface ): DashboardDataSource { override suspend fun getCourses(forceNetwork: Boolean): List { @@ -53,4 +57,8 @@ class DashboardNetworkDataSource( override suspend fun getDashboardCards(forceNetwork: Boolean): List { return courseApi.getDashboardCourses(RestParams(isForceReadFromNetwork = forceNetwork)).dataOrNull.orEmpty() } + + suspend fun updateDashboardPositions(dashboardPositions: DashboardPositions): DataResult { + return userApi.updateDashboardPositions(dashboardPositions, RestParams(isForceReadFromNetwork = true)) + } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardRepository.kt b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardRepository.kt index 4d85ff6b22..29b546eb83 100644 --- a/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardRepository.kt +++ b/apps/student/src/main/java/com/instructure/student/features/dashboard/DashboardRepository.kt @@ -16,11 +16,11 @@ */ package com.instructure.student.features.dashboard -import com.instructure.canvasapi2.apis.CourseAPI -import com.instructure.canvasapi2.builders.RestParams import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.DashboardCard +import com.instructure.canvasapi2.models.DashboardPositions import com.instructure.canvasapi2.models.Group +import com.instructure.canvasapi2.utils.DataResult import com.instructure.pandautils.repository.Repository import com.instructure.pandautils.room.offline.daos.CourseDao import com.instructure.pandautils.room.offline.daos.CourseSyncSettingsDao @@ -29,7 +29,7 @@ import com.instructure.pandautils.utils.NetworkStateProvider class DashboardRepository( private val localDataSource: DashboardLocalDataSource, - networkDataSource: DashboardNetworkDataSource, + private val networkDataSource: DashboardNetworkDataSource, networkStateProvider: NetworkStateProvider, featureFlagProvider: FeatureFlagProvider, private val courseSyncSettingsDao: CourseSyncSettingsDao, @@ -45,11 +45,14 @@ class DashboardRepository( } suspend fun getDashboardCourses(forceNetwork: Boolean): List { - val dashboardCards = dataSource().getDashboardCards(forceNetwork).sortedBy { it.position } + var dashboardCards = dataSource().getDashboardCards(forceNetwork) + if (dashboardCards.all { it.position == Int.MAX_VALUE }) { + dashboardCards = dashboardCards.mapIndexed { index, dashboardCard -> dashboardCard.copy(position = index) } + } if (isOnline() && isOfflineEnabled()) { localDataSource.saveDashboardCards(dashboardCards) } - return dashboardCards + return dashboardCards.sortedBy { it.position } } suspend fun getSyncedCourseIds(): Set { @@ -64,4 +67,12 @@ class DashboardRepository( val syncedCourses = courseDao.findByIds(syncedCourseIds) return syncedCourses.map { it.id }.toSet() } + + suspend fun updateDashboardPositions(dashboardPositions: DashboardPositions): DataResult { + val result = networkDataSource.updateDashboardPositions(dashboardPositions) + if (result is DataResult.Success) { + localDataSource.updateDashboardCardsOrder(dashboardPositions) + } + return networkDataSource.updateDashboardPositions(dashboardPositions) + } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt index e76d4dbabe..bcc9257472 100644 --- a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt @@ -194,33 +194,29 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable { //region Discussion Actions private fun viewAttachments(remoteFiles: List) { - if (repository.isOnline()) { - // Only one file can be attached to a discussion - val remoteFile = remoteFiles.firstOrNull() ?: return - - // Show lock message if file is locked - if (remoteFile.lockedForUser) { - if (remoteFile.lockExplanation.isValid()) { - Snackbar.make( - requireView(), - remoteFile.lockExplanation!!, - Snackbar.LENGTH_SHORT - ).show() - } else { - Snackbar.make( - requireView(), - R.string.fileCurrentlyLocked, - Snackbar.LENGTH_SHORT - ).show() - } + // Only one file can be attached to a discussion + val remoteFile = remoteFiles.firstOrNull() ?: return + + // Show lock message if file is locked + if (remoteFile.lockedForUser) { + if (remoteFile.lockExplanation.isValid()) { + Snackbar.make( + requireView(), + remoteFile.lockExplanation!!, + Snackbar.LENGTH_SHORT + ).show() + } else { + Snackbar.make( + requireView(), + R.string.fileCurrentlyLocked, + Snackbar.LENGTH_SHORT + ).show() } - - // Show attachment - val attachment = remoteFile.mapToAttachment() - openMedia(attachment.contentType, attachment.url, attachment.filename, canvasContext) - } else { - NoInternetConnectionDialog.show(requireFragmentManager()) } + + // Show attachment + val attachment = remoteFile.mapToAttachment() + openMedia(attachment.contentType, attachment.url, attachment.filename, canvasContext, localFile = attachment.isLocalFile) } private fun showReplyView(discussionEntryId: Long) { @@ -612,7 +608,8 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable { canvasContext, discussionTopicHeader, discussionTopic!!.views, - discussionEntryId + discussionEntryId, + repository.isOnline() ) loadDiscussionTopicViews(html) diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt index b98cb662c6..62ffa37c47 100644 --- a/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt @@ -35,7 +35,7 @@ import com.instructure.student.holders.NoViewholder import com.instructure.student.interfaces.AdapterToFragmentCallback import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import java.util.Date +import java.util.* open class DiscussionListRecyclerAdapter( context: Context, @@ -125,7 +125,7 @@ open class DiscussionListRecyclerAdapter( } callback.onRefreshFinished() onCallbackFinished(ApiType.API) - adapterToRecyclerViewCallback.setIsEmpty(size() == 0) + adapterToRecyclerViewCallback?.setIsEmpty(size() == 0) } private fun getHeaderType(discussionTopicHeader: DiscussionTopicHeader): String { diff --git a/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt index 4c4bfbbfe4..2a36489673 100644 --- a/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt @@ -96,6 +96,11 @@ class FileDetailsFragment : ParentFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater.inflate(R.layout.fragment_file_details, container, false) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.downloadButton.setVisible(repository.isOnline()) + } + override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) getFileFolder() @@ -131,8 +136,6 @@ class FileDetailsFragment : ParentFragment() { requestPermissions(PermissionUtils.makeArray(PermissionUtils.WRITE_EXTERNAL_STORAGE), PermissionUtils.WRITE_FILE_PERMISSION_REQUEST_CODE) } } - - binding.downloadButton.setVisible(repository.isOnline()) } override fun onMediaLoadingStarted() { diff --git a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt index 553bb47c90..9aa6614bed 100644 --- a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt @@ -318,7 +318,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent val isUserFiles = canvasContext.type == CanvasContext.Type.USER if (recyclerAdapter == null) { - recyclerAdapter = FileListRecyclerAdapter(requireContext(), canvasContext, getFileMenuOptions(folder, canvasContext, fileListRepository.isOnline()), folder, adapterCallback, fileListRepository) + recyclerAdapter = FileListRecyclerAdapter(requireContext(), canvasContext, getFileMenuOptions(folder, canvasContext, fileListRepository.isOnline(), folder), folder, adapterCallback, fileListRepository) } configureRecyclerView(requireView(), requireContext(), recyclerAdapter!!, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) @@ -362,7 +362,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent val popup = PopupMenu(requireContext(), anchorView) popup.inflate(R.menu.file_folder_options) with(popup.menu) { - val options = getFileMenuOptions(item, canvasContext, fileListRepository.isOnline()) + val options = getFileMenuOptions(item, canvasContext, fileListRepository.isOnline(), folder) // Only show alternate-open option for PDF files findItem(R.id.openAlternate).isVisible = options.contains(FileMenuType.OPEN_IN_ALTERNATE) findItem(R.id.download).isVisible = options.contains(FileMenuType.DOWNLOAD) @@ -609,7 +609,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent /** * @return A list of possible actions the user is able to perform on the file/folder */ - fun getFileMenuOptions(fileFolder: FileFolder?, canvasContext: CanvasContext, isOnline: Boolean): List { + fun getFileMenuOptions(fileFolder: FileFolder?, canvasContext: CanvasContext, isOnline: Boolean, folder: FileFolder?): List { if (fileFolder == null) return emptyList() val options: MutableList = mutableListOf() @@ -617,7 +617,8 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent // We're in the user's files, they should have options in the options menu if (!fileFolder.isLockedForUser) { // File is not locked for this user - if (!fileFolder.forSubmissions) { + val forSubmission = if (!fileFolder.isFile) fileFolder.forSubmissions else folder?.forSubmissions ?: false + if (!forSubmission) { // File/folder is not for a submission, so we can rename/delete with(options) { add(FileMenuType.RENAME) diff --git a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListRecyclerAdapter.kt index 35f5dae3fd..29e867d69d 100644 --- a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListRecyclerAdapter.kt @@ -68,7 +68,7 @@ open class FileListRecyclerAdapter( } override fun bindHolder(item: FileFolder, holder: FileViewHolder, position: Int) { - holder.bind(item, contextColor, context, FileListFragment.getFileMenuOptions(item, canvasContext, fileListRepository.isOnline()), fileFolderCallback) + holder.bind(item, contextColor, context, FileListFragment.getFileMenuOptions(item, canvasContext, fileListRepository.isOnline(), folder), fileFolderCallback) } override fun createViewHolder(v: View, viewType: Int) = FileViewHolder(v) diff --git a/apps/student/src/main/java/com/instructure/student/features/grades/GradesListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/grades/GradesListFragment.kt index d5b10ebda6..eb8dfb874d 100644 --- a/apps/student/src/main/java/com/instructure/student/features/grades/GradesListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/grades/GradesListFragment.kt @@ -74,7 +74,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { private var gradingScheme = emptyList() private lateinit var allTermsGradingPeriod: GradingPeriod - private lateinit var recyclerAdapter: GradesListRecyclerAdapter + private var recyclerAdapter: GradesListRecyclerAdapter? = null private val course: Course get() = canvasContext as Course @@ -106,9 +106,9 @@ class GradesListFragment : ParentFragment(), Bookmarkable { //check to see if grade is empty for reset if (whatIf == null) { assignment.submission = null - recyclerAdapter.assignmentsHash[assignment.id]?.submission = null + recyclerAdapter?.assignmentsHash?.get(assignment.id)?.submission = null } else { - recyclerAdapter.assignmentsHash[assignment.id]?.submission = Submission( + recyclerAdapter?.assignmentsHash?.get(assignment.id)?.submission = Submission( score = whatIf, grade = whatIf.toString() ) @@ -122,14 +122,17 @@ class GradesListFragment : ParentFragment(), Bookmarkable { ) view.let { configureViews(it) - configureRecyclerView(it, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.gradesEmptyView, R.id.listView) + recyclerAdapter?.let {recyclerAdapter -> + configureRecyclerView(it, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.gradesEmptyView, R.id.listView) + } + } } override fun onDestroyView() { super.onDestroyView() computeGradesJob?.cancel() - recyclerAdapter.cancel() + recyclerAdapter?.cancel() } override fun applyTheme() { @@ -143,7 +146,10 @@ class GradesListFragment : ParentFragment(), Bookmarkable { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - view?.let { configureRecyclerView(it, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.gradesEmptyView, R.id.listView) } + view?.let { + recyclerAdapter?.let { recyclerAdapter -> + configureRecyclerView(it, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.gradesEmptyView, R.id.listView) } + } } private fun configureViews(rootView: View) { @@ -169,7 +175,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { computeGrades(showTotalCheckBox.isChecked, -1) } else { val gradeString = getGradeString( - recyclerAdapter.courseGrade, + recyclerAdapter?.courseGrade, !isChecked ) txtOverallGrade.text = gradeString @@ -182,24 +188,26 @@ class GradesListFragment : ParentFragment(), Bookmarkable { whatIfView.setOnClickListener { showWhatIfCheckBox.toggle() } showWhatIfCheckBox.setOnCheckedChangeListener { _, _ -> - val currentScoreVal = recyclerAdapter.courseGrade?.currentScore ?: 0.0 + val currentScoreVal = recyclerAdapter?.courseGrade?.currentScore ?: 0.0 val currentScore = NumberHelper.doubleToPercentage(currentScoreVal) if (!showWhatIfCheckBox.isChecked) { txtOverallGrade.text = currentScore - } else if (recyclerAdapter.whatIfGrade != null) { - txtOverallGrade.text = NumberHelper.doubleToPercentage(recyclerAdapter.whatIfGrade) + } else if (recyclerAdapter?.whatIfGrade != null) { + recyclerAdapter?.let { + txtOverallGrade.text = NumberHelper.doubleToPercentage(it.whatIfGrade) + } } // If the user is turning off what if grades we need to do a full refresh, should be // cached data, so fast. if (!showWhatIfCheckBox.isChecked) { - recyclerAdapter.whatIfGrade = null - recyclerAdapter.loadCachedData() + recyclerAdapter?.whatIfGrade = null + recyclerAdapter?.loadCachedData() } else { // Only log when what if grades is checked on Analytics.logEvent(AnalyticsEventConstants.WHAT_IF_GRADES) - recyclerAdapter.notifyDataSetChanged() + recyclerAdapter?.notifyDataSetChanged() } } } @@ -270,12 +278,12 @@ class GradesListFragment : ParentFragment(), Bookmarkable { override fun onNothingSelected(parent: AdapterView<*>?) {} override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { // The current item must always be set first - recyclerAdapter.currentGradingPeriod = termAdapter?.getItem(position) + recyclerAdapter?.currentGradingPeriod = termAdapter?.getItem(position) if (termAdapter?.getItem(position)?.title == getString(R.string.allGradingPeriods)) { - recyclerAdapter.loadData() + recyclerAdapter?.loadData() } else { if (termAdapter?.isEmpty == false) { - recyclerAdapter.loadAssignmentsForGradingPeriod( + recyclerAdapter?.loadAssignmentsForGradingPeriod( gradingPeriodID = termAdapter?.getItem(position)?.id.orDefault(), refreshFirst = true, forceNetwork = true @@ -290,8 +298,10 @@ class GradesListFragment : ParentFragment(), Bookmarkable { } // If we have a "current" grading period select it - if (recyclerAdapter.currentGradingPeriod != null) { - val position = termAdapter?.getPositionForId(recyclerAdapter.currentGradingPeriod?.id ?: -1) ?: -1 + if (recyclerAdapter?.currentGradingPeriod != null) { + val position = recyclerAdapter?.let { + termAdapter?.getPositionForId(it.currentGradingPeriod?.id ?: -1) ?: -1 + } ?: -1 if (position != -1) { termSpinner.setSelection(position) } else { @@ -335,7 +345,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { } private fun lockGrade(isLocked: Boolean) { - if (isLocked || recyclerAdapter.isAllGradingPeriodsSelected && !course.isTotalsForAllGradingPeriodsEnabled) { + if (isLocked || recyclerAdapter?.isAllGradingPeriodsSelected == true && !course.isTotalsForAllGradingPeriodsEnabled) { binding.txtOverallGrade.setInvisible() binding.lockedGradeImage.setVisible() binding.gradeToggleView.setGone() @@ -351,25 +361,27 @@ class GradesListFragment : ParentFragment(), Bookmarkable { private fun computeGrades(isShowTotalGrade: Boolean, lastPositionChanged: Int) { computeGradesJob = weave { val result = inBackground { - if (!isShowTotalGrade) { - if (course.isApplyAssignmentGroupWeights) { - calcGradesTotal(recyclerAdapter.assignmentGroups) - } else { - calcGradesTotalNoWeight(recyclerAdapter.assignmentGroups) - } - } else { //Calculates grade based on only graded assignments - if (course.isApplyAssignmentGroupWeights) { - calcGradesGraded(recyclerAdapter.assignmentGroups) - } else { - calcGradesGradedNoWeight(recyclerAdapter.assignmentGroups) + recyclerAdapter?.let { recyclerAdapter -> + if (!isShowTotalGrade) { + if (course.isApplyAssignmentGroupWeights) { + calcGradesTotal(recyclerAdapter.assignmentGroups) + } else { + calcGradesTotalNoWeight(recyclerAdapter.assignmentGroups) + } + } else { //Calculates grade based on only graded assignments + if (course.isApplyAssignmentGroupWeights) { + calcGradesGraded(recyclerAdapter.assignmentGroups) + } else { + calcGradesGradedNoWeight(recyclerAdapter.assignmentGroups) + } } } } - recyclerAdapter.whatIfGrade = result + recyclerAdapter?.whatIfGrade = result binding.txtOverallGrade.text = NumberHelper.doubleToPercentage(result) - if(lastPositionChanged >= 0) recyclerAdapter.notifyItemChanged(lastPositionChanged) + if(lastPositionChanged >= 0) recyclerAdapter?.notifyItemChanged(lastPositionChanged) } } @@ -392,7 +404,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { var totalPoints = 0.0 val weight = g.groupWeight for (a in g.assignments) { - val tempAssignment = recyclerAdapter.assignmentsHash[a.id].takeIf { !it?.omitFromFinalGrade.orDefault() } + val tempAssignment = recyclerAdapter?.assignmentsHash?.get(a.id).takeIf { !it?.omitFromFinalGrade.orDefault() } val tempSub = tempAssignment?.submission if (tempSub?.grade != null && tempAssignment.submissionTypesRaw.isNotEmpty()) { earnedPoints += tempSub.score @@ -427,7 +439,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { val weight = g.groupWeight var assignCount = 0 for (a in g.assignments) { - val tempAssignment = recyclerAdapter.assignmentsHash[a.id].takeIf { !it?.omitFromFinalGrade.orDefault() } + val tempAssignment = recyclerAdapter?.assignmentsHash?.get(a.id).takeIf { !it?.omitFromFinalGrade.orDefault() } val tempSub = tempAssignment?.submission if (tempSub?.grade != null && tempAssignment.submissionTypesRaw.isNotEmpty() && Const.PENDING_REVIEW != tempSub.workflowState) { assignCount++ // Determines if a group contains assignments @@ -476,7 +488,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { var totalPoints = 0.0 for (g in groups) { for (a in g.assignments) { - val tempAssignment = recyclerAdapter.assignmentsHash[a.id].takeIf { !it?.omitFromFinalGrade.orDefault() } + val tempAssignment = recyclerAdapter?.assignmentsHash?.get(a.id).takeIf { !it?.omitFromFinalGrade.orDefault() } val tempSub = tempAssignment?.submission if (tempSub?.grade != null && tempAssignment.submissionTypesRaw.isNotEmpty() && Const.PENDING_REVIEW != tempSub.workflowState) { earnedPoints += tempSub.score @@ -510,7 +522,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { var earnedPoints = 0.0 for (g in groups) { for (a in g.assignments) { - val tempAssignment = recyclerAdapter.assignmentsHash[a.id].takeIf { !it?.omitFromFinalGrade.orDefault() } + val tempAssignment = recyclerAdapter?.assignmentsHash?.get(a.id).takeIf { !it?.omitFromFinalGrade.orDefault() } val tempSub = tempAssignment?.submission if (tempSub?.grade != null && tempAssignment.submissionTypesRaw.isNotEmpty()) { totalPoints += tempAssignment.pointsPossible diff --git a/apps/student/src/main/java/com/instructure/student/features/grades/GradesListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/grades/GradesListRecyclerAdapter.kt index bc534a568d..a0cd507ec8 100644 --- a/apps/student/src/main/java/com/instructure/student/features/grades/GradesListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/grades/GradesListRecyclerAdapter.kt @@ -21,11 +21,6 @@ import android.content.Context import android.view.View import android.widget.Toast import androidx.recyclerview.widget.RecyclerView -import com.instructure.canvasapi2.StatusCallback -import com.instructure.canvasapi2.managers.AssignmentManager -import com.instructure.canvasapi2.managers.CourseManager -import com.instructure.canvasapi2.managers.EnrollmentManager -import com.instructure.canvasapi2.managers.SubmissionManager import com.instructure.canvasapi2.models.Assignment import com.instructure.canvasapi2.models.AssignmentGroup import com.instructure.canvasapi2.models.CanvasContext @@ -33,9 +28,7 @@ import com.instructure.canvasapi2.models.Course import com.instructure.canvasapi2.models.CourseGrade import com.instructure.canvasapi2.models.Enrollment import com.instructure.canvasapi2.models.GradingPeriod -import com.instructure.canvasapi2.models.GradingPeriodResponse import com.instructure.canvasapi2.models.GradingSchemeRow -import com.instructure.canvasapi2.models.Submission import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.canvasapi2.utils.isNullOrEmpty import com.instructure.pandarecycler.util.GroupSortedList @@ -117,7 +110,7 @@ open class GradesListRecyclerAdapter( } fun loadCachedData() { - adapterToRecyclerViewCallback.refresh() + adapterToRecyclerViewCallback?.refresh() resetData() loadData(false) } diff --git a/apps/student/src/main/java/com/instructure/student/features/login/StudentAcceptableUsePolicyRouter.kt b/apps/student/src/main/java/com/instructure/student/features/login/StudentAcceptableUsePolicyRouter.kt index ef195aaa84..1884f27bfd 100644 --- a/apps/student/src/main/java/com/instructure/student/features/login/StudentAcceptableUsePolicyRouter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/login/StudentAcceptableUsePolicyRouter.kt @@ -27,11 +27,13 @@ import com.instructure.pandautils.services.PushNotificationRegistrationWorker import com.instructure.student.R import com.instructure.student.activity.InternalWebViewActivity import com.instructure.student.activity.NavigationActivity +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.tasks.StudentLogoutTask class StudentAcceptableUsePolicyRouter( private val activity: FragmentActivity, - private val databaseProvider: DatabaseProvider + private val databaseProvider: DatabaseProvider, + private val alarmScheduler: AlarmScheduler ) : AcceptableUsePolicyRouter { override fun openPolicy(content: String) { @@ -54,6 +56,6 @@ class StudentAcceptableUsePolicyRouter( } override fun logout() { - StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider).execute() + StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider, alarmScheduler = alarmScheduler).execute() } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/features/login/StudentLoginNavigation.kt b/apps/student/src/main/java/com/instructure/student/features/login/StudentLoginNavigation.kt index 8c562f1760..a11e91a18a 100644 --- a/apps/student/src/main/java/com/instructure/student/features/login/StudentLoginNavigation.kt +++ b/apps/student/src/main/java/com/instructure/student/features/login/StudentLoginNavigation.kt @@ -25,16 +25,18 @@ import com.instructure.loginapi.login.tasks.LogoutTask import com.instructure.pandautils.room.offline.DatabaseProvider import com.instructure.pandautils.services.PushNotificationRegistrationWorker import com.instructure.student.activity.NavigationActivity +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.tasks.StudentLogoutTask class StudentLoginNavigation( private val activity: FragmentActivity, - private val databaseProvider: DatabaseProvider + private val databaseProvider: DatabaseProvider, + private val alarmScheduler: AlarmScheduler ) : LoginNavigation(activity) { override val checkElementary: Boolean = true override fun logout() { - StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider).execute() + StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider, alarmScheduler = alarmScheduler).execute() } override fun initMainActivityIntent(): Intent { diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt index 134ea38aea..1d9e96862c 100644 --- a/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt @@ -64,7 +64,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { private lateinit var recyclerBinding: PandaRecyclerRefreshLayoutBinding private var canvasContext: CanvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT) - private lateinit var recyclerAdapter: ModuleListRecyclerAdapter + private var recyclerAdapter: ModuleListRecyclerAdapter? = null @Inject lateinit var repository: ModuleListRepository @@ -85,7 +85,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { } override fun onDestroy() { - recyclerAdapter.cancel() + recyclerAdapter?.cancel() super.onDestroy() } @@ -105,7 +105,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - if (recyclerAdapter.size() == 0) { + if (recyclerAdapter?.size() == 0) { recyclerBinding.emptyView.changeTextSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { @@ -160,9 +160,9 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { if (isLocked) return // Remove all the subheaders and stuff. - val groups = recyclerAdapter.groups + val groups = recyclerAdapter?.groups ?: arrayListOf() - val moduleItemsArray = groups.indices.mapTo(ArrayList()) { recyclerAdapter.getItems(groups[it]) } + val moduleItemsArray = groups.indices.mapTo(ArrayList()) { recyclerAdapter?.getItems(groups[it]) ?: arrayListOf() } val moduleHelper = ModuleProgressionUtility.prepareModulesForCourseProgression( requireContext(), moduleItem.id, groups, moduleItemsArray ) @@ -184,16 +184,16 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { // We need to force the empty view to be visible to use it for errors on refresh recyclerBinding.emptyView.setVisible() setEmptyView(recyclerBinding.emptyView, R.drawable.ic_panda_nomodules, R.string.modulesLocked, R.string.modulesLockedSubtext) - } else if (recyclerAdapter.size() == 0) { + } else if (recyclerAdapter?.size() == 0) { setEmptyView(recyclerBinding.emptyView, R.drawable.ic_panda_nomodules, R.string.noModules, R.string.noModulesSubtext) } else if (!arguments?.getString(MODULE_ID).isNullOrEmpty()) { // We need to delay scrolling until the expand animation has completed, otherwise modules // that appear near the end of the list will not have the extra 'expanded' space needed // to scroll as far as possible toward the top recyclerBinding.listView.postDelayed({ - val groupPosition = recyclerAdapter.getGroupItemPosition(arguments!!.getString( + val groupPosition = recyclerAdapter?.getGroupItemPosition(arguments!!.getString( MODULE_ID - )!!.toLong()) + )!!.toLong()) ?: -1 if (groupPosition >= 0) { val lm = recyclerBinding.listView.layoutManager as? LinearLayoutManager lm?.scrollToPositionWithOffset(groupPosition, 0) @@ -203,22 +203,24 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { } } }) - configureRecyclerView(requireView(), requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + recyclerAdapter?.let { + configureRecyclerView(requireView(), requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + } } fun notifyOfItemChanged(`object`: ModuleObject?, item: ModuleItem?) { if (item == null || `object` == null) return - recyclerAdapter.addOrUpdateItem(`object`, item) + recyclerAdapter?.addOrUpdateItem(`object`, item) } - fun refreshModuleList() = recyclerAdapter.updateMasteryPathItems() + fun refreshModuleList() = recyclerAdapter?.updateMasteryPathItems() /** * Update the list without clearing the data or collapsing headers. Used to update possibly updated * items (like a page that has now been viewed) */ - private fun updateList(moduleObject: ModuleObject) = recyclerAdapter.updateWithoutResettingViews(moduleObject) + private fun updateList(moduleObject: ModuleObject) = recyclerAdapter?.updateWithoutResettingViews(moduleObject) // region Bus Events @@ -227,7 +229,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { fun onModuleUpdated(event: ModuleUpdatedEvent) { event.once(javaClass.simpleName) { updateList(it) - recyclerAdapter.notifyDataSetChanged() + recyclerAdapter?.notifyDataSetChanged() } } // endregion diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt index 9bf146ebba..7338f5d9a9 100644 --- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt @@ -127,8 +127,8 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.prevItem.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_left, canvasContext.textAndIconColor) - binding.nextItem.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_right, canvasContext.textAndIconColor) + binding.prevItem.setImageDrawable(ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_left, canvasContext.textAndIconColor)) + binding.nextItem.setImageDrawable(ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_right, canvasContext.textAndIconColor)) } override fun onActivityCreated(savedInstanceState: Bundle?) { diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt index 4a3bfe25ac..fdea8d6c99 100644 --- a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt +++ b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt @@ -56,11 +56,7 @@ object ModuleUtility { syncedFileIds: List, context: Context ): Fragment? = when (item.type) { - "Page" -> { - createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context, setOf(Tab.PAGES_ID)) { - PageDetailsFragment.newInstance(PageDetailsFragment.makeRoute(course, item.title, item.pageUrl, navigatedFromModules)) - } - } + "Page" -> PageDetailsFragment.newInstance(PageDetailsFragment.makeRoute(course, item.title, item.pageUrl, navigatedFromModules)) "Assignment" -> { createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context, setOf(Tab.ASSIGNMENTS_ID, Tab.GRADES_ID, Tab.SYLLABUS_ID)) { AssignmentDetailsFragment.newInstance(makeRoute(course, getAssignmentId(item))) @@ -78,10 +74,8 @@ object ModuleUtility { "Locked" -> LockedModuleItemFragment.newInstance(LockedModuleItemFragment.makeRoute(course, item.title!!, item.moduleDetails?.lockExplanation ?: "")) "SubHeader" -> null // Don't do anything with headers, they're just dividers so we don't show them here. "Quiz" -> { - createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context, setOf(Tab.QUIZZES_ID)) { - val apiURL = removeDomain(item.url) - ModuleQuizDecider.newInstance(ModuleQuizDecider.makeRoute(course, item.htmlUrl!!, apiURL!!, item.contentId)) - } + val apiURL = removeDomain(item.url) + ModuleQuizDecider.newInstance(ModuleQuizDecider.makeRoute(course, item.htmlUrl!!, apiURL!!, item.contentId)) } "ChooseAssignmentGroup" -> { createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context) { diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt index ae55c2f3ef..fba5a92eac 100644 --- a/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt @@ -51,7 +51,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.Job import org.greenrobot.eventbus.Subscribe import java.util.* -import java.util.regex.Pattern +import java.util.regex.* import javax.inject.Inject @ScreenView(SCREEN_VIEW_PAGE_DETAILS) @@ -67,6 +67,7 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable { private var page: Page by ParcelableArg(default = Page(), key = PAGE) private var pageUrl: String? by NullableStringArg(key = PAGE_URL) private var navigatedFromModules: Boolean by BooleanArg(key = NAVIGATED_FROM_MODULES) + private var frontPage: Boolean by BooleanArg(key = FRONT_PAGE) // Flag for the webview client to know whether or not we should clear the history private var isUpdated = false @@ -152,11 +153,11 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable { } else { loadFailedPageInfo(null) } - } else if (pageName == null || pageName == Page.FRONT_PAGE_NAME) fetchFontPage() + } else if (frontPage) fetchFrontPage() else fetchPageDetails() } - private fun fetchFontPage() { + private fun fetchFrontPage() { lifecycleScope.tryLaunch { val result = repository.getFrontPage(canvasContext, true) result.onSuccess { @@ -331,6 +332,7 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable { const val PAGE = "pageDetails" const val PAGE_URL = "pageUrl" const val NAVIGATED_FROM_MODULES = "navigated_from_modules" + private const val FRONT_PAGE = "frontPage" fun newInstance(route: Route): PageDetailsFragment? { return if (validRoute(route)) PageDetailsFragment().apply { @@ -349,9 +351,9 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable { route.paramsHash.containsKey(RouterParams.PAGE_ID)) } - fun makeRoute(canvasContext: CanvasContext, pageName: String?): Route { + fun makeFrontPageRoute(canvasContext: CanvasContext): Route { return Route(null, PageDetailsFragment::class.java, canvasContext, canvasContext.makeBundle(Bundle().apply { - if (pageName != null) putString(PAGE_NAME, pageName) + putBoolean(FRONT_PAGE, true) })) } diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt index 811db00ae2..cb47a42ce2 100644 --- a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt @@ -62,7 +62,7 @@ class PageListFragment : ParentFragment(), Bookmarkable { private var canvasContext: CanvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT) - private lateinit var recyclerAdapter: PageListRecyclerAdapter + private var recyclerAdapter: PageListRecyclerAdapter? = null private var defaultSelectedPageTitle = PageListRecyclerAdapter.FRONT_PAGE_DETERMINER // blank string is used to determine front page private var isShowFrontPage by BooleanArg(key = SHOW_FRONT_PAGE) @@ -73,7 +73,7 @@ class PageListFragment : ParentFragment(), Bookmarkable { @Subscribe fun onUpdatePage(event: PageUpdatedEvent) { event.once(javaClass.simpleName) { - recyclerAdapter.refresh() + recyclerAdapter?.refresh() } } @@ -88,7 +88,7 @@ class PageListFragment : ParentFragment(), Bookmarkable { } override fun onDestroyView() { - recyclerAdapter.cancel() + recyclerAdapter?.cancel() super.onDestroyView() } @@ -120,16 +120,17 @@ class PageListFragment : ParentFragment(), Bookmarkable { } }, defaultSelectedPageTitle) - configureRecyclerView(rootView!!, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + recyclerAdapter?.let { + configureRecyclerView(rootView!!, requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + } } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) if (isShowFrontPage) { - val route = PageDetailsFragment.makeRoute( - canvasContext, - Page.FRONT_PAGE_NAME + val route = PageDetailsFragment.makeFrontPageRoute( + canvasContext ).apply { ignoreDebounce = true} RouteMatcher.route(requireActivity(), route) } @@ -137,7 +138,9 @@ class PageListFragment : ParentFragment(), Bookmarkable { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - configureRecyclerView(rootView!!, requireContext(), recyclerAdapter, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + recyclerAdapter?.let { + configureRecyclerView(rootView!!, requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView) + } recyclerBinding.emptyView.changeTextSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { @@ -172,7 +175,7 @@ class PageListFragment : ParentFragment(), Bookmarkable { } else { recyclerBinding.emptyView.emptyViewText(getString(R.string.noItemsMatchingQuery, query)) } - recyclerAdapter.searchQuery = query + recyclerAdapter?.searchQuery = query } ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext) } diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListRecyclerAdapter.kt index 12b3ce5d5d..a759e1c3e3 100644 --- a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListRecyclerAdapter.kt @@ -109,7 +109,7 @@ open class PageListRecyclerAdapter( onCallbackFinished() } catch { if (itemCount == 0 || !APIHelper.hasNetworkConnection()) { - adapterToRecyclerViewCallback.setIsEmpty(true) + adapterToRecyclerViewCallback?.setIsEmpty(true) } else { context.toast(R.string.errorOccurred) } diff --git a/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListRecyclerAdapter.kt index a74128b780..01cf25e3f6 100644 --- a/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListRecyclerAdapter.kt @@ -41,15 +41,24 @@ import kotlinx.coroutines.CoroutineScope import java.util.Locale class PeopleListRecyclerAdapter( - context: Context, - private val lifecycleScope: CoroutineScope, - private val repository: PeopleListRepository, - private val canvasContext: CanvasContext, - private val adapterToFragmentCallback: AdapterToFragmentCallback -) : ExpandableRecyclerAdapter(context, EnrollmentType::class.java, User::class.java) { + context: Context, + private val lifecycleScope: CoroutineScope, + private val repository: PeopleListRepository, + private val canvasContext: CanvasContext, + private val adapterToFragmentCallback: AdapterToFragmentCallback +) : ExpandableRecyclerAdapter( + context, + EnrollmentType::class.java, + User::class.java +) { private val mCourseColor = canvasContext.backgroundColor - private val mEnrollmentPriority = mapOf( EnrollmentType.Teacher to 4, EnrollmentType.Ta to 3, EnrollmentType.Student to 2, EnrollmentType.Observer to 1) + private val mEnrollmentPriority = mapOf( + EnrollmentType.Teacher to 4, + EnrollmentType.Ta to 3, + EnrollmentType.Student to 2, + EnrollmentType.Observer to 1 + ) init { isExpandedByDefault = true @@ -58,16 +67,18 @@ class PeopleListRecyclerAdapter( override fun loadFirstPage() { lifecycleScope.tryLaunch { - var canvasContext = canvasContext - - // If the canvasContext is a group, and has a course we want to add the Teachers and TAs from that course to the peoples list - if (CanvasContext.Type.isGroup(this@PeopleListRecyclerAdapter.canvasContext) && (this@PeopleListRecyclerAdapter.canvasContext as Group).courseId > 0) { - // We build a generic CanvasContext with type set to COURSE and give it the CourseId from the group, so that it wil use the course API not the group API - canvasContext = CanvasContext.getGenericContext(CanvasContext.Type.COURSE, this@PeopleListRecyclerAdapter.canvasContext.courseId, "") - } - - val teachers = repository.loadTeachers(canvasContext, isRefresh) - val tas = repository.loadTAs(canvasContext, isRefresh) + val teacherContext = + if (CanvasContext.Type.isGroup(this@PeopleListRecyclerAdapter.canvasContext) && (this@PeopleListRecyclerAdapter.canvasContext as Group).courseId > 0) { + // We build a generic CanvasContext with type set to COURSE and give it the CourseId from the group, so that it wil use the course API not the group API + CanvasContext.getGenericContext( + CanvasContext.Type.COURSE, + this@PeopleListRecyclerAdapter.canvasContext.courseId, + "" + ) + } else canvasContext + + val teachers = repository.loadTeachers(teacherContext, isRefresh) + val tas = repository.loadTAs(teacherContext, isRefresh) val peopleFirstPage = repository.loadFirstPagePeople(canvasContext, isRefresh) val result = teachers.dataOrThrow + tas.dataOrThrow + peopleFirstPage.dataOrThrow @@ -102,38 +113,59 @@ class PeopleListRecyclerAdapter( private fun populateAdapter(result: List) { val (enrolled, unEnrolled) = result.partition { it.enrollments.isNotEmpty() } enrolled - .groupBy { - it.enrollments.sortedByDescending { enrollment -> mEnrollmentPriority[enrollment.type] }[0].type - } - .forEach { (type, users) -> addOrUpdateAllItems(type!!, users) } + .groupBy { + it.enrollments.sortedByDescending { enrollment -> mEnrollmentPriority[enrollment.type] }[0].type + } + .forEach { (type, users) -> addOrUpdateAllItems(type!!, users) } if (CanvasContext.Type.isGroup(canvasContext)) addOrUpdateAllItems(EnrollmentType.NoEnrollment, unEnrolled) notifyDataSetChanged() adapterToFragmentCallback.onRefreshFinished() } override fun createViewHolder(v: View, viewType: Int): RecyclerView.ViewHolder = - if (viewType == Types.TYPE_HEADER) PeopleHeaderViewHolder(v) else PeopleViewHolder(v) + if (viewType == Types.TYPE_HEADER) PeopleHeaderViewHolder(v) else PeopleViewHolder(v) override fun itemLayoutResId(viewType: Int): Int = - if (viewType == Types.TYPE_HEADER) PeopleHeaderViewHolder.HOLDER_RES_ID else PeopleViewHolder.HOLDER_RES_ID + if (viewType == Types.TYPE_HEADER) PeopleHeaderViewHolder.HOLDER_RES_ID else PeopleViewHolder.HOLDER_RES_ID override fun contextReady() = Unit override fun onBindChildHolder(holder: RecyclerView.ViewHolder, peopleGroupType: EnrollmentType, user: User) { val groupItemCount = getGroupItemCount(peopleGroupType) val itemPosition = storedIndexOfItem(peopleGroupType, user) - (holder as PeopleViewHolder).bind(user, adapterToFragmentCallback, mCourseColor, itemPosition == 0, itemPosition == groupItemCount - 1) + (holder as PeopleViewHolder).bind( + user, + adapterToFragmentCallback, + mCourseColor, + itemPosition == 0, + itemPosition == groupItemCount - 1 + ) } - override fun onBindHeaderHolder(holder: RecyclerView.ViewHolder, enrollmentType: EnrollmentType, isExpanded: Boolean) { - (holder as PeopleHeaderViewHolder).bind(enrollmentType, getHeaderTitle(enrollmentType), isExpanded, viewHolderHeaderClicked) + override fun onBindHeaderHolder( + holder: RecyclerView.ViewHolder, + enrollmentType: EnrollmentType, + isExpanded: Boolean + ) { + (holder as PeopleHeaderViewHolder).bind( + enrollmentType, + getHeaderTitle(enrollmentType), + isExpanded, + viewHolderHeaderClicked + ) } override fun createGroupCallback(): GroupSortedList.GroupComparatorCallback { return object : GroupSortedList.GroupComparatorCallback { - override fun compare(o1: EnrollmentType, o2: EnrollmentType) = getHeaderTitle(o2).compareTo(getHeaderTitle(o1)) - override fun areContentsTheSame(oldGroup: EnrollmentType, newGroup: EnrollmentType) = getHeaderTitle(oldGroup) == getHeaderTitle(newGroup) - override fun areItemsTheSame(group1: EnrollmentType, group2: EnrollmentType) = getHeaderTitle(group1) == getHeaderTitle(group2) + override fun compare(o1: EnrollmentType, o2: EnrollmentType) = + getHeaderTitle(o2).compareTo(getHeaderTitle(o1)) + + override fun areContentsTheSame(oldGroup: EnrollmentType, newGroup: EnrollmentType) = + getHeaderTitle(oldGroup) == getHeaderTitle(newGroup) + + override fun areItemsTheSame(group1: EnrollmentType, group2: EnrollmentType) = + getHeaderTitle(group1) == getHeaderTitle(group2) + override fun getUniqueGroupId(group: EnrollmentType) = getHeaderTitle(group).hashCode().toLong() override fun getGroupType(group: EnrollmentType) = Types.TYPE_HEADER } @@ -141,7 +173,11 @@ class PeopleListRecyclerAdapter( override fun createItemCallback(): GroupSortedList.ItemComparatorCallback { return object : GroupSortedList.ItemComparatorCallback { - override fun compare(group: EnrollmentType, o1: User, o2: User) = NaturalOrderComparator.compare(o1.sortableName?.lowercase(Locale.getDefault()).orEmpty(), o2.sortableName?.lowercase(Locale.getDefault()).orEmpty()) + override fun compare(group: EnrollmentType, o1: User, o2: User) = NaturalOrderComparator.compare( + o1.sortableName?.lowercase(Locale.getDefault()).orEmpty(), + o2.sortableName?.lowercase(Locale.getDefault()).orEmpty() + ) + override fun areContentsTheSame(oldItem: User, newItem: User) = oldItem.sortableName == newItem.sortableName override fun areItemsTheSame(item1: User, item2: User) = item1.id == item2.id override fun getUniqueItemId(item: User) = item.id diff --git a/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListRecyclerAdapter.kt index c65219affd..24988615b6 100644 --- a/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListRecyclerAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListRecyclerAdapter.kt @@ -90,7 +90,7 @@ class QuizListRecyclerAdapter( } adapterToFragmentCallback?.onRefreshFinished() - if (size() == 0) adapterToRecyclerViewCallback.setIsEmpty(true) + if (size() == 0) adapterToRecyclerViewCallback?.setIsEmpty(true) notifyDataSetChanged() } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt index 594680ba04..3415885946 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt @@ -28,7 +28,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.instructure.canvasapi2.utils.* import com.instructure.canvasapi2.utils.pageview.PageView -import com.instructure.loginapi.login.dialog.NoInternetConnectionDialog import com.instructure.pandautils.analytics.SCREEN_VIEW_APPLICATION_SETTINGS import com.instructure.pandautils.analytics.ScreenView import com.instructure.pandautils.binding.viewBinding @@ -182,11 +181,8 @@ class ApplicationSettingsFragment : ParentFragment() { private fun setUpSyncSettings() { lifecycleScope.launch { - if (!featureFlagProvider.offlineEnabled()) { - binding.offlineContentDivider.setGone() - binding.offlineContentTitle.setGone() - binding.offlineSyncSettingsContainer.setGone() - } else { + val offlineEnabled = (activity as? SettingsActivity)?.offlineEnabled ?: false + if (offlineEnabled) { syncSettingsFacade.getSyncSettingsListenable().observe(viewLifecycleOwner) { syncSettings -> if (syncSettings == null) { binding.offlineSyncSettingsContainer.setGone() @@ -202,6 +198,10 @@ class ApplicationSettingsFragment : ParentFragment() { binding.offlineSyncSettingsContainer.onClick { addFragment(SyncSettingsFragment.newInstance()) } + } else { + binding.offlineContentDivider.setGone() + binding.offlineContentTitle.setGone() + binding.offlineSyncSettingsContainer.setGone() } } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt index 2bfd905eaf..9498e39d20 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt @@ -25,17 +25,23 @@ import android.content.res.Configuration import android.os.Bundle import android.view.LayoutInflater import android.view.MenuItem +import android.view.MotionEvent +import android.view.MotionEvent.ACTION_CANCEL import android.view.View import android.view.ViewGroup import androidx.lifecycle.lifecycleScope import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView +import androidx.work.WorkInfo.State +import androidx.work.WorkManager +import androidx.work.WorkQuery +import com.google.firebase.crashlytics.FirebaseCrashlytics import com.instructure.canvasapi2.managers.CourseNicknameManager import com.instructure.canvasapi2.managers.UserManager import com.instructure.canvasapi2.models.* -import com.instructure.canvasapi2.utils.APIHelper import com.instructure.canvasapi2.utils.pageview.PageView import com.instructure.canvasapi2.utils.weave.awaitApi import com.instructure.canvasapi2.utils.weave.catch @@ -44,9 +50,12 @@ import com.instructure.interactions.router.Route import com.instructure.pandautils.analytics.SCREEN_VIEW_DASHBOARD import com.instructure.pandautils.analytics.ScreenView import com.instructure.pandautils.binding.viewBinding +import com.instructure.pandautils.features.dashboard.DashboardCourseItem import com.instructure.pandautils.features.dashboard.edit.EditDashboardFragment import com.instructure.pandautils.features.dashboard.notifications.DashboardNotificationsFragment import com.instructure.pandautils.features.offline.offlinecontent.OfflineContentFragment +import com.instructure.pandautils.features.offline.sync.AggregateProgressObserver +import com.instructure.pandautils.features.offline.sync.OfflineSyncWorker import com.instructure.pandautils.utils.* import com.instructure.student.R import com.instructure.student.adapter.DashboardRecyclerAdapter @@ -54,13 +63,14 @@ import com.instructure.student.databinding.CourseGridRecyclerRefreshLayoutBindin import com.instructure.student.databinding.FragmentCourseGridBinding import com.instructure.student.decorations.VerticalGridSpacingDecoration import com.instructure.student.dialog.ColorPickerDialog -import com.instructure.student.dialog.EditCourseNicknameDialog +import com.instructure.pandautils.dialogs.EditCourseNicknameDialog import com.instructure.student.events.CoreDataFinishedLoading import com.instructure.student.events.CourseColorOverlayToggledEvent import com.instructure.student.events.ShowGradesToggledEvent import com.instructure.student.features.coursebrowser.CourseBrowserFragment import com.instructure.student.features.dashboard.DashboardRepository import com.instructure.student.flutterChannels.FlutterComm +import com.instructure.student.holders.CourseViewHolder import com.instructure.student.interfaces.CourseAdapterToFragmentCallback import com.instructure.student.router.RouteMatcher import com.instructure.student.util.StudentPrefs @@ -86,6 +96,15 @@ class DashboardFragment : ParentFragment() { @Inject lateinit var networkStateProvider: NetworkStateProvider + @Inject + lateinit var aggregateProgressObserver: AggregateProgressObserver + + @Inject + lateinit var workManager: WorkManager + + @Inject + lateinit var firebaseCrashlytics: FirebaseCrashlytics + private val binding by viewBinding(FragmentCourseGridBinding::bind) private lateinit var recyclerBinding: CourseGridRecyclerRefreshLayoutBinding @@ -96,6 +115,8 @@ class DashboardFragment : ParentFragment() { private var courseColumns: Int = LIST_SPAN_COUNT private var groupColumns: Int = LIST_SPAN_COUNT + private val runningWorkers = mutableSetOf() + private val somethingChangedReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent?) { if (recyclerAdapter != null && intent?.extras?.getBoolean(Const.COURSE_FAVORITES) == true) { @@ -120,6 +141,28 @@ class DashboardFragment : ParentFragment() { recyclerAdapter?.refresh() if (online) recyclerBinding.swipeRefreshLayout.isRefreshing = true } + + lifecycleScope.launch { + if (featureFlagProvider.offlineEnabled()) { + subscribeToOfflineSyncUpdates() + } + } + } + + private fun subscribeToOfflineSyncUpdates() { + val workQuery = WorkQuery.Builder.fromTags(listOf(OfflineSyncWorker.PERIODIC_TAG, OfflineSyncWorker.ONE_TIME_TAG)).build() + workManager.getWorkInfosLiveData(workQuery).observe(this) { workInfos -> + workInfos.forEach { workInfo -> + if (workInfo.state == State.RUNNING) { + runningWorkers.add(workInfo.id.toString()) + } + } + + if (workInfos?.any { (it.state == State.SUCCEEDED || it.state == State.FAILED) && runningWorkers.contains(it.id.toString()) } == true) { + recyclerAdapter?.silentRefresh() + runningWorkers.clear() + } + } } @@ -237,16 +280,13 @@ class DashboardFragment : ParentFragment() { } recyclerBinding.listView.fadeAnimationWithAction { - courseColumns = if (StudentPrefs.listDashboard) LIST_SPAN_COUNT else resources.getInteger(R.integer.course_card_columns) - groupColumns = if (StudentPrefs.listDashboard) LIST_SPAN_COUNT else resources.getInteger(R.integer.group_card_columns) - (recyclerBinding.listView.layoutManager as? GridLayoutManager)?.spanCount = courseColumns * groupColumns - view?.post { recyclerAdapter?.notifyDataSetChanged() } + configureGridSize() } } override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - configureRecyclerView() + configureGridSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { binding.emptyCoursesView.setGuidelines(.37f, .49f, .6f, .7f, .12f, .88f) @@ -263,6 +303,16 @@ class DashboardFragment : ParentFragment() { } } + private fun configureGridSize() { + courseColumns = + if (StudentPrefs.listDashboard) LIST_SPAN_COUNT else resources.getInteger(R.integer.course_card_columns) + groupColumns = + if (StudentPrefs.listDashboard) LIST_SPAN_COUNT else resources.getInteger(R.integer.group_card_columns) + (recyclerBinding.listView.layoutManager as? GridLayoutManager)?.spanCount = + courseColumns * groupColumns + view?.post { recyclerAdapter?.notifyDataSetChanged() } + } + private fun configureRecyclerView() = with(binding) { // Set up GridLayoutManager courseColumns = if (StudentPrefs.listDashboard) LIST_SPAN_COUNT else resources.getInteger(R.integer.course_card_columns) @@ -307,12 +357,103 @@ class DashboardFragment : ParentFragment() { recyclerBinding.listView.clipToPadding = false emptyCoursesView.onClickAddCourses { - if (!APIHelper.hasNetworkConnection()) { - toast(R.string.notAvailableOffline) - } else { - RouteMatcher.route(requireActivity(), EditDashboardFragment.makeRoute()) - } + RouteMatcher.route(requireActivity(), EditDashboardFragment.makeRoute()) } + + addItemTouchHelperForCardReorder() + } + + fun cancelCardDrag() { + recyclerBinding.listView.onTouchEvent(MotionEvent.obtain(0L, 0L, ACTION_CANCEL, 0f, 0f, 0)) + } + + private fun addItemTouchHelperForCardReorder() { + val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback( + ItemTouchHelper.START or ItemTouchHelper.END or ItemTouchHelper.DOWN or ItemTouchHelper.UP, + 0 + ) { + + private var itemToMove: DashboardCourseItem? = null + + // We need to consider other items in the recyclerview when dealing with positions. + // In the callbacks we get the adapter position, but we want to get the course items position so we use this. + // If there is any other recyclerview item added above the courses this should be modified. + private val POSITION_MODIFIER = 1 + + override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) { + super.onSelectedChanged(viewHolder, actionState) + + if (viewHolder == null) return + val fromPosition = viewHolder.bindingAdapterPosition + val fromItem = recyclerAdapter?.getItem(DashboardRecyclerAdapter.ItemType.COURSE_HEADER, fromPosition - POSITION_MODIFIER) as? DashboardCourseItem + + itemToMove = fromItem + } + + override fun onMove( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ): Boolean { + val fromPosition = viewHolder.bindingAdapterPosition + val toPosition = target.bindingAdapterPosition + + val itemsSize = recyclerAdapter?.getItems(DashboardRecyclerAdapter.ItemType.COURSE_HEADER)?.size ?: 0 + + if (toPosition - POSITION_MODIFIER in 0..< itemsSize) { + recyclerAdapter?.notifyItemMoved(fromPosition, toPosition) + } + + return true + } + + override fun getDragDirs( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder + ): Int { + return if (viewHolder is CourseViewHolder && networkStateProvider.isOnline()) { + ItemTouchHelper.START or ItemTouchHelper.END or ItemTouchHelper.DOWN or ItemTouchHelper.UP + } else 0 + } + + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit + + override fun clearView( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder + ) { + val finishingPosition = viewHolder.bindingAdapterPosition + + if (finishingPosition == RecyclerView.NO_POSITION) { + itemToMove = null + firebaseCrashlytics.recordException(Throwable("Failed to reorder dashboard. finishingPosition == RecyclerView.NO_POSITION")) + toast(R.string.failedToUpdateDashboardOrder) + return + } + + itemToMove?.let { + recyclerAdapter?.moveItems(DashboardRecyclerAdapter.ItemType.COURSE_HEADER, it, finishingPosition - 1) + recyclerAdapter?.notifyDataSetChanged() + itemToMove = null + } + + val courseItems = recyclerAdapter?.getItems(DashboardRecyclerAdapter.ItemType.COURSE_HEADER) + ?.mapNotNull { it as? DashboardCourseItem } ?: emptyList() + val positions = courseItems + .mapIndexed { index, course -> Pair(course.course.contextId, index) } + .toMap() + + val dashboardPositions = DashboardPositions(positions) + lifecycleScope.launch { + val updateResult = repository.updateDashboardPositions(dashboardPositions) + if (updateResult.isFail) { + toast(R.string.failedToUpdateDashboardOrder) + } + } + } + }) + + itemTouchHelper.attachToRecyclerView(recyclerBinding.listView) } override fun onStart() { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt index cdb1024802..d1adbbfd09 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt @@ -65,19 +65,19 @@ class NotificationListFragment : ParentFragment(), Bookmarkable, FragmentManager private var canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT) - private lateinit var recyclerAdapter: NotificationListRecyclerAdapter + private var recyclerAdapter: NotificationListRecyclerAdapter? = null private var adapterToFragmentCallback: NotificationAdapterToFragmentCallback = object : NotificationAdapterToFragmentCallback { override fun onRowClicked(streamItem: StreamItem, position: Int, isOpenDetail: Boolean) { - recyclerAdapter.setSelectedPosition(position) + recyclerAdapter?.setSelectedPosition(position) onRowClick(streamItem) } override fun onRefreshFinished() { setRefreshing(false) binding.editOptions.setGone() - if (recyclerAdapter.size() == 0) { + if (recyclerAdapter?.size() == 0) { setEmptyView(recyclerBinding.emptyView, R.drawable.ic_panda_noalerts, R.string.noNotifications, R.string.noNotificationsSubtext) if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { recyclerBinding.emptyView.setGuidelines(.2f, .7f, .74f, .15f, .85f) @@ -112,21 +112,23 @@ class NotificationListFragment : ParentFragment(), Bookmarkable, FragmentManager override fun onViewCreated(view: View, savedInstanceState: Bundle?) { recyclerBinding = PandaRecyclerRefreshLayoutBinding.bind(binding.root) recyclerAdapter = NotificationListRecyclerAdapter(requireContext(), canvasContext, adapterToFragmentCallback) - configureRecyclerView( - view, - requireContext(), - recyclerAdapter, - R.id.swipeRefreshLayout, - R.id.emptyView, - R.id.listView - ) + recyclerAdapter?.let { + configureRecyclerView( + view, + requireContext(), + it, + R.id.swipeRefreshLayout, + R.id.emptyView, + R.id.listView + ) + } recyclerBinding.listView.isSelectionEnabled = false binding.confirmButton.text = getString(R.string.delete) - binding.confirmButton.setOnClickListener { recyclerAdapter.confirmButtonClicked() } + binding.confirmButton.setOnClickListener { recyclerAdapter?.confirmButtonClicked() } binding.cancelButton.text = getString(R.string.cancel) - binding.cancelButton.setOnClickListener { recyclerAdapter.cancelButtonClicked() } + binding.cancelButton.setOnClickListener { recyclerAdapter?.cancelButtonClicked() } applyTheme() @@ -139,14 +141,14 @@ class NotificationListFragment : ParentFragment(), Bookmarkable, FragmentManager if (activity?.supportFragmentManager?.fragments?.lastOrNull()?.javaClass == this.javaClass) { if (shouldRefreshOnResume) { recyclerBinding.swipeRefreshLayout.isRefreshing = true - recyclerAdapter.refresh() + recyclerAdapter?.refresh() shouldRefreshOnResume = false } } } override fun onDestroyView() { - recyclerAdapter.cancel() + recyclerAdapter?.cancel() activity?.supportFragmentManager?.removeOnBackStackChangedListener(this) super.onDestroyView() } @@ -170,16 +172,18 @@ class NotificationListFragment : ParentFragment(), Bookmarkable, FragmentManager override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - configureRecyclerView( - requireView(), - requireContext(), - recyclerAdapter, - R.id.swipeRefreshLayout, - R.id.emptyView, - R.id.listView, + recyclerAdapter?.let { + configureRecyclerView( + requireView(), + requireContext(), + it, + R.id.swipeRefreshLayout, + R.id.emptyView, + R.id.listView, R.string.noNotifications - ) - if (recyclerAdapter.size() == 0) { + ) + } + if (recyclerAdapter?.size() == 0) { recyclerBinding.emptyView.changeTextSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ParentFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ParentFragment.kt index 4cbdbeb85e..24f868fa74 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ParentFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ParentFragment.kt @@ -60,6 +60,7 @@ import com.instructure.pandautils.utils.LoaderUtils import com.instructure.pandautils.utils.PermissionUtils import com.instructure.pandautils.utils.getDrawableCompat import com.instructure.pandautils.utils.hasPermissions +import com.instructure.pandautils.utils.toast import com.instructure.pandautils.views.EmptyView import com.instructure.student.R import com.instructure.student.activity.VideoViewActivity @@ -381,7 +382,12 @@ abstract class ParentFragment : DialogFragment(), FragmentInteractions, Navigati } onMainThread { - LoaderUtils.restartLoaderWithBundle>(LoaderManager.getInstance(owner), openMediaBundle, loaderCallbacks, R.id.openMediaLoaderID) + try { + LoaderUtils.restartLoaderWithBundle>(LoaderManager.getInstance(owner), openMediaBundle, loaderCallbacks, R.id.openMediaLoaderID) + } catch (e: Exception) { + toast(R.string.unexpectedErrorOpeningFile) + onMediaLoadingComplete() + } } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt index dc9b95e04f..e223a0b533 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt @@ -51,11 +51,11 @@ class ToDoListFragment : ParentFragment() { private var canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT) - private lateinit var recyclerAdapter: TodoListRecyclerAdapter + private var recyclerAdapter: TodoListRecyclerAdapter? = null private var adapterToFragmentCallback: NotificationAdapterToFragmentCallback = object : NotificationAdapterToFragmentCallback { override fun onRowClicked(todo: ToDo, position: Int, isOpenDetail: Boolean) { - recyclerAdapter.setSelectedPosition(position) + recyclerAdapter?.setSelectedPosition(position) onRowClick(todo) } @@ -63,7 +63,7 @@ class ToDoListFragment : ParentFragment() { if (!isAdded) return setRefreshing(false) binding.editOptions.setGone() - if (recyclerAdapter.size() == 0) { + if (recyclerAdapter?.size() == 0) { setEmptyView(recyclerViewBinding.emptyView, R.drawable.ic_panda_sleeping, R.string.noTodos, R.string.noTodosSubtext) } } @@ -91,26 +91,28 @@ class ToDoListFragment : ParentFragment() { } } recyclerAdapter = TodoListRecyclerAdapter(requireContext(), canvasContext, adapterToFragmentCallback) - configureRecyclerView( - view, - requireContext(), - recyclerAdapter, - R.id.swipeRefreshLayout, - R.id.emptyView, - R.id.listView - ) + recyclerAdapter?.let { + configureRecyclerView( + view, + requireContext(), + it, + R.id.swipeRefreshLayout, + R.id.emptyView, + R.id.listView + ) + } recyclerViewBinding.listView.isSelectionEnabled = false binding.confirmButton.text = getString(R.string.markAsDone) - binding.confirmButton.setOnClickListener { recyclerAdapter.confirmButtonClicked() } + binding.confirmButton.setOnClickListener { recyclerAdapter?.confirmButtonClicked() } binding.cancelButton.setText(R.string.cancel) - binding.cancelButton.setOnClickListener { recyclerAdapter.cancelButtonClicked() } + binding.cancelButton.setOnClickListener { recyclerAdapter?.cancelButtonClicked() } - updateFilterTitle(recyclerAdapter.getFilterMode()) + updateFilterTitle(recyclerAdapter?.getFilterMode() ?: NoFilter) binding.clearFilterTextView.setOnClickListener { - recyclerAdapter.loadDataWithFilter(NoFilter) - updateFilterTitle(recyclerAdapter.getFilterMode()) + recyclerAdapter?.loadDataWithFilter(NoFilter) + updateFilterTitle(recyclerAdapter?.getFilterMode() ?: NoFilter) } } @@ -132,16 +134,18 @@ class ToDoListFragment : ParentFragment() { override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - configureRecyclerView( - requireView(), - requireContext(), - recyclerAdapter, - R.id.swipeRefreshLayout, - R.id.emptyView, - R.id.listView, + recyclerAdapter?.let { + configureRecyclerView( + requireView(), + requireContext(), + it, + R.id.swipeRefreshLayout, + R.id.emptyView, + R.id.listView, R.string.noTodos - ) - if (recyclerAdapter.size() == 0) { + ) + } + if (recyclerAdapter?.size() == 0) { recyclerViewBinding.emptyView.changeTextSize() if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { if (isTablet) { @@ -164,12 +168,10 @@ class ToDoListFragment : ParentFragment() { when { toDo?.assignment != null -> { // Launch assignment details fragment. if (toDo.assignment!!.discussionTopicHeader != null) { - val groupTopic = toDo.assignment!!.discussionTopicHeader!!.groupTopicChildren.firstOrNull() - if (groupTopic == null) { // Launch discussion details fragment - RouteMatcher.route(requireActivity(), DiscussionRouterFragment.makeRoute(toDo.canvasContext!!, toDo.assignment!!.discussionTopicHeader!!)) - } else { // Launch discussion details fragment with the group - RouteMatcher.route(requireActivity(), DiscussionRouterFragment.makeRoute(CanvasContext.emptyGroupContext(groupTopic.groupId), groupTopic.id)) - } + RouteMatcher.route( + requireActivity(), + DiscussionRouterFragment.makeRoute(toDo.canvasContext!!, toDo.assignment!!.discussionTopicHeader!!) + ) } else { // Launch assignment details fragment. RouteMatcher.route(requireActivity(), AssignmentDetailsFragment.makeRoute(toDo.canvasContext!!, toDo.assignment!!.id)) @@ -184,15 +186,15 @@ class ToDoListFragment : ParentFragment() { private fun showCourseFilterDialog() { val choices = arrayOf(getString(R.string.favoritedCoursesLabel)) - var checkedItem = choices.indexOf(getString(recyclerAdapter.getFilterMode().titleId)) + var checkedItem = choices.indexOf(getString(recyclerAdapter?.getFilterMode()?.titleId ?: NoFilter.titleId)) val dialog = AlertDialog.Builder(requireContext()) .setTitle(R.string.filterByEllipsis) .setSingleChoiceItems(choices, checkedItem) { _, index -> checkedItem = index }.setPositiveButton(android.R.string.ok) { _, _ -> - if (checkedItem >= 0) recyclerAdapter.loadDataWithFilter(convertFilterChoiceToMode(choices[checkedItem])) - updateFilterTitle(recyclerAdapter.getFilterMode()) + if (checkedItem >= 0) recyclerAdapter?.loadDataWithFilter(convertFilterChoiceToMode(choices[checkedItem])) + updateFilterTitle(recyclerAdapter?.getFilterMode() ?: NoFilter) }.setNegativeButton(android.R.string.cancel, null) .create() @@ -216,7 +218,7 @@ class ToDoListFragment : ParentFragment() { override fun onDestroyView() { super.onDestroyView() - recyclerAdapter.cancel() + recyclerAdapter?.cancel() } companion object { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt index e5c586603f..bce47bc595 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt @@ -91,7 +91,7 @@ class ViewImageFragment : Fragment(), ShareableFile { private val requestListener = object : RequestListener { - override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target?, p3: Boolean): Boolean { + override fun onLoadFailed(p0: GlideException?, p1: Any?, target: Target, p3: Boolean): Boolean { binding.photoView.setGone() binding.progressBar.setGone() binding.errorContainer.setVisible() @@ -100,11 +100,17 @@ class ViewImageFragment : Fragment(), ShareableFile { return false } - override fun onResourceReady(drawable: Drawable?, p1: Any?, p2: Target?, p3: DataSource?, p4: Boolean): Boolean { + override fun onResourceReady( + resource: Drawable, + model: Any, + p2: Target?, + dataSource: DataSource, + p4: Boolean + ): Boolean { binding.progressBar.setGone() // Try to set the background color using palette if we can - (drawable as? BitmapDrawable)?.bitmap?.let { colorBackground(it) } + (resource as? BitmapDrawable)?.bitmap?.let { colorBackground(it) } return false } } diff --git a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt index 2bd4e88500..4567300a2f 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt @@ -99,7 +99,7 @@ class GradeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { } date.setVisible(date.text.isNotBlank()) - if (assignment.isMissing() && !isEdit && assignment.submission?.grade == null) { + if (assignment.isMissing() && !isEdit) { submissionState.text = context.getString(R.string.missingAssignment) submissionState.setTextColor(ContextCompat.getColor(context, R.color.textDanger)) submissionState.setVisible() diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/ui/SubmissionFilesAdapter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/ui/SubmissionFilesAdapter.kt index f9018ce7f9..0c1c06eb89 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/ui/SubmissionFilesAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/ui/SubmissionFilesAdapter.kt @@ -69,17 +69,22 @@ internal class SubmissionFilesHolder(view: View) : RecyclerView.ViewHolder(view) thumbnail.setVisible(data.thumbnailUrl.isValid()) data.thumbnailUrl.validOrNull()?.let { Glide.with(root.context).load(it).listener(object : RequestListener { - override fun onLoadFailed(e: GlideException?, model: Any?, target: Target?, isFirstResource: Boolean): Boolean { + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target, + isFirstResource: Boolean + ): Boolean { fileIcon.setVisible(true) thumbnail.setVisible(false) return false } override fun onResourceReady( - resource: Drawable?, - model: Any?, + resource: Drawable, + model: Any, target: Target?, - dataSource: DataSource?, + dataSource: DataSource, isFirstResource: Boolean ): Boolean { return false diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellView.kt index 49b796f7ad..b5a9df7835 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellView.kt @@ -67,6 +67,7 @@ class GradeCellView @JvmOverloads constructor( pointsLabel.setVisible(state.showPointsLabel) completeIcon.setVisible(state.showCompleteIcon) incompleteIcon.setVisible(state.showIncompleteIcon) + yourGrade.setTextForVisibility(state.yourGrade) latePenalty.setTextForVisibility(state.latePenalty) finalGrade.setTextForVisibility(state.finalGrade) grade.setTextForVisibility(state.grade) @@ -75,7 +76,6 @@ class GradeCellView @JvmOverloads constructor( outOf.contentDescription = state.outOfContentDescription // Accent color - latePenalty.setTextColor(state.accentColor) chart.setColor(state.accentColor) completeIcon.imageTintList = ColorStateList.valueOf(state.accentColor) incompleteIcon.imageTintList = ColorStateList.valueOf(state.accentColor) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt index 42cf48e75c..f5f368b06a 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt @@ -43,6 +43,7 @@ sealed class GradeCellViewState { val gradeCellContentDescription: String = "", val outOf: String = "", val outOfContentDescription: String = "", + val yourGrade: String = "", val latePenalty: String = "", val finalGrade: String = "", val stats: GradeStats? = null @@ -132,8 +133,8 @@ sealed class GradeCellViewState { ) } - val score = NumberHelper.formatDecimal(submission.enteredScore, 2, true) - val graphPercent = (submission.enteredScore / assignment.pointsPossible).coerceIn(0.0, 1.0).toFloat() + val score = NumberHelper.formatDecimal(submission.score, 2, true) + val graphPercent = (submission.score / assignment.pointsPossible).coerceIn(0.0, 1.0).toFloat() // If grading type is Points, don't show the grade since we're already showing it as the score var grade = if (assignment.gradingType != Assignment.POINTS_TYPE) submission.grade.orEmpty() else "" @@ -148,12 +149,15 @@ sealed class GradeCellViewState { var latePenalty = "" var finalGrade = "" + var yourGrade = "" // Adjust for late penalty, if any - if (submission.pointsDeducted ?: 0.0 > 0.0) { + if ((submission.pointsDeducted ?: 0.0) > 0.0) { grade = "" // Grade will be shown in the 'final grade' text val pointsDeducted = NumberHelper.formatDecimal(submission.pointsDeducted!!, 2, true) - latePenalty = context.getString(R.string.latePenalty, pointsDeducted) + val achievedScore = NumberHelper.formatDecimal(submission.enteredScore, 2, true) + yourGrade = context.getString(R.string.yourGrade, achievedScore) + latePenalty = context.getString(R.string.latePenaltyUpdated, pointsDeducted) finalGrade = context.getString(R.string.finalGradeFormatted, submission.grade) } @@ -190,6 +194,7 @@ sealed class GradeCellViewState { grade = grade, gradeContentDescription = accessibleGradeString, gradeCellContentDescription = gradeCellContentDescription, + yourGrade = yourGrade, latePenalty = latePenalty, finalGrade = finalGrade, stats = stats diff --git a/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt index c1e5000be0..bd4b8b96b5 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt @@ -18,7 +18,6 @@ package com.instructure.student.mobius.common.ui import android.app.Activity import android.content.Context -import android.content.ContextWrapper import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -29,10 +28,24 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics import com.instructure.canvasapi2.utils.Analytics import com.instructure.interactions.FragmentInteractions import com.instructure.interactions.Navigation +import com.instructure.pandautils.utils.getFragmentActivity import com.instructure.student.BuildConfig import com.instructure.student.fragment.ParentFragment -import com.instructure.student.mobius.common.* -import com.spotify.mobius.* +import com.instructure.student.mobius.common.ConsumerQueueWrapper +import com.instructure.student.mobius.common.CoroutineConnection +import com.instructure.student.mobius.common.GlobalEventMapper +import com.instructure.student.mobius.common.GlobalEventSource +import com.instructure.student.mobius.common.LateInit +import com.instructure.student.mobius.common.MobiusExceptionLogger +import com.instructure.student.mobius.common.contraMap +import com.spotify.mobius.Connectable +import com.spotify.mobius.Connection +import com.spotify.mobius.EventSource +import com.spotify.mobius.First +import com.spotify.mobius.Init +import com.spotify.mobius.Mobius +import com.spotify.mobius.MobiusLoop +import com.spotify.mobius.Update import com.spotify.mobius.android.MobiusAndroid import com.spotify.mobius.android.runners.MainThreadWorkRunner import com.spotify.mobius.functions.Consumer @@ -176,13 +189,7 @@ abstract class MobiusView(inflater: Lay get() = parent.context protected val activity: Activity - get() = getActivity(context) - - private fun getActivity(context: Context): Activity { - if (context is Activity) return context - if (context is ContextWrapper) return getActivity(context.baseContext) - else throw IllegalStateException("Not activity context") - } + get() = context.getFragmentActivity() abstract fun onConnect(output: Consumer) diff --git a/apps/student/src/main/java/com/instructure/student/navigation/DefaultNavigationBehavior.kt b/apps/student/src/main/java/com/instructure/student/navigation/DefaultNavigationBehavior.kt index 49bb171205..558b7761ba 100644 --- a/apps/student/src/main/java/com/instructure/student/navigation/DefaultNavigationBehavior.kt +++ b/apps/student/src/main/java/com/instructure/student/navigation/DefaultNavigationBehavior.kt @@ -20,7 +20,7 @@ import androidx.fragment.app.Fragment import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.interactions.router.Route -import com.instructure.pandautils.utils.FontFamily +import com.instructure.pandautils.utils.CanvasFont import com.instructure.student.R import com.instructure.student.fragment.CalendarFragment import com.instructure.student.fragment.DashboardFragment @@ -46,8 +46,8 @@ class DefaultNavigationBehavior(private val apiPrefs: ApiPrefs) : NavigationBeha override val visibleAccountMenuItems: Set = setOf(AccountMenuItem.HELP, AccountMenuItem.CHANGE_USER, AccountMenuItem.LOGOUT) - override val fontFamily: FontFamily - get() = FontFamily.REGULAR + override val canvasFont: CanvasFont + get() = CanvasFont.REGULAR override val bottomBarMenu: Int = R.menu.bottom_bar_menu diff --git a/apps/student/src/main/java/com/instructure/student/navigation/ElementaryNavigationBehavior.kt b/apps/student/src/main/java/com/instructure/student/navigation/ElementaryNavigationBehavior.kt index 37bbbfa2ea..9c36505bea 100644 --- a/apps/student/src/main/java/com/instructure/student/navigation/ElementaryNavigationBehavior.kt +++ b/apps/student/src/main/java/com/instructure/student/navigation/ElementaryNavigationBehavior.kt @@ -20,7 +20,7 @@ import androidx.fragment.app.Fragment import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.interactions.router.Route -import com.instructure.pandautils.utils.FontFamily +import com.instructure.pandautils.utils.CanvasFont import com.instructure.student.R import com.instructure.student.fragment.CalendarFragment import com.instructure.student.fragment.NotificationListFragment @@ -46,8 +46,8 @@ class ElementaryNavigationBehavior(private val apiPrefs: ApiPrefs) : NavigationB override val visibleAccountMenuItems: Set = setOf(AccountMenuItem.HELP, AccountMenuItem.CHANGE_USER, AccountMenuItem.LOGOUT) - override val fontFamily: FontFamily - get() = FontFamily.K5 + override val canvasFont: CanvasFont + get() = CanvasFont.K5 override val bottomBarMenu: Int = R.menu.bottom_bar_menu_elementary diff --git a/apps/student/src/main/java/com/instructure/student/navigation/NavigationBehavior.kt b/apps/student/src/main/java/com/instructure/student/navigation/NavigationBehavior.kt index e650131e0b..7ac1999403 100644 --- a/apps/student/src/main/java/com/instructure/student/navigation/NavigationBehavior.kt +++ b/apps/student/src/main/java/com/instructure/student/navigation/NavigationBehavior.kt @@ -22,7 +22,7 @@ import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.interactions.router.Route import com.instructure.pandautils.features.inbox.list.InboxFragment -import com.instructure.pandautils.utils.FontFamily +import com.instructure.pandautils.utils.CanvasFont import com.instructure.student.activity.NothingToSeeHereFragment import com.instructure.student.fragment.ParentFragment @@ -39,7 +39,7 @@ interface NavigationBehavior { val visibleAccountMenuItems: Set - val fontFamily: FontFamily + val canvasFont: CanvasFont @get:MenuRes val bottomBarMenu: Int diff --git a/apps/student/src/main/java/com/instructure/student/navigation/StudentWebViewRouter.kt b/apps/student/src/main/java/com/instructure/student/navigation/StudentWebViewRouter.kt index 6eb681b270..7ae5299c74 100644 --- a/apps/student/src/main/java/com/instructure/student/navigation/StudentWebViewRouter.kt +++ b/apps/student/src/main/java/com/instructure/student/navigation/StudentWebViewRouter.kt @@ -19,6 +19,7 @@ package com.instructure.student.navigation import androidx.fragment.app.FragmentActivity import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.pandautils.navigation.WebViewRouter +import com.instructure.student.fragment.InternalWebviewFragment import com.instructure.student.router.RouteMatcher class StudentWebViewRouter(val activity: FragmentActivity) : WebViewRouter { @@ -34,4 +35,8 @@ class StudentWebViewRouter(val activity: FragmentActivity) : WebViewRouter { override fun openMedia(url: String) { RouteMatcher.openMedia(activity, url) } + + override fun routeExternally(url: String) { + RouteMatcher.route(activity, InternalWebviewFragment.makeRoute(url, url, false, "")) + } } \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/receivers/AlarmReceiver.kt b/apps/student/src/main/java/com/instructure/student/receivers/AlarmReceiver.kt new file mode 100644 index 0000000000..0f02fe27f8 --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/receivers/AlarmReceiver.kt @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2024 - present Instructure, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.instructure.student.receivers + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import androidx.core.app.NotificationCompat +import com.instructure.pandautils.models.PushNotification +import com.instructure.pandautils.room.appdatabase.daos.ReminderDao +import com.instructure.pandautils.utils.Const +import com.instructure.student.R +import com.instructure.student.activity.NavigationActivity +import com.instructure.student.util.goAsync +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject + +@AndroidEntryPoint +class AlarmReceiver : BroadcastReceiver() { + + @Inject + lateinit var reminderDao: ReminderDao + + override fun onReceive(context: Context?, intent: Intent?) { + if (context != null && intent != null) { + val assignmentId = intent.getLongExtra(ASSIGNMENT_ID, 0L) + val assignmentPath = intent.getStringExtra(ASSIGNMENT_PATH) ?: return + val assignmentName = intent.getStringExtra(ASSIGNMENT_NAME) ?: return + val dueIn = intent.getStringExtra(DUE_IN) ?: return + + createNotificationChannel(context) + showNotification(context, assignmentId, assignmentPath, assignmentName, dueIn) + goAsync { + reminderDao.deletePastReminders(System.currentTimeMillis()) + } + } + } + + private fun showNotification(context: Context, assignmentId: Long, assignmentPath: String, assignmentName: String, dueIn: String) { + val intent = Intent(context, NavigationActivity.startActivityClass).apply { + putExtra(Const.LOCAL_NOTIFICATION, true) + putExtra(PushNotification.HTML_URL, assignmentPath) + } + + val pendingIntent = PendingIntent.getActivity( + context, 0, intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + + val builder = NotificationCompat.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_notification_canvas_logo) + .setContentTitle(context.getString(R.string.reminderNotificationTitle)) + .setContentText(context.getString(R.string.reminderNotificationDescription, dueIn, assignmentName)) + .setAutoCancel(true) + .setContentIntent(pendingIntent) + .setPriority(NotificationCompat.PRIORITY_DEFAULT) + + val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.notify(assignmentId.toInt(), builder.build()) + } + + private fun createNotificationChannel(context: Context) { + val channel = NotificationChannel( + CHANNEL_ID, + context.getString(R.string.reminderNotificationChannelName), + NotificationManager.IMPORTANCE_DEFAULT + ).apply { + description = context.getString(R.string.reminderNotificationChannelDescription) + } + + val notificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) + } + + companion object { + private const val CHANNEL_ID = "REMINDERS_CHANNEL_ID" + const val ASSIGNMENT_ID = "ASSIGNMENT_ID" + const val ASSIGNMENT_PATH = "ASSIGNMENT_PATH" + const val ASSIGNMENT_NAME = "ASSIGNMENT_NAME" + const val DUE_IN = "DUE_IN" + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/receivers/InitializeReceiver.kt b/apps/student/src/main/java/com/instructure/student/receivers/InitializeReceiver.kt index 090bf55a72..90560f5f20 100644 --- a/apps/student/src/main/java/com/instructure/student/receivers/InitializeReceiver.kt +++ b/apps/student/src/main/java/com/instructure/student/receivers/InitializeReceiver.kt @@ -20,18 +20,29 @@ package com.instructure.student.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import com.instructure.pandautils.receivers.PushExternalReceiver import com.instructure.student.R import com.instructure.student.activity.NavigationActivity +import com.instructure.student.features.assignments.reminder.AlarmScheduler +import com.instructure.student.util.goAsync import com.instructure.student.widget.WidgetUpdater -import com.instructure.pandautils.receivers.PushExternalReceiver +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject +@AndroidEntryPoint class InitializeReceiver : BroadcastReceiver() { + @Inject + lateinit var alarmScheduler: AlarmScheduler + override fun onReceive(context: Context, intent: Intent) { if(Intent.ACTION_BOOT_COMPLETED == intent.action || Intent.ACTION_MY_PACKAGE_REPLACED == intent.action) { //Restores stored push notifications upon boot PushExternalReceiver.postStoredNotifications(context, context.getString(R.string.student_app_name), NavigationActivity.startActivityClass, R.color.login_studentAppTheme) WidgetUpdater.updateWidgets() + goAsync { + alarmScheduler.scheduleAllAlarmsForCurrentUser() + } } } } diff --git a/apps/student/src/main/java/com/instructure/student/tasks/StudentLogoutTask.kt b/apps/student/src/main/java/com/instructure/student/tasks/StudentLogoutTask.kt index ec829ffbc1..e695af1e4f 100644 --- a/apps/student/src/main/java/com/instructure/student/tasks/StudentLogoutTask.kt +++ b/apps/student/src/main/java/com/instructure/student/tasks/StudentLogoutTask.kt @@ -25,11 +25,11 @@ import com.heapanalytics.android.Heap import com.instructure.canvasapi2.utils.ContextKeeper import com.instructure.canvasapi2.utils.tryOrNull import com.instructure.loginapi.login.tasks.LogoutTask -import com.instructure.pandautils.features.offline.sync.CourseSyncWorker import com.instructure.pandautils.features.offline.sync.OfflineSyncWorker import com.instructure.pandautils.room.offline.DatabaseProvider import com.instructure.pandautils.typeface.TypefaceBehavior import com.instructure.student.activity.LoginActivity +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.flutterChannels.FlutterComm import com.instructure.student.util.StudentPrefs import com.instructure.student.widget.WidgetUpdater @@ -40,7 +40,8 @@ class StudentLogoutTask( uri: Uri? = null, canvasForElementaryFeatureFlag: Boolean = false, typefaceBehavior: TypefaceBehavior? = null, - private val databaseProvider: DatabaseProvider? = null + private val databaseProvider: DatabaseProvider? = null, + private val alarmScheduler: AlarmScheduler? = null ) : LogoutTask(type, uri, canvasForElementaryFeatureFlag, typefaceBehavior) { override fun onCleanup() { @@ -79,8 +80,12 @@ class StudentLogoutTask( override fun stopOfflineSync() { val workManager = WorkManager.getInstance(ContextKeeper.appContext) workManager.apply { - cancelAllWorkByTag(CourseSyncWorker.TAG) - cancelAllWorkByTag(OfflineSyncWorker.TAG) + cancelAllWorkByTag(OfflineSyncWorker.PERIODIC_TAG) + cancelAllWorkByTag(OfflineSyncWorker.ONE_TIME_TAG) } } + + override suspend fun cancelAlarms() { + alarmScheduler?.cancelAllAlarmsForCurrentUser() + } } diff --git a/apps/student/src/main/java/com/instructure/student/util/AppManager.kt b/apps/student/src/main/java/com/instructure/student/util/AppManager.kt index 20a7c1fa77..c43f7fb665 100644 --- a/apps/student/src/main/java/com/instructure/student/util/AppManager.kt +++ b/apps/student/src/main/java/com/instructure/student/util/AppManager.kt @@ -23,6 +23,7 @@ import com.instructure.canvasapi2.utils.MasqueradeHelper import com.instructure.loginapi.login.tasks.LogoutTask import com.instructure.pandautils.room.offline.DatabaseProvider import com.instructure.pandautils.typeface.TypefaceBehavior +import com.instructure.student.features.assignments.reminder.AlarmScheduler import com.instructure.student.tasks.StudentLogoutTask import dagger.hilt.android.HiltAndroidApp import javax.inject.Inject @@ -39,15 +40,28 @@ class AppManager : BaseAppManager() { @Inject lateinit var databaseProvider: DatabaseProvider + @Inject + lateinit var alarmScheduler: AlarmScheduler + override fun onCreate() { super.onCreate() MasqueradeHelper.masqueradeLogoutTask = Runnable { - StudentLogoutTask(LogoutTask.Type.LOGOUT, typefaceBehavior = typefaceBehavior, databaseProvider = databaseProvider).execute() + StudentLogoutTask( + LogoutTask.Type.LOGOUT, + typefaceBehavior = typefaceBehavior, + databaseProvider = databaseProvider, + alarmScheduler = alarmScheduler + ).execute() } } override fun performLogoutOnAuthError() { - StudentLogoutTask(LogoutTask.Type.LOGOUT, typefaceBehavior = typefaceBehavior, databaseProvider = databaseProvider).execute() + StudentLogoutTask( + LogoutTask.Type.LOGOUT, + typefaceBehavior = typefaceBehavior, + databaseProvider = databaseProvider, + alarmScheduler = alarmScheduler + ).execute() } override fun getWorkManagerFactory(): WorkerFactory = workerFactory diff --git a/apps/student/src/main/java/com/instructure/student/util/BaseAppManager.kt b/apps/student/src/main/java/com/instructure/student/util/BaseAppManager.kt index 51b573aaa4..09f8856ab6 100644 --- a/apps/student/src/main/java/com/instructure/student/util/BaseAppManager.kt +++ b/apps/student/src/main/java/com/instructure/student/util/BaseAppManager.kt @@ -49,6 +49,11 @@ import io.flutter.embedding.engine.dart.DartExecutor abstract class BaseAppManager : com.instructure.canvasapi2.AppManager(), AnalyticsEventHandling, Configuration.Provider { + override val workManagerConfiguration: Configuration + get() = Configuration.Builder() + .setWorkerFactory(getWorkManagerFactory()) + .build() + override fun onCreate() { super.onCreate() @@ -153,11 +158,6 @@ abstract class BaseAppManager : com.instructure.canvasapi2.AppManager(), Analyti override fun performLogoutOnAuthError() = Unit - override fun getWorkManagerConfiguration(): Configuration = - Configuration.Builder() - .setWorkerFactory(getWorkManagerFactory()) - .build() - abstract fun getWorkManagerFactory(): WorkerFactory companion object { diff --git a/apps/student/src/main/java/com/instructure/student/util/Extensions.kt b/apps/student/src/main/java/com/instructure/student/util/Extensions.kt index 4190da75d2..110f6fd2c9 100644 --- a/apps/student/src/main/java/com/instructure/student/util/Extensions.kt +++ b/apps/student/src/main/java/com/instructure/student/util/Extensions.kt @@ -15,6 +15,7 @@ */ package com.instructure.student.util +import android.content.BroadcastReceiver import android.content.Context import com.instructure.canvasapi2.managers.ExternalToolManager import com.instructure.canvasapi2.models.Assignment @@ -24,8 +25,14 @@ import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.canvasapi2.utils.DataResult import com.instructure.pandautils.utils.getShortMonthAndDay import com.instructure.pandautils.utils.getTime +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch import org.threeten.bp.OffsetDateTime -import java.util.* +import java.util.Locale +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext suspend fun Long.isStudioEnabled(): Boolean { val context = CanvasContext.getGenericContext(CanvasContext.Type.COURSE, this) @@ -52,3 +59,18 @@ fun String.toDueAtString(context: Context): String { val dueDateTime = OffsetDateTime.parse(this).withOffsetSameInstant(OffsetDateTime.now().offset) return context.getString(com.instructure.pandares.R.string.submissionDetailsDueAt, dueDateTime.getShortMonthAndDay(), dueDateTime.getTime()) } + +fun BroadcastReceiver.goAsync( + context: CoroutineContext = EmptyCoroutineContext, + block: suspend CoroutineScope.() -> Unit +) { + val pendingResult = goAsync() + @OptIn(DelicateCoroutinesApi::class) + GlobalScope.launch(context) { + try { + block() + } finally { + pendingResult.finish() + } + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/util/StudentLogoutHelper.kt b/apps/student/src/main/java/com/instructure/student/util/StudentLogoutHelper.kt new file mode 100644 index 0000000000..620eb7d127 --- /dev/null +++ b/apps/student/src/main/java/com/instructure/student/util/StudentLogoutHelper.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 - present Instructure, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + */ + +package com.instructure.student.util + +import com.instructure.loginapi.login.tasks.LogoutTask +import com.instructure.pandautils.room.offline.DatabaseProvider +import com.instructure.pandautils.utils.LogoutHelper +import com.instructure.student.tasks.StudentLogoutTask + +class StudentLogoutHelper : LogoutHelper { + override fun logout(databaseProvider: DatabaseProvider) { + StudentLogoutTask(LogoutTask.Type.LOGOUT, databaseProvider = databaseProvider).execute() + } +} \ No newline at end of file diff --git a/apps/student/src/main/java/com/instructure/student/util/TabHelper.kt b/apps/student/src/main/java/com/instructure/student/util/TabHelper.kt index 4b77b5f92d..b3fd8de5ee 100644 --- a/apps/student/src/main/java/com/instructure/student/util/TabHelper.kt +++ b/apps/student/src/main/java/com/instructure/student/util/TabHelper.kt @@ -19,7 +19,6 @@ package com.instructure.student.util import com.instructure.canvasapi2.models.CanvasContext import com.instructure.canvasapi2.models.Course -import com.instructure.canvasapi2.models.Page import com.instructure.canvasapi2.models.Tab import com.instructure.canvasapi2.utils.ApiPrefs import com.instructure.canvasapi2.utils.ContextKeeper @@ -36,7 +35,11 @@ import com.instructure.student.features.pages.details.PageDetailsFragment import com.instructure.student.features.pages.list.PageListFragment import com.instructure.student.features.people.list.PeopleListFragment import com.instructure.student.features.quiz.list.QuizListFragment -import com.instructure.student.fragment.* +import com.instructure.student.fragment.AnnouncementListFragment +import com.instructure.student.fragment.CourseSettingsFragment +import com.instructure.student.fragment.LtiLaunchFragment +import com.instructure.student.fragment.NotificationListFragment +import com.instructure.student.fragment.UnsupportedTabFragment import com.instructure.student.mobius.conferences.conference_list.ui.ConferenceListRepositoryFragment import com.instructure.student.mobius.syllabus.ui.SyllabusRepositoryFragment import java.util.* @@ -97,7 +100,7 @@ object TabHelper { Tab.ASSIGNMENTS_ID -> AssignmentListFragment.makeRoute(canvasContext) Tab.MODULES_ID -> ModuleListFragment.makeRoute(canvasContext) Tab.PAGES_ID -> PageListFragment.makeRoute(canvasContext, false) - Tab.FRONT_PAGE_ID -> PageDetailsFragment.makeRoute(canvasContext, Page.FRONT_PAGE_NAME) + Tab.FRONT_PAGE_ID -> PageDetailsFragment.makeFrontPageRoute(canvasContext) Tab.DISCUSSIONS_ID -> DiscussionListFragment.makeRoute(canvasContext) Tab.PEOPLE_ID -> PeopleListFragment.makeRoute(canvasContext) Tab.FILES_ID -> FileListFragment.makeRoute(canvasContext) diff --git a/apps/student/src/main/res/layout/course_module_progression.xml b/apps/student/src/main/res/layout/course_module_progression.xml index 4918489d1c..59ac4aa00f 100644 --- a/apps/student/src/main/res/layout/course_module_progression.xml +++ b/apps/student/src/main/res/layout/course_module_progression.xml @@ -147,23 +147,25 @@ -