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 #2450: Fix test testRecentlyPlayedTestActivity_clickOnToolbarNavigationButton_closeActivity [Testing] #2796

Merged
merged 4 commits into from
Mar 2, 2021
Merged

Fix #2450: Fix test testRecentlyPlayedTestActivity_clickOnToolbarNavigationButton_closeActivity [Testing] #2796

merged 4 commits into from
Mar 2, 2021

Conversation

viktoriias
Copy link
Contributor

@viktoriias viktoriias commented Mar 1, 2021 •
edited
Loading

Explanation

Fixes #2450
I added assertion in test testRecentlyPlayedTestActivity_clickOnToolbarNavigationButton_closeActivity.

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.

@viktoriias viktoriias requested a review from rt4914 as a code owner March 1, 2021 04:43
@anandwana001
Copy link
Contributor

Could you please add a screenshot showing test is passing on both espresso and robolectric?

@viktoriias
Copy link
Contributor Author

Could you please add a screenshot showing test is passing on both espresso and robolectric?

Screen Shot 2021-02-28 at 9 40 59 PM

@viktoriias
Copy link
Contributor Author

ktlint passes locally:

Screen Shot 2021-02-28 at 10 04 29 PM

anandwana001
anandwana001 suggested changes Mar 1, 2021
View reviewed changes
app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt Outdated
import dagger.Component
import javax.inject.Inject
import javax.inject.Singleton
Copy link
Contributor

Choose a reason for hiding this comment

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

This is causing the ktlint failure, also I think this change is not required in this PR as it is just a replacing of line. Could you try fixing this and push again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removing these causing errors

Copy link
Contributor

Choose a reason for hiding this comment

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

@viktoriias Actually @anandwana001 is mentioning that this PR changes the order of the imports. We do need all these imports. But the order is incorrect. All javax related imports should come in last and in alphabetical order.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done thanks, I moved javax down. Although, Android studio keeps trying to move it back because javax comes before org alphabeticaly.

rt4914
rt4914 suggested changes Mar 1, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

@viktoriias Suggested nit change.

app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt Outdated Show resolved Hide resolved
rt4914
rt4914 approved these changes Mar 1, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@rt4914 rt4914 assigned anandwana001 and unassigned viktoriias Mar 1, 2021
@anandwana001
Copy link
Contributor

Could you please add a screenshot showing test is passing on both espresso and robolectric?

Screen Shot 2021-02-28 at 9 40 59 PM

Is it passing on Espresso too?

@viktoriias
Copy link
Contributor Author

Could you please add a screenshot showing test is passing on both espresso and robolectric?

Screen Shot 2021-02-28 at 9 40 59 PM

Is it passing on Espresso too?

Yes, finally got it to work:
Screen Shot 2021-03-01 at 10 17 02 PM

@viktoriias viktoriias assigned anandwana001 and unassigned viktoriias Mar 2, 2021
anandwana001
anandwana001 approved these changes Mar 2, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks @viktoriias

@anandwana001 anandwana001 merged commit 21b4a60 into oppia:develop Mar 2, 2021
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

@anandwana001 anandwana001 anandwana001 approved these changes

Assignees

@anandwana001 anandwana001

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix test testRecentlyPlayedTestActivity_clickOnToolbarNavigationButton_closeActivity [Testing]
3 participants
@viktoriias @anandwana001 @rt4914