Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #3488: Domain layer mechanism to resume explorations. #3668

Merged
merged 86 commits into from
Aug 21, 2021
Merged

Fix #3488: Domain layer mechanism to resume explorations. #3668

merged 86 commits into from
Aug 21, 2021

Conversation

MaskedCarrot
Copy link
Contributor

@MaskedCarrot MaskedCarrot commented Aug 11, 2021 •
edited

Explanation

Fix #3488

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

Espresso Tests

ExplorationActivityTest

Screenshot from 2021-08-20 03-04-28

StateFragmentTest (only the new test added)

Screenshot from 2021-08-20 03-24-41

MaskedCarrot and others added 24 commits August 9, 2021 02:43
@MaskedCarrot
moved hint handler to domain layer
d66c014
@yashraj-01
fixed app layer espresso tests
3b0bfb6
@yashraj-01
fix app layer robolectric tests
dc7c513
@yashraj-01
fixed domain layer tests
5a64024
@yashraj-01
Added annotations to test exemptions
f4aa847
@yashraj-01
proto lint fix
77c4fb7
@MaskedCarrot
fixed hint handler for training sessions
0deb650
@MaskedCarrot
nit and removed test excemptions
a7b78d1
@MaskedCarrot
added hint tests for config change
1036c25
@MaskedCarrot
fixed test file exemptions
46e35f0
@MaskedCarrot
fixed failing test
846d808
@yashraj-01
made HintHandler injectable
863688f
@yashraj-01
Merge remote-tracking branch 'upstream/move-hint-handler-to-domain' i…
c042529 
…nto move-hint-handler-to-domain
@yashraj-01
fixed ktlint error
218e070
@yashraj-01
Added tests for hint handler
ebeb0e5
@MaskedCarrot
Merge branch 'develop' into move-hint-handler-to-domain
1ed2323
@MaskedCarrot
nits
c41c23a
@MaskedCarrot
Merge remote-tracking branch 'origin/move-hint-handler-to-domain' int…
496aff7 
…o move-hint-handler-to-domain
@MaskedCarrot
fixed failing build
05ff962
@MaskedCarrot
fixed failing build
8437561
@MaskedCarrot
fix build
5e264a0
@MaskedCarrot
fixed imports
8c3f432
@MaskedCarrot
Merge branch 'develop' into move-hint-handler-to-domain
5738c09
@MaskedCarrot
completed mechansim to resume exploration
9245e51
@MaskedCarrot MaskedCarrot changed the base branch from develop to move-hint-handler-to-domain August 11, 2021 05:23
@aggarwalpulkit596 aggarwalpulkit596 enabled auto-merge (squash) August 20, 2021 12:33
BenHenning
BenHenning requested changes Aug 21, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MaskedCarrot. Took another pass--I think the PR is looking quite good. Just had a variety of suggestions, nits, and some requests for improved testing. PTAL.

app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandler.kt Outdated Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandler.kt Outdated Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandler.kt Outdated Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt Outdated Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/hintsandsolution/HintHandlerImplTest.kt Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/hintsandsolution/HintHandlerImplTest.kt Outdated Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt Outdated Show resolved Hide resolved
@BenHenning
Copy link
Sponsor Member

Also @MaskedCarrot please sync with develop & resolve conflicts.

BenHenning
BenHenning reviewed Aug 21, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MaskedCarrot. LGTM + 2 nits.

Also, PlatformParameterSyncUpWorkerTest seems like a potential unrelated flake (/cc @Arjupta). I'm following up with Arjun, but fixing the above should also retrigger the CI workflow.

domain/src/main/java/org/oppia/android/domain/hintsandsolution/HintHandlerImpl.kt Outdated Show resolved Hide resolved
domain/src/test/java/org/oppia/android/domain/hintsandsolution/HintHandlerImplTest.kt Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt Show resolved Hide resolved
BenHenning
BenHenning approved these changes Aug 21, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MaskedCarrot. LGTM!

@aggarwalpulkit596 aggarwalpulkit596 merged commit 854071a into develop Aug 21, 2021
@aggarwalpulkit596 aggarwalpulkit596 deleted the resume-exploration-in-domain-module branch August 21, 2021 22:16
@BenHenning BenHenning mentioned this pull request Oct 8, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

@vinitamurthi vinitamurthi vinitamurthi approved these changes

@BenHenning BenHenning BenHenning approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

@aggarwalpulkit596 aggarwalpulkit596 aggarwalpulkit596 approved these changes

Assignees

@BenHenning BenHenning

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement domain layer mechanism to resume explorations with checkpoints.
7 participants
@MaskedCarrot @BenHenning @anandwana001 @rt4914 @vinitamurthi @aggarwalpulkit596 @yashraj-01