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

chore: Upgrade Mockito and surefire plugin #31073

Merged
merged 2 commits into from Feb 24, 2024
Merged

chore: Upgrade Mockito and surefire plugin #31073

merged 2 commits into from Feb 24, 2024

Conversation

sharat87
Copy link
Member

@sharat87 sharat87 commented Feb 13, 2024 •
edited by coderabbitai bot

Upgrading Mockito ahead of upgrading Spring itself.

Summary by CodeRabbit

  • Tests
    • Updated argument types in test methods for enhanced accuracy.
    • Modified mock setups in tests for improved reliability.

@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Feb 13, 2024
@sharat87 sharat87 changed the title chore: Remove unneeded explicit Mockito in pom.xml chore: Upgrade Mockito and surefire plugin Feb 13, 2024
@sharat87 sharat87 marked this pull request as ready for review February 13, 2024 07:22
@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 13, 2024 •
edited

Walkthrough

Walkthrough

The modifications involve two primary changes in the test suites of an application. The first change updates the argument type for a method call to ensure type safety, specifically in a utility method dealing with file operations. The second change simplifies mock setup in a test by using a direct method call to check for a no-operation condition, enhancing the clarity and maintainability of the test code.

Changes

File Path Change Summary
.../server/solutions/EnvManagerTest.java Modified argument type in createZip method call from any() to any(FileUtils.ZipSourceFile[].class).
.../server/solutions/ce/ActionExecutionSolutionCEImplTest.java Replaced mock setup with a call to observationRegistry.isNoop(), setting it to true.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

nidhi-nair
nidhi-nair reviewed Feb 13, 2024
View reviewed changes
...server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
ObservationRegistry.ObservationConfig mockObservationConfig =
Mockito.mock(ObservationRegistry.ObservationConfig.class);
Mockito.when(observationRegistry.observationConfig()).thenReturn(mockObservationConfig);
Mockito.when(observationRegistry.isNoop()).thenReturn(true);
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please help explain this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

Previously, we're mocking the observation config with a mock object. That means any code that calls .observationConfig() would get the mock object. But then, any code that calls .observationConfig().someMethod(), is throwing an NPE, since that mock object doesn't have any configured return values.

But since the whole reason we're mocking this is to just disable observation altogather, it's simpler to make isNoop return true. In which case, all operations in Observation infrastructure will be disabled and no NPEs should show up.

This is essentially a fix for an NPE that was showing up when I was trying to upgrade Spring.

@github-actions GitHub Actions
Copy link

This PR has not seen activitiy for a while. It will be closed in 7 days unless further activity is detected.

@github-actions github-actions bot added the Stale label Feb 20, 2024
@sharat87 sharat87 removed the Stale label Feb 21, 2024
@sharat87 sharat87 merged commit 5647916 into release Feb 24, 2024
24 checks passed
@sharat87 sharat87 deleted the chore/clean-pom branch February 24, 2024 18:54
sharat87 added a commit that referenced this pull request Feb 28, 2024
@sharat87
Revert "chore: Upgrade Mockito and surefire plugin (#31073)"
f036df4 
This reverts commit 5647916.
sharat87 added a commit that referenced this pull request Feb 28, 2024
@sharat87
chore: Revert Upgrade Mockito and surefire plugin (#31073) (#31334)
9f3ac2c 
This reverts commit 5647916.

This seems to have broken our ability to re-run failed tests on server
workflow. We'll bring the changes back after we figure out how to not
lose that capability.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nidhi-nair nidhi-nair nidhi-nair approved these changes

@mohanarpit mohanarpit Awaiting requested review from mohanarpit

@trishaanand trishaanand Awaiting requested review from trishaanand

Assignees
No one assigned
Labels
skip-changelog Adding this label to a PR prevents it from being listed in the changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sharat87 @nidhi-nair