Skip to content

Upgrade to mockito 4 and handle Mockito deprecations#8427

Merged
DaanHoogland merged 1 commit into
apache:mainfrom
shapeblue:upgrade-mockito-version
Feb 6, 2024
Merged

Upgrade to mockito 4 and handle Mockito deprecations#8427
DaanHoogland merged 1 commit into
apache:mainfrom
shapeblue:upgrade-mockito-version

Conversation

@vishesh92

@vishesh92 vishesh92 commented Jan 2, 2024

Copy link
Copy Markdown
Member

Description

This PR upgrades mockito from v3 to v4 and remove deprecated methods.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@codecov

codecov Bot commented Jan 2, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (37bb24f) 30.59% compared to head (51a67a0) 28.99%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #8427      +/-   ##
============================================
- Coverage     30.59%   28.99%   -1.61%     
+ Complexity    33772    31803    -1969     
============================================
  Files          5353     5353              
  Lines        375900   375900              
  Branches      54629    54629              
============================================
- Hits         115002   108980    -6022     
- Misses       245710   252316    +6606     
+ Partials      15188    14604     -584     
Flag Coverage Δ
simulator-marvin-tests 22.10% <ø> (-2.14%) ⬇️
uitests 4.38% <ø> (ø)
unit-tests 16.62% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vishesh92 vishesh92 added this to the 4.20.0.0 milestone Jan 2, 2024
@vishesh92 vishesh92 requested a review from DaanHoogland January 2, 2024 14:09

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

hard work @vishesh92 , looks good

@yadvr yadvr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM but needs testing/further review

@vishesh92 vishesh92 force-pushed the upgrade-mockito-version branch from 3a835c3 to 36a9d0c Compare February 5, 2024 18:56
@vishesh92

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@vishesh92 vishesh92 force-pushed the upgrade-mockito-version branch from 36a9d0c to a9e63d9 Compare February 5, 2024 18:58
@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 8537

@DaanHoogland

Copy link
Copy Markdown
Contributor

@vishesh92 , i think we have a package dependency error

@DaanHoogland

Copy link
Copy Markdown
Contributor

@vishesh92 , i think we have a package dependency error

in utils

@vishesh92

Copy link
Copy Markdown
Member Author

@DaanHoogland It's because of some new tests which used the deprecated runners module. Let me fix this.

@vishesh92 vishesh92 force-pushed the upgrade-mockito-version branch from a9e63d9 to 51a67a0 Compare February 6, 2024 12:22
@vishesh92

Copy link
Copy Markdown
Member Author

@DaanHoogland Tests passed after fixing the import.

@DaanHoogland DaanHoogland merged commit 399bd0a into apache:main Feb 6, 2024
@DaanHoogland DaanHoogland deleted the upgrade-mockito-version branch February 6, 2024 13:20
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants