Add Custom Annotation to Parameterize Tests with more Complex Scenarios

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryClientIntegrationTests.java

@@ -7,7 +7,6 @@
 import com.azure.core.exception.ClientAuthenticationException;
 import com.azure.core.http.HttpClient;
 import com.azure.core.test.TestMode;
-import com.azure.core.test.implementation.ImplUtils;
 import com.azure.core.util.Context;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -51,9 +50,9 @@ private ContainerRegistryClient getContainerRegistryClient(HttpClient httpClient
 
     @BeforeEach
     void beforeEach() {
-        TestUtils.importImage(ImplUtils.getTestMode(), HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4"));
+        TestUtils.importImage(getTestMode(), HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4"));
         TestUtils.importImage(
-            ImplUtils.getTestMode(),
+            getTestMode(),
             ALPINE_REPOSITORY_NAME,
             Arrays.asList(
                 LATEST_TAG_NAME,
@@ -72,7 +71,7 @@ public void listRepositoryNames(HttpClient httpClient) {
         StepVerifier.create(registryAsyncClient.listRepositoryNames())
             .recordWith(ArrayList::new)
             .thenConsumeWhile(x -> true)
-            .expectRecordedMatches(repositories -> validateRepositories(repositories))
+            .expectRecordedMatches(this::validateRepositories)
             .verifyComplete();
 
         List<String> repositories = registryClient.listRepositoryNames().stream().collect(Collectors.toList());
@@ -88,11 +87,12 @@ public void listRepositoryNamesWithPageSize(HttpClient httpClient) {
         StepVerifier.create(registryAsyncClient.listRepositoryNames().byPage(PAGESIZE_1))
             .recordWith(ArrayList::new)
             .thenConsumeWhile(x -> true)
-            .expectRecordedMatches(pagedResList -> validateRepositoriesByPage(pagedResList))
+            .expectRecordedMatches(this::validateRepositoriesByPage)
             .verifyComplete();
 
         ArrayList<String> repositories = new ArrayList<>();
-        registryClient.listRepositoryNames().iterableByPage(PAGESIZE_1).forEach(res -> res.getValue().forEach(repo -> repositories.add(repo)));
+        registryClient.listRepositoryNames().iterableByPage(PAGESIZE_1)
+            .forEach(res -> repositories.addAll(res.getValue()));
         validateRepositories(repositories);
     }
 
@@ -103,7 +103,8 @@ public void listRepositoryNamesWithInvalidPageSize(HttpClient httpClient) {
         registryClient = getContainerRegistryClient(httpClient);
 
         ArrayList<String> repositories = new ArrayList<>();
-        assertThrows(IllegalArgumentException.class, () -> registryClient.listRepositoryNames().iterableByPage(-1).forEach(res -> res.getValue().forEach(repo -> repositories.add(repo))));
+        assertThrows(IllegalArgumentException.class, () -> registryClient.listRepositoryNames().iterableByPage(-1)
+            .forEach(res -> repositories.addAll(res.getValue())));
 
         StepVerifier.create(registryAsyncClient.listRepositoryNames().byPage(-1))
             .verifyError(IllegalArgumentException.class);
@@ -132,7 +133,7 @@ public void getContainerRepository(HttpClient httpClient) {
         ContainerRepositoryAsync repositoryAsync = registryAsyncClient.getRepository(HELLO_WORLD_REPOSITORY_NAME);
         assertNotNull(repositoryAsync);
         StepVerifier.create(repositoryAsync.getProperties())
-            .assertNext(res -> validateProperties(res))
+            .assertNext(this::validateProperties)
             .verifyComplete();
 
         ContainerRepository repository = registryClient.getRepository(HELLO_WORLD_REPOSITORY_NAME);

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryClientTest.java

@@ -8,8 +8,8 @@
 import com.azure.core.http.netty.NettyAsyncHttpClientBuilder;
 import com.azure.core.http.rest.Response;
 import com.azure.core.test.TestMode;
-import com.azure.core.test.implementation.ImplUtils;
 import com.azure.core.util.Context;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -18,15 +18,14 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.Arrays;
+import java.util.Collections;
 
 import static com.azure.containers.containerregistry.TestUtils.HELLO_WORLD_REPOSITORY_NAME;
 import static com.azure.containers.containerregistry.TestUtils.HELLO_WORLD_SEATTLE_REPOSITORY_NAME;
 import static com.azure.containers.containerregistry.TestUtils.HTTP_STATUS_CODE_202;
 import static com.azure.containers.containerregistry.TestUtils.SLEEP_TIME_IN_MILLISECONDS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Execution(ExecutionMode.SAME_THREAD)
 public class ContainerRegistryClientTest extends ContainerRegistryClientsTestBase {
@@ -47,7 +46,7 @@ private ContainerRegistryAsyncClient getContainerRegistryAsyncClient(HttpClient
 
     @BeforeEach
     void beforeEach() {
-        TestUtils.importImage(ImplUtils.getTestMode(), repositoryName, Arrays.asList("latest"));
+        TestUtils.importImage(getTestMode(), repositoryName, Collections.singletonList("latest"));
         if (getTestMode() == TestMode.PLAYBACK) {
             httpClient = interceptorManager.getPlaybackClient();
         } else {
@@ -68,12 +67,12 @@ public void deleteRepositoryByRegistryWithResponseAsyncClient() {
             .then(registryAsyncClient.getRepository(repositoryName).getProperties())
             .flatMap(res -> Mono.just(false))
             .onErrorResume(res -> registryAsyncClient.getRepository(repositoryName)
-                    .delete()
-                    .then(Mono.just(true))
+                .delete()
+                .then(Mono.just(true))
                 .onErrorResume(err -> Mono.just(false)));
 
         StepVerifier.create(deleteRepositoryTest)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -89,7 +88,7 @@ public void deleteRepositoryByRegistryAsyncClient() {
                 .onErrorResume(err -> Mono.just(false)));
 
         StepVerifier.create(deleteRepositoryTest)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -105,7 +104,7 @@ public void deleteRepositoryWithResponseAsyncClient() {
                 .onErrorResume(err -> Mono.just(false)));
 
         StepVerifier.create(deleteRepositoryTest)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -121,7 +120,7 @@ public void deleteRepositoryAsyncClient() {
                 .onErrorResume(err -> Mono.just(false)));
 
         StepVerifier.create(deleteRepositoryTest)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRepositoryAnonymousAccessTests.java

@@ -4,7 +4,6 @@
 package com.azure.containers.containerregistry;
 
 import com.azure.core.http.HttpClient;
-import com.azure.core.test.implementation.ImplUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -22,14 +21,14 @@
 public class ContainerRepositoryAnonymousAccessTests extends ContainerRegistryClientsTestBase {
     @BeforeEach
     void beforeEach() {
-        TestUtils.importImageAsync(ImplUtils.getTestMode(), ANONYMOUS_REGISTRY_NAME, HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4")).block();
+        TestUtils.importImageAsync(getTestMode(), ANONYMOUS_REGISTRY_NAME, HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4")).block();
     }
 
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("getHttpClients")
     public void listAnonymousRepositories(HttpClient httpClient) {
         ContainerRegistryClient client = getContainerRegistryBuilder(httpClient, null, ANONYMOUS_REGISTRY_ENDPOINT).buildClient();
         List<String> repositories = client.listRepositoryNames().stream().collect(Collectors.toList());
-        assertTrue(repositories.stream().anyMatch(a -> HELLO_WORLD_REPOSITORY_NAME.equals(a)));
+        assertTrue(repositories.stream().anyMatch(HELLO_WORLD_REPOSITORY_NAME::equals));
     }
 }

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRepositoryAsyncIntegrationTests.java

@@ -10,7 +10,6 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.netty.NettyAsyncHttpClientBuilder;
 import com.azure.core.test.TestMode;
-import com.azure.core.test.implementation.ImplUtils;
 import com.azure.core.util.Context;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +40,7 @@ public class ContainerRepositoryAsyncIntegrationTests extends ContainerRegistryC
 
     @BeforeEach
     void beforeEach() {
-        TestUtils.importImage(ImplUtils.getTestMode(), HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4"));
+        TestUtils.importImage(getTestMode(), HELLO_WORLD_REPOSITORY_NAME, Arrays.asList("latest", "v1", "v2", "v3", "v4"));
     }
 
     @AfterEach
@@ -89,15 +88,11 @@ public void getPropertiesWithResponse(HttpClient httpClient) {
         client = getContainerRepository(httpClient);
 
         StepVerifier.create(asyncClient.getPropertiesWithResponse())
-            .assertNext(res -> {
-                validateProperties(res);
-            })
+            .assertNext(this::validateProperties)
             .verifyComplete();
 
         StepVerifier.create(asyncClient.getProperties())
-            .assertNext(res -> {
-                validateProperties(res);
-            })
+            .assertNext(this::validateProperties)
             .verifyComplete();
 
         validateProperties(client.getProperties());
@@ -148,7 +143,7 @@ public void listArtifactsWithPageSize(HttpClient httpClient) {
         StepVerifier.create(asyncClient.listManifestProperties().byPage(PAGESIZE_2))
             .recordWith(ArrayList::new)
             .thenConsumeWhile(x -> true)
-            .expectRecordedMatches(pagedResList -> validateListArtifactsByPage(pagedResList)).verifyComplete();
+            .expectRecordedMatches(this::validateListArtifactsByPage).verifyComplete();
 
         validateListArtifactsByPage(client.listManifestProperties().streamByPage(PAGESIZE_2).collect(Collectors.toList()));
     }
@@ -190,7 +185,7 @@ public void listArtifactsWithPageSizeNoOrderBy(HttpClient httpClient) {
         StepVerifier.create(asyncClient.listManifestProperties(ArtifactManifestOrderBy.NONE).byPage(PAGESIZE_2))
             .recordWith(ArrayList::new)
             .thenConsumeWhile(x -> true)
-            .expectRecordedMatches(pagedResList -> validateListArtifactsByPage(pagedResList))
+            .expectRecordedMatches(this::validateListArtifactsByPage)
             .verifyComplete();
 
         validateListArtifactsByPage(client.listManifestProperties(ArtifactManifestOrderBy.NONE, Context.NONE).streamByPage(PAGESIZE_2).collect(Collectors.toList()));
@@ -209,7 +204,7 @@ public void updateProperties(HttpClient httpClient) {
             .verifyComplete();
 
         StepVerifier.create(asyncClient.updateProperties(repoWriteableProperties))
-            .assertNext(res -> validateRepoContentProperties(res))
+            .assertNext(this::validateRepoContentProperties)
             .verifyComplete();
 
         validateRepoContentProperties(client.updateProperties(repoWriteableProperties));

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/RegistryArtifactAsyncIntegrationTests.java

@@ -10,7 +10,6 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.Response;
 import com.azure.core.test.TestMode;
-import com.azure.core.test.implementation.ImplUtils;
 import com.azure.core.util.Context;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -47,7 +46,7 @@ public class RegistryArtifactAsyncIntegrationTests extends ContainerRegistryClie
     @BeforeEach
     void beforeEach() {
         TestUtils.importImage(
-            ImplUtils.getTestMode(),
+            getTestMode(),
             HELLO_WORLD_REPOSITORY_NAME,
             Arrays.asList(
                 LATEST_TAG_NAME,

sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/RegistryArtifactTests.java

@@ -9,6 +9,7 @@
 import com.azure.core.test.TestMode;
 import com.azure.core.util.Context;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -27,7 +28,6 @@
 import static com.azure.containers.containerregistry.TestUtils.V3_TAG_NAME;
 import static com.azure.containers.containerregistry.TestUtils.V4_TAG_NAME;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Execution(ExecutionMode.SAME_THREAD)
 public class RegistryArtifactTests extends ContainerRegistryClientsTestBase {
@@ -103,7 +103,7 @@ public void delete() {
                     .onErrorResume(err -> Mono.just(false))));
 
         StepVerifier.create(delete)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -122,7 +122,7 @@ public void deleteWithResponse() {
                     .onErrorResume(err -> Mono.just(false))));
 
         StepVerifier.create(delete)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -141,7 +141,7 @@ public void deleteTag() {
                     .onErrorResume(err -> Mono.just(false))));
 
         StepVerifier.create(delete)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -159,7 +159,7 @@ public void deleteTagWithResponse() {
                     .onErrorResume(err -> Mono.just(false))));
 
         StepVerifier.create(delete)
-            .assertNext(res -> assertTrue(res))
+            .assertNext(Assertions::assertTrue)
             .verifyComplete();
     }
 
@@ -195,7 +195,7 @@ public void updateManifestProperties() {
         digest = V1_TAG_NAME;
 
         StepVerifier.create(asyncClient.updateManifestProperties(manifestWriteableProperties))
-            .assertNext(res -> validateManifestContentProperties(res))
+            .assertNext(this::validateManifestContentProperties)
             .verifyComplete();
 
         StepVerifier.create(asyncClient.updateManifestPropertiesWithResponse(manifestWriteableProperties))
@@ -217,7 +217,7 @@ public void updateTagProperties() {
         reupdateTagProperties = true;
 
         StepVerifier.create(asyncClient.updateTagProperties(V2_TAG_NAME, tagWriteableProperties))
-            .assertNext(res -> validateTagContentProperties(res))
+            .assertNext(this::validateTagContentProperties)
             .verifyComplete();
 
         StepVerifier.create(asyncClient.updateTagPropertiesWithResponse(V2_TAG_NAME, tagWriteableProperties))

sdk/core/azure-core-test/pom.xml

@@ -51,16 +51,17 @@
       <artifactId>junit-jupiter-api</artifactId>
       <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
     </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
-      <scope>test</scope>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
     </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -69,6 +70,12 @@
       <version>2.24.1</version> <!-- {x-version-update;com.github.tomakehurst:wiremock-standalone;external_dependency} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.9.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -110,6 +117,7 @@
                 <include>io.projectreactor:reactor-test:[3.4.6]</include> <!-- {x-include-update;io.projectreactor:reactor-test;external_dependency} -->
                 <!-- special allowance for azure-core-test as it is not a shipping library: -->
                 <include>org.junit.jupiter:junit-jupiter-api:[5.7.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+                <include>org.junit.jupiter:junit-jupiter-params:[5.7.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -148,6 +156,7 @@
 
                 --add-reads com.azure.core.test=ALL-UNNAMED
                 --add-opens com.azure.core.test/com.azure.core.test.models=ALL-UNNAMED
+                --add-opens com.azure.core.test/com.azure.core.test.implementation=org.junit.platform.commons
               </argLine>
             </configuration>
           </plugin>