github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to Mockito 5.4.0 (#97285)

Browse source
This commit is contained in:
Chris Hegarty 2023-06-30 18:27:47 +01:00 • committed by GitHub
parent 659d662f92
commit ccd9efb807
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/test/build.gradle
View file

@ -25,9 +25,9 @@ dependencies {
api "org.hamcrest:hamcrest:${versions.hamcrest}" api "org.hamcrest:hamcrest:${versions.hamcrest}"
// mockito // mockito
api 'org.mockito:mockito-core:5.1.1' api 'org.mockito:mockito-core:5.4.0'
api 'org.mockito:mockito-subclass:5.1.1' api 'org.mockito:mockito-subclass:5.4.0'
api 'net.bytebuddy:byte-buddy:1.12.22' api 'net.bytebuddy:byte-buddy:1.14.5'
api 'org.objenesis:objenesis:3.3' api 'org.objenesis:objenesis:3.3'
} }

15
gradle/verification-metadata.xml
View file

@ -1469,6 +1469,11 @@
<sha256 value="e305b6b5bdf8602bc5012efaa50c96b0fb922a3c60308ee1af85605b74d82710" origin="Generated by Gradle"/> <sha256 value="e305b6b5bdf8602bc5012efaa50c96b0fb922a3c60308ee1af85605b74d82710" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="net.bytebuddy" name="byte-buddy" version="1.14.5">
<artifact name="byte-buddy-1.14.5.jar">
<sha256 value="e99761a526df0fefbbd3fe14436b0f953000cdfa5151dc63c0b18d37d9c46f1c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="net.java.dev.jets3t" name="jets3t" version="0.9.0"> <component group="net.java.dev.jets3t" name="jets3t" version="0.9.0">
<artifact name="jets3t-0.9.0.jar"> <artifact name="jets3t-0.9.0.jar">
<sha256 value="e89893fc754b252af717d7d14accda946f7dfcfc1e293fd3e04725163d661bd7" origin="Generated by Gradle"/> <sha256 value="e89893fc754b252af717d7d14accda946f7dfcfc1e293fd3e04725163d661bd7" origin="Generated by Gradle"/>
@ -3366,11 +3371,21 @@
<sha256 value="447bdedceaef4107c50db3d33e252bf030c6ae0e46454b40dbcfc0dfbf041264" origin="Generated by Gradle"/> <sha256 value="447bdedceaef4107c50db3d33e252bf030c6ae0e46454b40dbcfc0dfbf041264" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.mockito" name="mockito-core" version="5.4.0">
<artifact name="mockito-core-5.4.0.jar">
<sha256 value="b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.mockito" name="mockito-subclass" version="5.1.1"> <component group="org.mockito" name="mockito-subclass" version="5.1.1">
<artifact name="mockito-subclass-5.1.1.jar"> <artifact name="mockito-subclass-5.1.1.jar">
<sha256 value="7e1c4c7220fc3bcf62e07e40abcae7dc31d017c45cfea88ac6c83695f2e5184a" origin="Generated by Gradle"/> <sha256 value="7e1c4c7220fc3bcf62e07e40abcae7dc31d017c45cfea88ac6c83695f2e5184a" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.mockito" name="mockito-subclass" version="5.4.0">
<artifact name="mockito-subclass-5.4.0.jar">
<sha256 value="7e1c4c7220fc3bcf62e07e40abcae7dc31d017c45cfea88ac6c83695f2e5184a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.mortbay.jetty" name="jetty" version="6.1.26"> <component group="org.mortbay.jetty" name="jetty" version="6.1.26">
<artifact name="jetty-6.1.26.jar"> <artifact name="jetty-6.1.26.jar">
<sha256 value="21091d3a9c1349f640fdc421504a604c040ed89087ecc12afbe32353326ed4e5" origin="Generated by Gradle"/> <sha256 value="21091d3a9c1349f640fdc421504a604c040ed89087ecc12afbe32353326ed4e5" origin="Generated by Gradle"/>

6
server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java
View file

@ -64,7 +64,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
/** /**
* A unit test class that tests {@link ReservedComposableIndexTemplateAction} * A unit test class that tests {@link ReservedComposableIndexTemplateAction}
@ -877,9 +876,8 @@ public class ReservedComposableIndexTemplateActionTests extends ESTestCase {
) )
.build(); .build();
ClusterService mockedClusterService = spy(clusterService);
MetadataIndexTemplateService mockedTemplateService = new MetadataIndexTemplateService( MetadataIndexTemplateService mockedTemplateService = new MetadataIndexTemplateService(
mockedClusterService, clusterService,
mock(MetadataCreateIndexService.class), mock(MetadataCreateIndexService.class),
indicesService, indicesService,
indexScopedSettings, indexScopedSettings,
@ -889,7 +887,7 @@ public class ReservedComposableIndexTemplateActionTests extends ESTestCase {
); );
ClusterState state = ClusterState.builder(new ClusterName("elasticsearch")).metadata(metadata).build(); ClusterState state = ClusterState.builder(new ClusterName("elasticsearch")).metadata(metadata).build();
doReturn(state).when(mockedClusterService).state(); doReturn(state).when(clusterService).state();
// we should see the weird composable name prefixed 'validate_template' // we should see the weird composable name prefixed 'validate_template'
assertThat(state.metadata().templatesV2(), allOf(aMapWithSize(1), hasKey(reservedComposableIndexName(conflictingTemplateName)))); assertThat(state.metadata().templatesV2(), allOf(aMapWithSize(1), hasKey(reservedComposableIndexName(conflictingTemplateName))));

6
test/framework/build.gradle
View file

@ -26,9 +26,9 @@ dependencies {
api "commons-codec:commons-codec:${versions.commonscodec}" api "commons-codec:commons-codec:${versions.commonscodec}"
// mockito // mockito
api 'org.mockito:mockito-core:5.1.1' api 'org.mockito:mockito-core:5.4.0'
api 'org.mockito:mockito-subclass:5.1.1' api 'org.mockito:mockito-subclass:5.4.0'
api 'net.bytebuddy:byte-buddy:1.12.22' api 'net.bytebuddy:byte-buddy:1.14.5'
api 'org.objenesis:objenesis:3.3' api 'org.objenesis:objenesis:3.3'
api "org.elasticsearch:mocksocket:${versions.mocksocket}" api "org.elasticsearch:mocksocket:${versions.mocksocket}"