mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
55c811547a
Dependency name change mockito-inline to mockito-core. Inline is now the default and the last version of mockito-inline released is 5.2.0. assertj-core in user-authenticators/saml2 pulls in an incompatible version of byte-buddy and required an exclusion. Updating the version of assertj is left for a future PR. The upgrade requires Java 11+, dropping support for Java 8. CloudStack documentation already says to use Java 11 and does not indicate that java 8 is supported. Test classes using @RunWith(MockitoJUnitRunner.class) now get run in strict mode. Changes were made to tests where the stubbing intention was clear. In ManagementServerMaintenanceManagerImplTest there are 5 tests where the intention of the test is unclear. Each of the statements now use Mockito.lenient() to avoid the exception. Other cases in the tests follow a similar pattern. Minor clean up. Both @Spy and Mockito.spy( should not be used. Favored the annotation. Both @RunWith(MockitoJUnitRunner.class) and MockitoAnnotations.openMocks(this); should not be used. Favored the annotation. Unnecessary extends TestCase removed. @InjectMocks and new in statement unnecessary. Removed new when issue presented. Some of the Cmd classes like UpdateNetworkCmd have a type tree that includes fields of type Object. This appears to cause issues with injection, requiring that @Mock fields be available. This is where the following fields were added in multiple places: Object job; ResponseGenerator _responseGenerator; Wrong number of parameters for Mockito.when in LibvirtRevertSnapshotCommandWrapperTest.java